allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [22/50] [abbrv] allura git commit: [#7919] navbar.css should come after theme CSS; make Add Tool not make the navbar too tall
Date Fri, 08 Jan 2016 19:30:27 GMT
[#7919] navbar.css should come after theme CSS; make Add Tool not make the navbar too tall


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a682d1f1
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a682d1f1
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a682d1f1

Branch: refs/heads/master
Commit: a682d1f15f90ab34f969cc5ffd54c99feb64929e
Parents: f80431b
Author: Dave Brondsema <dave@brondsema.net>
Authored: Thu Dec 10 15:20:10 2015 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Fri Jan 8 14:06:16 2016 -0500

----------------------------------------------------------------------
 Allura/allura/public/nf/css/navbar.css           | 6 +++++-
 Allura/allura/templates/jinja_master/master.html | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/a682d1f1/Allura/allura/public/nf/css/navbar.css
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/css/navbar.css b/Allura/allura/public/nf/css/navbar.css
index c4264aa..92ec7c9 100644
--- a/Allura/allura/public/nf/css/navbar.css
+++ b/Allura/allura/public/nf/css/navbar.css
@@ -54,7 +54,7 @@
     box-shadow: 0 1px 1px #ccc;
 }
 
-#normal-nav-bar, #top_nav_admin > ul.dropdown {
+#top_nav_admin ul.dropdown {
     border: none;
     box-shadow: none;
 }
@@ -224,6 +224,10 @@
     text-align: left;
 }
 
+#top_nav #add-tool-container {
+    padding-bottom: 0;  /* cancel out the site style for dropdown <li>s, since this
is already fairly tall */
+}
+
 #top_nav .add-tool-toggle {
     border: 1px dashed #B9B9B9;
     color: #0077aa;

http://git-wip-us.apache.org/repos/asf/allura/blob/a682d1f1/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index 5ec6808..52160a8 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -32,6 +32,7 @@
 {% do g.register_forge_css('css/forge/hilite.css') %}
 {% do g.register_forge_css('css/forge/tooltipster.css') %}
 {% do g.register_forge_css('css/font-awesome.min.css', compress=False) %}
+{% do g.theme.require() %}
 {% if h.has_access(c.project, 'admin')() %}
     {% do g.register_forge_js('js/admin_modal.js') %}
     {% do g.register_js('js/jquery.lightbox_me.js') %}
@@ -39,7 +40,6 @@
        any css.  (Unlike other html files which are the top-level file and extend this master.html)
#}
     {% do g.register_forge_css('css/navbar.css') %}
 {% endif %}
-{% do g.theme.require() %}
 {% do g.resource_manager.register_widgets(c) %}
 {# paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ #}
 <!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->


Mime
View raw message