You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/07/15 16:27:33 UTC
[1/4] allura git commit: [#6409] merge allura.css into site_style.css
Repository: allura
Updated Branches:
refs/heads/db/6409 [created] da52a2ca0
[#6409] merge allura.css into site_style.css
There's no need to have them separate. Back in the very beginning,
site_style.css was going to be a common base, and allura.css a "theme"
but that doesn't apply any more, so make things simpler.
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/c7135709
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/c7135709
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/c7135709
Branch: refs/heads/db/6409
Commit: c7135709e336120b76676cc6c8fb04cae0189288
Parents: caebe19
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Jul 15 11:32:12 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Jul 15 11:32:12 2016 -0400
----------------------------------------------------------------------
Allura/allura/lib/plugin.py | 1 -
Allura/allura/nf/allura/css/allura.css | 82 -------------------------
Allura/allura/nf/allura/css/site_style.css | 67 +++++++++++++++++++-
3 files changed, 66 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/c7135709/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index f449887..f74dc62 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -1110,7 +1110,6 @@ class ThemeProvider(object):
def require(self):
g.register_theme_css('css/site_style.css', compress=False)
- g.register_theme_css('css/allura.css', compress=False)
@classmethod
def register_ew_resources(cls, manager, name):
http://git-wip-us.apache.org/repos/asf/allura/blob/c7135709/Allura/allura/nf/allura/css/allura.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/allura.css b/Allura/allura/nf/allura/css/allura.css
deleted file mode 100644
index ec27a74..0000000
--- a/Allura/allura/nf/allura/css/allura.css
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-
-#mainmenu .logo{
- display: block;
- width: 110px;
- height: 24px;
-}
-
-#ticket_search_results_holder{
- overflow: auto;
-}
-.pagination_size {
- height: 40px;
-}
-
-tr.rev div.markdown_content p {
- padding: 0;
- margin-bottom: 0;
-}
-
-#login_overlay .title,
-#phone_verification_overlay .title {
- margin-bottom: 0;
- padding-left: 10px;
- border-top-left-radius: 4px;
- border-top-right-radius: 4px;
-}
-
-#login_overlay iframe,
-#phone_verification_overlay iframe {
- width: 400px;
-}
-
-#phone_verification_overlay iframe {
- height: 320px;
-}
-
-/* give some space after sidebar admin link (except for its own section which starts with <div> instead of <ul>) */
-#sidebar-admin-header ~ ul:first-of-type {
- margin-top: 20px;
-}
-/* expand/collapse indicator */
-#sidebar-admin-header h3::before {
- content: '\u25b8 ';
-}
-#sidebar-admin-header.expanded h3::before {
- content: '\u25be ';
-}
-#sidebar-admin-header h3 {
- padding-left: 2px;
-}
-
-#usergroup_admin td.group {
- text-align: center;
- line-height: 2em;
-}
-
-#usergroup_admin .fa-plus-circle,
-#usergroup_admin .fa-check-circle,
-#usergroup_admin .fa-check {
- color: green;
-}
-#usergroup_admin .fa-ban {
- color: red;
-}
http://git-wip-us.apache.org/repos/asf/allura/blob/c7135709/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 9137d30..1b07056 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3611,4 +3611,69 @@ div .bubble .CodeMirror {
width: 1em;
margin: 0 .05em 0 .1em;
vertical-align: -0.1em;
-}
\ No newline at end of file
+}
+
+
+#mainmenu .logo{
+ display: block;
+ width: 110px;
+ height: 24px;
+}
+
+#ticket_search_results_holder{
+ overflow: auto;
+}
+.pagination_size {
+ height: 40px;
+}
+
+tr.rev div.markdown_content p {
+ padding: 0;
+ margin-bottom: 0;
+}
+
+#login_overlay .title,
+#phone_verification_overlay .title {
+ margin-bottom: 0;
+ padding-left: 10px;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+
+#login_overlay iframe,
+#phone_verification_overlay iframe {
+ width: 400px;
+}
+
+#phone_verification_overlay iframe {
+ height: 320px;
+}
+
+/* give some space after sidebar admin link (except for its own section which starts with <div> instead of <ul>) */
+#sidebar-admin-header ~ ul:first-of-type {
+ margin-top: 20px;
+}
+/* expand/collapse indicator */
+#sidebar-admin-header h3::before {
+ content: '\u25b8 ';
+}
+#sidebar-admin-header.expanded h3::before {
+ content: '\u25be ';
+}
+#sidebar-admin-header h3 {
+ padding-left: 2px;
+}
+
+#usergroup_admin td.group {
+ text-align: center;
+ line-height: 2em;
+}
+
+#usergroup_admin .fa-plus-circle,
+#usergroup_admin .fa-check-circle,
+#usergroup_admin .fa-check {
+ color: green;
+}
+#usergroup_admin .fa-ban {
+ color: red;
+}
[3/4] allura git commit: [#6409] minor tweak to make user perms look
better too
Posted by br...@apache.org.
[#6409] minor tweak to make user perms look better too
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/c86ab526
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/c86ab526
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/c86ab526
Branch: refs/heads/db/6409
Commit: c86ab526df31c384d56db2111d72a3183e6444c3
Parents: 1154add
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Jul 15 12:19:15 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Jul 15 12:19:15 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/c86ab526/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 4f8ae35..205e693 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3807,7 +3807,9 @@ tr.rev div.markdown_content p {
text-align: center;
line-height: 2em;
}
-
+#usergroup_admin ul {
+ list-style-type: none;
+}
#usergroup_admin .fa-plus-circle,
#usergroup_admin .fa-check-circle,
#usergroup_admin .fa-check {
[4/4] allura git commit: [#6409] clean up some unused CSS
Posted by br...@apache.org.
[#6409] clean up some unused CSS
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/da52a2ca
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/da52a2ca
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/da52a2ca
Branch: refs/heads/db/6409
Commit: da52a2ca02226aba619e23ee7f876d63fd656377
Parents: c86ab52
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Jul 15 12:27:22 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Jul 15 12:27:22 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 29 -------------------------
1 file changed, 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/da52a2ca/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 205e693..081e046 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -552,30 +552,6 @@ img.nav-logo {
text-align: left;
}
-.ads ins {
- background-color: transparent;
-}
-
-.medrec {
- width: 300px;
- display: block;
-}
-
-.ads, .ad {
- margin: 0 0 20px;
-}
-
-.leaderboard {
- width: 728px;
- overflow: hidden;
- text-align: center;
- margin: 0 auto;
- line-height: 0;
-}
-.leaderboard .google_afc {
- margin: 0 auto;
-}
-
#site-notification {
margin: 0 auto;
margin-bottom: 20px;
@@ -629,11 +605,6 @@ img.nav-logo {
margin-left: 6px;
}
-.hub {
- width: 200px;
- overflow: hidden;
-}
-
/* message */
#messages {
position: absolute;
[2/4] allura git commit: [#6409] add missing style rules,
now empty repo and commit headers look good
Posted by br...@apache.org.
[#6409] add missing style rules, now empty repo and commit headers look good
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/1154add0
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/1154add0
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/1154add0
Branch: refs/heads/db/6409
Commit: 1154add0a31e6e34a002775d057bca705b11df17
Parents: c713570
Author: Dave Brondsema <da...@brondsema.net>
Authored: Fri Jul 15 12:03:09 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Jul 15 12:03:09 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 149 +++++++++++++++++++++++-
1 file changed, 144 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/1154add0/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 1b07056..4f8ae35 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2848,6 +2848,150 @@ h1.title .viewer:hover {
width: 32em;
}
+.commit-details {
+ padding: 10px;
+}
+.commit-details .commit-message {
+ margin: 0px;
+ padding: 10px 5px;
+ border: 1px solid #aaa;
+ -moz-border-radius-topleft: 4px;
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+ -moz-border-radius-topright: 4px;
+ -webkit-border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
+ border-bottom: 0;
+ background: #BDE5F8;
+ color: #003565;
+}
+.commit-details .commit-message .first-line {
+ font-size: 18px;
+ font-weight: bold;
+}
+.commit-details .commit-details {
+ font-size: 12px;
+ margin: 0;
+ padding: 5px 10px 0 10px;
+ background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U1ZTVlNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
+ background-size: 100%;
+ background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5));
+ background-image: -moz-linear-gradient(#ffffff 0%, #e5e5e5 100%);
+ background-image: -webkit-linear-gradient(#ffffff 0%, #e5e5e5 100%);
+ background-image: linear-gradient(#ffffff 0%, #e5e5e5 100%);
+ border: 1px solid #aaa;
+ -moz-border-radius-bottomleft: 4px;
+ -webkit-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ -moz-border-radius-bottomright: 4px;
+ -webkit-border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+}
+.commit-details .commit-details p {
+ height: 23px;
+ padding: 2px 0;
+}
+.commit-details .commit-details .commit-authorship {
+ float: left;
+}
+.commit-details .commit-details .commit-authorship label {
+ display: inline-block;
+ width: 85px;
+}
+.commit-details .commit-details .commit-authorship img {
+ vertical-align: top;
+}
+.commit-details .commit-details .commit-links .commit-ancestry {
+ float: right;
+}
+.commit-details .commit-details .commit-links a.commit-tree-link {
+ float: right;
+ margin-left: 20px;
+ padding-top: 2px;
+}
+.commit-details .commit-details .clearfix {
+ clear: both;
+}
+
+.inline-diff {
+ margin: 10px;
+ border: 0;
+ -moz-box-shadow: 0 1px 0 #fff;
+ -webkit-box-shadow: 0 1px 0 #fff;
+ box-shadow: 0 1px 0 #fff;
+}
+.inline-diff h6 {
+ padding: 0px 10px;
+ background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2U1ZTVlNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
+ background-size: 100%;
+ background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5));
+ background-image: -moz-linear-gradient(#ffffff 0%, #e5e5e5 100%);
+ background-image: -webkit-linear-gradient(#ffffff 0%, #e5e5e5 100%);
+ background-image: linear-gradient(#ffffff 0%, #e5e5e5 100%);
+ border: 1px solid #aaa;
+ -moz-border-radius-topleft: 4px;
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+ -moz-border-radius-topright: 4px;
+ -webkit-border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
+}
+.inline-diff h6 a {
+ color: #666;
+ display: inline-block;
+ padding: 2px 0;
+}
+.inline-diff h6 .commit-diff-link {
+ float: right;
+ border-left: 1px solid #aaa;
+ padding-left: 10px;
+}
+.inline-diff h6 .switch-diff-format-link {
+ padding-right: 10px;
+}
+.inline-diff .inline-diff-body {
+ border: 1px solid #aaa;
+ border-top: 0;
+ -moz-border-radius-bottomleft: 4px;
+ -webkit-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ -moz-border-radius-bottomright: 4px;
+ -webkit-border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+}
+.inline-diff .inline-diff-body pre {
+ padding: 0;
+}
+.inline-diff .inline-diff-body .empty-diff {
+ margin: 10px;
+ font-style: italic;
+}
+
+div.message.scm-learn-basics, div.message.scm-ssh-key, div.message.scm-empty-repo {
+ cursor: default;
+ display: block;
+ width: auto;
+ margin: 0 1em 1em;
+ box-shadow: none;
+}
+div.message.scm-learn-basics h6, div.message.scm-empty-repo h6 {
+ padding-left: 0;
+}
+div.message.scm-empty-repo {
+ float: none;
+ overflow: hidden;
+ height: 90px;
+}
+div.message.scm-learn-basics {
+ float: right;
+ width: 270px;
+ background-color: #f5f5f5;
+ border-color: #aaa;
+}
+div.message.scm-learn-basics img {
+ margin-right: 1em;
+}
+
/* Repo status indicator, displayed on repo pages if status != 'ready' */
#repo_status {
margin: 0 10px;
@@ -2893,11 +3037,6 @@ td.code {
div.codehilite {
margin-bottom: 5px;
}
-div.codehilite pre {
- padding-left: 0px;
- padding-top:10px;
- padding-bottom:10px;
-}
div.codehilite pre div.code_block {
padding-left:10px;
width: 100%;