lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctarg...@apache.org
Subject [lucene-solr] 03/06: Fix some of the broken elements
Date Tue, 07 Jan 2020 15:19:38 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 569d91d098d655205f805788b3bcb5a6f7541496
Author: Cassandra Targett <cassandra.targett@lucidworks.com>
AuthorDate: Mon Dec 30 21:31:20 2019 -0600

    Fix some of the broken elements
---
 solr/solr-ref-guide/src/_includes/head.html   |  2 +-
 solr/solr-ref-guide/src/_includes/topnav.html | 10 +++----
 solr/solr-ref-guide/src/_layouts/page.html    |  6 ++--
 solr/solr-ref-guide/src/css/decoration.css    | 41 +++++++++++++++++++++------
 solr/solr-ref-guide/src/css/navs.css          | 28 +++++++++++++++++-
 solr/solr-ref-guide/src/css/ref-guide.css     | 13 +++++----
 solr/solr-ref-guide/src/js/customscripts.js   |  4 +--
 7 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/solr/solr-ref-guide/src/_includes/head.html b/solr/solr-ref-guide/src/_includes/head.html
index 72604dd..56d1650 100755
--- a/solr/solr-ref-guide/src/_includes/head.html
+++ b/solr/solr-ref-guide/src/_includes/head.html
@@ -9,9 +9,9 @@
 <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
 <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
 <link rel="stylesheet" href="{{ "css/navs.css "}}">
-<link rel="stylesheet" href="{{ "css/decoration.css" }}"
 <link rel="stylesheet" href="{{ "css/customstyles.css" }}">
 <link rel="stylesheet" href="{{ "css/ref-guide.css" }}">
+<link rel="stylesheet" href="{{ "css/decoration.css" }}"
 
 <!-- Scrollbar Custom CSS -->
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/malihu-custom-scrollbar-plugin/3.1.5/jquery.mCustomScrollbar.min.css">
diff --git a/solr/solr-ref-guide/src/_includes/topnav.html b/solr/solr-ref-guide/src/_includes/topnav.html
index 1b4e1b0..5566e2a 100755
--- a/solr/solr-ref-guide/src/_includes/topnav.html
+++ b/solr/solr-ref-guide/src/_includes/topnav.html
@@ -1,15 +1,15 @@
 <!-- Navigation -->
-<nav class="navbar navbar-expand-lg fixed-top">
+<nav class="navbar navbar-expand-md fixed-top bg-light">
     <div class="container">
         <div class="navbar-header">
-          <button type="button" id="sidebarCollapse" class="btn btn-info">
+<!--          <button type="button" id="sidebarCollapse" class="btn btn-info">
      <i class="fa fa-bars"></i>
      <span>Sidebar</span>
- </button>
+ </button> -->
             {% comment %} NOTE: Explicitly using *SOLR* version here (not guide){% endcomment
%}
+            <img src="images/solr-sunOnly-small.png" width="30" height="30">
             <a class="navbar-brand" href="index.html">
-              <img src="images/solr-sunOnly-small.png" width="30" height="30">
-              <span class="projectTitle"> Solr {{ site.solr-attributes.solr-docs-version
}}</span>
+              <span class="projectTitle">Solr {{ site.solr-attributes.solr-docs-version
}}</span>
             </a>
         </div>
         <div class="collapse navbar-collapse justify-content-end" id="bs-example-navbar-collapse-1">
diff --git a/solr/solr-ref-guide/src/_layouts/page.html b/solr/solr-ref-guide/src/_layouts/page.html
index ebb017a..012b25c 100755
--- a/solr/solr-ref-guide/src/_layouts/page.html
+++ b/solr/solr-ref-guide/src/_layouts/page.html
@@ -34,12 +34,14 @@ layout: default
     {% assign scrollnav = site.data.scrollnav[page_id] %}
     {% if scrollnav %}
     <nav class="scrollnav row">
+      <div class="col-lg-12">
       {% if scrollnav.prev %}
-      <a class="btn btn-primary prev" href="{{ scrollnav.prev.url }}">{{ scrollnav.prev.title
}}</a>
+      <a class="btn btn-primary prev float-left" href="{{ scrollnav.prev.url }}">{{
scrollnav.prev.title }}</a>
       {% endif %}
       {% if scrollnav.next %}
-      <a class="btn btn-primary next" href="{{ scrollnav.next.url }}">{{ scrollnav.next.title
}}</a>
+      <a class="btn btn-primary next float-right" href="{{ scrollnav.next.url }}">{{
scrollnav.next.title }}</a>
       {% endif %}
+      </div>
    </nav>
     {% endif %}
 </div>
diff --git a/solr/solr-ref-guide/src/css/decoration.css b/solr/solr-ref-guide/src/css/decoration.css
index 2ef207f..2830c12 100644
--- a/solr/solr-ref-guide/src/css/decoration.css
+++ b/solr/solr-ref-guide/src/css/decoration.css
@@ -50,18 +50,10 @@ button.cursorNorm {
 }
 
 
-
 /** === BOOTSTRAP TABS/PILLS === **/
 
 .nav-tabs > li.active > a,
 .nav-tabs > li.active > a:hover,
-.nav-tabs > li.active > a:focus {
-    background-color: #248ec2;
-    color: white;
-}
-
-.nav-tabs > li.active > a,
-.nav-tabs > li.active > a:hover,
 .nav-tabs > li.active > a:focus,
 .nav-pills > li.active > a,
 .nav-pills > li.active > a:hover,
