You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2020/03/11 18:52:49 UTC

[lucene-solr] branch jira/solr-14173-2 updated: Change to gray-themed sidebar instead of blue/orange; make current active page more obvious in nav

This is an automated email from the ASF dual-hosted git repository.

ctargett pushed a commit to branch jira/solr-14173-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/solr-14173-2 by this push:
     new 50ba276  Change to gray-themed sidebar instead of blue/orange; make current active page more obvious in nav
50ba276 is described below

commit 50ba2765dbd94df26f34ca8ac9bea8bb242a76ae
Author: Cassandra Targett <ca...@lucidworks.com>
AuthorDate: Wed Mar 11 13:51:30 2020 -0500

    Change to gray-themed sidebar instead of blue/orange; make current active page more obvious in nav
---
 solr/solr-ref-guide/src/css/decoration.css  |  6 ++--
 solr/solr-ref-guide/src/css/navs.css        | 51 ++++++++++++-----------------
 solr/solr-ref-guide/src/css/search.css      |  5 +++
 solr/solr-ref-guide/src/js/customscripts.js |  3 +-
 4 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/solr/solr-ref-guide/src/css/decoration.css b/solr/solr-ref-guide/src/css/decoration.css
index 3f69d2d..1c8d335 100644
--- a/solr/solr-ref-guide/src/css/decoration.css
+++ b/solr/solr-ref-guide/src/css/decoration.css
@@ -5,7 +5,7 @@
 
 /* Used for bottom scrollnav buttons */
 .btn-primary {
-    color: #F35B38;
+    color: #D9411E;
     background-color: transparent;
     border-color: #CDCECF;
     font-weight: bold;
@@ -17,8 +17,8 @@
 .btn-primary:active,
 .btn-primary.active,
 .open .dropdown-toggle.btn-primary {
-    background-color: #305CB3;
-    border-color: #E6E7E8;
+    background-color: #D9411E;
+    border-color: #CDCECF;
 }
 
 /* used for Download Solr button on docs home page */
diff --git a/solr/solr-ref-guide/src/css/navs.css b/solr/solr-ref-guide/src/css/navs.css
index 9628061..190d0eb 100644
--- a/solr/solr-ref-guide/src/css/navs.css
+++ b/solr/solr-ref-guide/src/css/navs.css
@@ -10,7 +10,8 @@ a.dropdown-toggle,
 }
 
 div.navbar-collapse .dropdown-menu > li > a:hover {
-    background-color: #D9411E;
+    background-color: #E6E7E8;
+    color: #D9411E;
 }
 /** === END GENERAL NAV ELEMENTS === **/
 
@@ -23,25 +24,20 @@ div.navbar-collapse .dropdown-menu > li > a:hover {
     left: 0;
     height: 100vh;
     z-index: 999;
-    background: #305CB3;
+    background: #E6E7E8;
     transition: all 0.3s;
 }
 
 .sidebar-header {
   padding-left: 5px;
-  color: #fff;
-}
-
-.sidebar-header a {
-  color: #fff;
 }
 
 .sidebarTitle {
-    color: #fff;
     font-weight: bold;
     font-size: 1.5em;
     margin-top: 30px;
     margin-bottom: 10px;
+    line-height: 30px;
 }
 
 /*The #mysidebar ID is only used for the Ref Guide sections part of the sidebar */
@@ -50,25 +46,25 @@ div.navbar-collapse .dropdown-menu > li > a:hover {
   width: 100%;
 }
 
-#mysidebar.nav a {
-  color: #fff;
-}
-
 #mysidebar.nav > li {
     width: 275px;
 }
 
 #mysidebar.nav ul {
-    background-color: #FF833D;
+    background-color: white;
 }
 
 #mysidebar.nav ul li a {
-  background-color: #FF833D;
-  color: white;
+  background-color: white;
+  color: #D9411E;
   border: none;
-  font-weight: bold;
 }
 
+#mysidebar ul li a:hover {
+    background-color: #E6E7E8;
+}
+
+
 @media (max-width: 990px) {
     #sidebar {
         position: relative;
@@ -135,9 +131,6 @@ ul.nav li ul {
     background-color: #262130;
 }
 
-#mysidebar ul li a:hover {
-    background-color: #8D8D8D;
-}
 
 .nav a {
     color: #333;
@@ -149,8 +142,9 @@ ul.nav li ul {
 .nav a:hover,
 .nav a:focus,
 .nav li.active > a {
-    background-color: #8D8D8D;
-    color: #f5f5f5;
+    background-color: #E6E7E8;
+    color: #D9411E;
+    font-weight: bold;
 }
 
 .nav ul li a {
@@ -187,9 +181,7 @@ ul.nav li ul {
     content: '\25b4';
 }
 
-.nav > li.active > a  {
-background-color: #347DBE;
-}
+
 /* end navgoco sidebar */
 
 /* When '-Dsolr-guide-version' is not set during the build, the Guide is
@@ -197,8 +189,9 @@ background-color: #347DBE;
 
 .sidebar-header p.draft-notice {
     padding: 0px 0px 10px 0px;
-
+    margin-bottom: 10px;
 }
+
 .sidebar-header p.draft-notice a,
 .sidebar-header p.draft-notice a:hover,
 .sidebar-header p.draft-notice a:active .nav p.draft-notice a:focus {
@@ -231,13 +224,11 @@ ul#mysidebar li.sb-level4 a {
       will be bolded -- reminding the reader what section of the doc they are currently in.
 */
 ul#mysidebar li.current-tree > a {
-    font-weight: bolder;
-}
-ul#mysidebar li.current-tree.active > a {
-    font-weight: inherit;
+    font-weight: bold;
 }
+
 ul#mysidebar li.current.active > a {
-    font-weight: bolder;
+    font-weight: bold;
 }
 
 /** === END LEFT SIDEBAR === **/
diff --git a/solr/solr-ref-guide/src/css/search.css b/solr/solr-ref-guide/src/css/search.css
index fc67619..27d28b1 100644
--- a/solr/solr-ref-guide/src/css/search.css
+++ b/solr/solr-ref-guide/src/css/search.css
@@ -35,4 +35,9 @@ ul#results-container a:focus {
     float: right;
 }
 
+/*Pad the bottom of the results container to give a little more space to the nav*/
+ul#results-container {
+  padding-bottom: 30px;
+}
+
 /* end search */
diff --git a/solr/solr-ref-guide/src/js/customscripts.js b/solr/solr-ref-guide/src/js/customscripts.js
index 26e51f7..32f7c70 100755
--- a/solr/solr-ref-guide/src/js/customscripts.js
+++ b/solr/solr-ref-guide/src/js/customscripts.js
@@ -18,7 +18,7 @@ $( document ).ready(function() {
     $(".tab-pane", this).each(function(tab_index) {
       var pill_li = $("<li>", { "class": "nav-item" });
       var pill_a = $("<a>", { "class": "nav-link", "role": "tab", "data-toggle": "pill" } );
-      
+
       if ($(this)[0].hasAttribute("id")) {
         pill_a.attr("href", "#" + $(this).attr("id"));
       } else {
@@ -59,6 +59,7 @@ $( document ).ready(function() {
 
 });
 
+// Adds scrollbar for the sidebar nav
 $(document).ready(function () {
 
     $("#sidebar").mCustomScrollbar({