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 2017/05/13 00:08:48 UTC
lucene-solr:branch_6_6: SOLR-10670: fix browser bar name;
add some padding for DRAFT note; add favicon
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_6 0c2330bea -> 4b93c62d2
SOLR-10670: fix browser bar name; add some padding for DRAFT note; add favicon
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4b93c62d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4b93c62d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4b93c62d
Branch: refs/heads/branch_6_6
Commit: 4b93c62d244408902dd91492a797feadf731a3f4
Parents: 0c2330b
Author: Cassandra Targett <ca...@lucidworks.com>
Authored: Fri May 12 17:37:41 2017 -0500
Committer: Cassandra Targett <ca...@lucidworks.com>
Committed: Fri May 12 19:08:32 2017 -0500
----------------------------------------------------------------------
solr/solr-ref-guide/src/_includes/head.html | 4 ++--
solr/solr-ref-guide/src/_includes/sidebar.html | 4 ++--
solr/solr-ref-guide/src/_includes/topnav.html | 6 +++---
solr/solr-ref-guide/src/css/customstyles.css | 4 +++-
solr/solr-ref-guide/src/images/icons/favicon.ico | Bin 0 -> 3262 bytes
5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4b93c62d/solr/solr-ref-guide/src/_includes/head.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/head.html b/solr/solr-ref-guide/src/_includes/head.html
index 4e66593..47bf867 100755
--- a/solr/solr-ref-guide/src/_includes/head.html
+++ b/solr/solr-ref-guide/src/_includes/head.html
@@ -4,7 +4,7 @@
<meta name="description" content="{% if page.description %}{{ page.description | strip_html | strip_newlines | truncate: 160 }}{% endif %}">
<meta name="keywords" content="{{page.tags}}{% if page.tags %}, {% endif %} {{page.keywords}}">
{% comment %}NOTE: explicitly using the GUIDE version here (not solr) {% endcomment %}
-<title>{{ page.title }} | {{ site.site_title }} {{ site.solr-attributes.solr-guide-version}}</title>
+<title>{% if page.shortname != "index" %}{{ page.title }} | {% endif %}{{ site.site_title }} {{ site.solr-attributes.solr-guide-version}}</title>
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<!--<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">-->
@@ -23,7 +23,7 @@
<script src="{{ "js/toc.js" }}"></script>
<script src="{{ "js/customscripts.js" }}"></script>
-<link rel="shortcut icon" href="{{ "images/favicon.ico" }}">
+<link rel="shortcut icon" href="{{ "images/icons/favicon.ico" }}">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4b93c62d/solr/solr-ref-guide/src/_includes/sidebar.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/sidebar.html b/solr/solr-ref-guide/src/_includes/sidebar.html
index 56be9bc..d8c33f6 100755
--- a/solr/solr-ref-guide/src/_includes/sidebar.html
+++ b/solr/solr-ref-guide/src/_includes/sidebar.html
@@ -5,7 +5,7 @@
{% if "" != site.solr-attributes.solr-guide-draft-status %}
<li class="draft-notice">
This is an unofficial DRAFT of the Guide for {{ site.solr-attributes.solr-docs-version }}.
- <a href="https://lucene.apache.org/solr/guide/">Official releases of this Guide are available from the Solr website</a>.
+ <a href="https://lucene.apache.org/solr/guide/">Official releases are available from the Solr website</a>.
</li>
{% endif %}
{% for level1item in sidebar.kids %}
@@ -27,7 +27,7 @@
<li class="sb-level4">
<a href="{{ level4item.url | remove: "/" }}">{{ level4item.title }}</a>
{% comment %}
- <!-- NOTE: adding addiional levels here will also require additional changes to
+ <!-- NOTE: adding addiional levels here will also require additional changes to
ref-guide.css in order to indent them properly
-->
{% endcomment %}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4b93c62d/solr/solr-ref-guide/src/_includes/topnav.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/topnav.html b/solr/solr-ref-guide/src/_includes/topnav.html
index 7ed1f68..18eac2f 100755
--- a/solr/solr-ref-guide/src/_includes/topnav.html
+++ b/solr/solr-ref-guide/src/_includes/topnav.html
@@ -14,7 +14,7 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<!-- Link to Solr website -->
- <li><a href="https://lucene.apache.org/solr/news" target="_blank">Solr News</a></li>
+ <li><a href="https://lucene.apache.org/solr/" target="_blank">Solr Website</a></li>
<!-- Other Guide Formats dropdown -->
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Other Formats<b class="caret"></b></a>
@@ -29,8 +29,8 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Solr Resources<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{{site.solr-attributes.solr-javadocs}}/solr-core/index.html" target="_blank">Solr Javadocs</a></li>
- <li><a href="https://git1-us-west.apache.org/repos/asf?p=lucene-solr.git" target="_blank">Lucene/Solr Source Code</a></li>
- <li><a href="https://lucene.apache.org/solr/resources.html#community" target="_blank">Solr Community Links</a></li>
+ <li><a href="https://lucene.apache.org/solr/community.html#version-control" target="_blank">Lucene/Solr Source Code</a></li>
+ <li><a href="https://lucene.apache.org/solr/community.html" target="_blank">Solr Community Links</a></li>
</ul>
</li>
{% if site.feedback_disable == null or site.feedback_disable == false %}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4b93c62d/solr/solr-ref-guide/src/css/customstyles.css
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/css/customstyles.css b/solr/solr-ref-guide/src/css/customstyles.css
index 4499a0f..8e38402 100755
--- a/solr/solr-ref-guide/src/css/customstyles.css
+++ b/solr/solr-ref-guide/src/css/customstyles.css
@@ -214,12 +214,14 @@ background-color: #347DBE;
.nav li.draft-notice {
/* we don't want the draft water mark to make this hard to notice */
background-color: rgb(255, 255, 255);
+ padding: 0px 0px 10px 0px;
+
}
.nav li.draft-notice a, .nav li.draft-notice a:hover, .nav li.draft-notice a:active .nav li.draft-notice a:focus {
display: inline;
color: #2156a5;
text-decoration: underline;
-
+
position: inherit;
line-height: inherit;
padding: inherit;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4b93c62d/solr/solr-ref-guide/src/images/icons/favicon.ico
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/images/icons/favicon.ico b/solr/solr-ref-guide/src/images/icons/favicon.ico
new file mode 100644
index 0000000..e93104c
Binary files /dev/null and b/solr/solr-ref-guide/src/images/icons/favicon.ico differ