@@ -75,10 +67,43 @@ ul.nav.nav-pills li {
   margin-left: 5px;
 }
 
+.nav-pills > li {
+  float: left;
+}
+
+.nav-pills > li > a {
+  border-radius: 5px;
+}
+
+.nav-pills > li + li {
+  margin-left: 2px;
+}
+
 .tab-content {
     padding: 0px;
 }
 
+.tab-content > .tab-pane,
+.tab-content > .content > .tab-pane,
+.pill-content > .pill-pane,
+.tab-content > .content > .tab-pane {
+  display: none;
+}
+
+.tab-content > .active,
+.tab-content > .content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+a.list-group-item.active > .badge,
+.nav-pills > .active > a > .badge {
+  color: #74ab50;
+  background-color: #ffffff;
+}
+.nav-pills > li > a > .badge {
+  margin-left: 3px;
+}
 
 /** === BOOTSTRAP JUMBOTRONS === **/
 
diff --git a/solr/solr-ref-guide/src/css/navs.css b/solr/solr-ref-guide/src/css/navs.css
index 96a2509..bbf56e9 100644
--- a/solr/solr-ref-guide/src/css/navs.css
+++ b/solr/solr-ref-guide/src/css/navs.css
@@ -46,6 +46,24 @@ li.dropdownActive a {
     font-weight: bold;
 }
 
+.nav {
+  margin-bottom: 0;
+  padding-left: 0;
+  list-style: none;
+}
+.nav:before,
+.nav:after {
+  content: " ";
+  /* 1 */
+
+  display: table;
+  /* 2 */
+
+}
+.nav:after {
+  clear: both;
+}
+
 /** === LEFT SIDEBAR === **/
 
 #sidebar {
@@ -284,8 +302,11 @@ ul#mysidebar li.current.active > a {
 
 /** === TOP NAVBAR === **/
 
-.navbar .container {
+.navbar.bg-light {
   margin-left: 275px;
+}
+
+.navbar .container {
   border: solid;
   border-color: whitesmoke;
   background-color: white;
@@ -346,6 +367,11 @@ ul#mysidebar li.current.active > a {
 
 /** === TOCs === **/
 
+nav.toc {
+  padding-left: 10px;
+  max-width: 350px;
+}
+
 nav.toc ul li {
     margin: 8px 0 8px 22px;
     list-style: disc;
diff --git a/solr/solr-ref-guide/src/css/ref-guide.css b/solr/solr-ref-guide/src/css/ref-guide.css
index 5857729..4fee7c7 100644
--- a/solr/solr-ref-guide/src/css/ref-guide.css
+++ b/solr/solr-ref-guide/src/css/ref-guide.css
@@ -529,10 +529,9 @@ h6 small
     line-height: 0;
 }
 
-/* Pad the page title and sidebar header */
-h1.title-main,
-li.sidebarTitle {
-  padding-top: 20px;
+/* Pad the page title */
+h1.title-main {
+  padding: 20px 0px 10px 10px;
 }
 
 h1
@@ -919,7 +918,6 @@ p a > code:hover
     color: rgba(0,0,0,.9);
 }
 
-#content,
 #footer,
 #footnotes,
 #header
@@ -953,7 +951,8 @@ p a > code:hover
 #content
 {
     margin-top: 1.25em;
-    width: calc(100% - 250px);
+    margin-left: 275px;
+    padding-left: 10px;
 }
 
 #content:before
@@ -966,6 +965,7 @@ span.projectTitle
     font-weight: bold;
     font-family: 'Noto Sans', sans-serif;
     font-size: 14pt;
+    padding-left: 2px;
 }
 
 #header > h1:first-child
@@ -1270,6 +1270,7 @@ table.tableblock #preamble > .sectionbody > .paragraph:first-of-type
p
     -webkit-box-shadow: 0 1px 4px #e0e0dc;
             box-shadow: 0 1px 4px #e0e0dc;
     background: #fff;
+    width: 100%;
 }
 
 .exampleblock > :first-child
diff --git a/solr/solr-ref-guide/src/js/customscripts.js b/solr/solr-ref-guide/src/js/customscripts.js
index 8c1d44d..8925e82 100755
--- a/solr/solr-ref-guide/src/js/customscripts.js
+++ b/solr/solr-ref-guide/src/js/customscripts.js
@@ -29,7 +29,7 @@ $( document ).ready(function() {
     $(this).addClass("tab-content");
     var nav_ul = $("<ul>", { "class": "nav nav-pills" });
     $(".tab-pane", this).each(function(tab_index) {
-      var pill_li = $("<li>");
+      var pill_li = $("<li>", { "class": "nav-item" });
       // force the first tab to always be the active tab
       if (0 == tab_index) {
         $(this).addClass("active");
@@ -39,7 +39,7 @@ $( document ).ready(function() {
         $(this).removeClass("active");
       }
 
-      var pill_a = $("<a>", { "data-toggle" : "pill" } );
+      var pill_a = $("<a>", { "data-toggle": "pill" }, { "class": "nav-link" } );
       if ($(this)[0].hasAttribute("id")) {
         pill_a.attr("href", "#" + $(this).attr("id"));
       } else {


Mime
View raw message