[#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.
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 @@
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):
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: '▸ ';
-}
-#sidebar-admin-header.expanded h3::before {
- content: '▾ ';
-}
-#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;
-}
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 @@
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: '▸ ';
+}
+#sidebar-admin-header.expanded h3::before {
+ content: '▾ ';
+}
+#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;
+}
