allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kentontay...@apache.org
Subject [3/3] allura git commit: Move "stylistic" rules from navbar.css to site_style.css so that different themes can more easily style the nav bar
Date Thu, 30 Mar 2017 14:57:58 GMT
Move "stylistic" rules from navbar.css to site_style.css so that different themes can more
easily style the nav bar


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

Branch: refs/heads/master
Commit: 1d68bb033ffa950d2aa8eb10836760b4cfe83447
Parents: 2ac4ec7
Author: Dave Brondsema <dave@brondsema.net>
Authored: Thu Mar 23 12:01:23 2017 -0400
Committer: Kenton Taylor <ktaylor@slashdotmedia.com>
Committed: Thu Mar 30 14:33:32 2017 +0000

----------------------------------------------------------------------
 Allura/allura/nf/allura/css/site_style.css | 52 +++++++++++++++++++++
 Allura/allura/public/nf/css/navbar.css     | 60 +++----------------------
 2 files changed, 59 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/1d68bb03/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 d2c5331..1f9935b 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3896,3 +3896,55 @@ tr.rev div.markdown_content p {
 #usergroup_admin .fa-ban {
   color: red;
 }
+
+
+
+/*
+Nav bar styles moved out of navbar.css since they are more stylistic than layout, and a different
theme probably won't want them.
+ */
+#threshold-config > span > input {
+    background-color: #F2F2F2;
+    color: #333;
+    font-weight: bold;
+}
+#top_nav_admin {
+    overflow: hidden;
+    width: 918px;  /* 940px - 32px for toggle-admin-btn */
+}
+#top_nav {
+    border-bottom: 1px solid #ccc;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    box-shadow: 0 1px 1px #ccc;
+}
+.tb-item-grouper {
+    top: 32px;
+}
+#top_nav .add-tool-toggle {
+    margin-top: -4px;
+}
+#top_nav .add-tool-toggle:hover {
+    color: #0099cc;
+    background: #F4F4F4;
+    text-decoration: underline;
+}
+.contextMenu {
+    background: #f0f0f0;
+    border: 1px solid #999;
+    box-shadow: -2px 2px 6px #555;
+}
+#add-tool-container li {
+    border: 1px solid #e5e5e5;
+}
+#add-tool-container li:hover {
+    color: white;
+    background-color: #09c;
+    background-image: linear-gradient(#09c, #07a);
+    border-color: #07a;
+}
+#add-tool-container li:hover a {
+    color: white !important;
+}
+.unlocked-container{
+    margin-top: 10px;
+}

http://git-wip-us.apache.org/repos/asf/allura/blob/1d68bb03/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 445a0a2..279731b 100644
--- a/Allura/allura/public/nf/css/navbar.css
+++ b/Allura/allura/public/nf/css/navbar.css
@@ -38,21 +38,6 @@
 
 #threshold-config > span > input {
     width: 2rem;
-    background-color: #F2F2F2;
-    color: #333;
-    font-weight: bold;
-}
-
-#top_nav_admin {
-    overflow: hidden;
-    width: 918px; /* 940px - 32px for toggle-admin-btn */
-}
-
-#top_nav {
-    border-bottom: 1px solid #ccc;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    box-shadow: 0 1px 1px #ccc;
 }
 
 #top_nav_admin ul.dropdown {
@@ -125,14 +110,12 @@
     background: #ccc;
 }
 
-/* .react-drag used to distinguish container used in locked vs unlocked modes */
 #add-tool-container {
     float: left;
-    margin-left: 10px;
 }
-
-#add-tool-container .add-tool-toggle {
-    margin-top: 5px;
+/* .react-drag used to distinguish container used in locked vs unlocked modes */
+.react-drag #add-tool-container {
+    margin-left: 10px;
 }
 
 .tb-item-edit a {
@@ -189,7 +172,6 @@
     display: none;
     background: white;
     position: absolute;
-    top: 32px;
     white-space: nowrap;
 }
 
@@ -256,7 +238,6 @@
     border: 1px dashed #B9B9B9;
     color: #0077aa;
     padding: 3px 7px;
-    margin-top: -4px;
     float: left;
     border-radius: 2px;
     cursor: pointer;
@@ -267,16 +248,7 @@
     user-select: none;
 }
 
-#top_nav .add-tool-toggle:hover {
-    color: #0099cc;
-    background: #F4F4F4;
-    text-decoration: underline;
-}
-
 .contextMenu {
-    background: #f0f0f0;
-    border: 1px solid #999;
-    box-shadow: -2px 2px 6px #555;
     position: absolute;
     margin-top: 20px;
     margin-left: 15px;
@@ -284,6 +256,7 @@
     z-index: 20200;
     white-space: nowrap;
     clear: both;
+    border: none;
 }
 
 .contextMenu > ul {
@@ -293,15 +266,13 @@
     visibility: visible !important;
 }
 
-#add-tool-container > div > div {
-    margin-left: -10px;
-}
-
 #add-tool-container .contextMenu {
     border: none;
     background: white;
     text-align: left;
-    top: 15px;
+    top: 100%;
+    margin-top: 0;
+    margin-left: -10px;
 }
 
 #add-tool-container .contextMenu ul {
@@ -315,7 +286,6 @@
 
 #add-tool-container li {
     overflow: auto;
-    border: 1px solid #e5e5e5;
     border-bottom: none;
     min-width: 100px;
     margin: 0;
@@ -323,18 +293,6 @@
     padding: 0.3em 0.5em 0.3em 0.3em !important;
 }
 
-#add-tool-container li:hover {
-    color: white;
-    background-color: #09c;
-    background-image: linear-gradient(#09c, #07a);
-    border-color: #07a;
-}
-
-#add-tool-container li:hover a {
-    color: white !important;
-
-}
-
 #add-tool-container li:first-child {
     border-top: 0;
 }
@@ -348,7 +306,3 @@
 #top_nav_admin .tool_option > a {
     border-right: none !important;
 }
-
-.unlocked-container{
-    margin-top: 10px;
-}


Mime
View raw message