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 2018/09/20 17:28:53 UTC
[2/7] lucene-solr:jira/solr-12746: Fix templates to match classes
used in CSS
Fix templates to match classes used in CSS
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0eb4f354
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0eb4f354
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0eb4f354
Branch: refs/heads/jira/solr-12746
Commit: 0eb4f354314ab160b2ae9235ca2ec36a92d869a0
Parents: 661e29e
Author: Cassandra Targett <ct...@apache.org>
Authored: Tue Sep 18 12:53:54 2018 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Thu Sep 20 12:28:30 2018 -0500
----------------------------------------------------------------------
solr/solr-ref-guide/src/_includes/head.html | 2 +-
solr/solr-ref-guide/src/_layouts/default.html | 2 +-
solr/solr-ref-guide/src/_layouts/page.html | 2 +-
.../src/_templates/admonition.html.slim | 12 ---------
.../src/_templates/inline_callout.html.slim | 2 +-
.../src/_templates/listing.html.slim | 2 +-
.../src/_templates/sidebar.html.slim | 2 +-
solr/solr-ref-guide/src/css/customstyles.css | 2 +-
solr/solr-ref-guide/src/css/ref-guide.css | 26 +++++++++++---------
9 files changed, 21 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0eb4f354/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 b95c28a..94d4fef 100755
--- a/solr/solr-ref-guide/src/_includes/head.html
+++ b/solr/solr-ref-guide/src/_includes/head.html
@@ -8,7 +8,7 @@
<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">-->
-<link rel="stylesheet" href="{{ "css/bootstrap.min.css" }}">
+<link rel="stylesheet" href="{{ "css/lavish-bootstrap.css" }}">
<link rel="stylesheet" href="{{ "css/customstyles.css" }}">
<link rel="stylesheet" href="{{ "css/theme-solr.css" }}">
<link rel="stylesheet" href="{{ "css/ref-guide.css" }}">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0eb4f354/solr/solr-ref-guide/src/_layouts/default.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_layouts/default.html b/solr/solr-ref-guide/src/_layouts/default.html
index dd8a85a..1c4b197 100755
--- a/solr/solr-ref-guide/src/_layouts/default.html
+++ b/solr/solr-ref-guide/src/_layouts/default.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html lang="en">
+<!DOCTYPE html>
{% comment %}NOTE: page_id is also definied in page.html{% endcomment %}
{% assign page_id = page.url | split: '/' | last | remove: '.html' %}
<head>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0eb4f354/solr/solr-ref-guide/src/_layouts/page.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_layouts/page.html b/solr/solr-ref-guide/src/_layouts/page.html
index b930854..752eb35 100755
--- a/solr/solr-ref-guide/src/_layouts/page.html
+++ b/solr/solr-ref-guide/src/_layouts/page.html
@@ -4,7 +4,7 @@ layout: default
{% comment %}NOTE: page_id is also definied in default.html{% endcomment %}
{% assign page_id = page.url | split: '/' | last | remove: '.html' %}
<header class="header">
- <h1 class="post-title-main">{{ page.title }}</h1>
+ <h1 class="title-main">{{ page.title }}</h1>
</header>
{% unless page.toc == false %}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0eb4f354/solr/solr-ref-guide/src/_templates/admonition.html.slim
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_templates/admonition.html.slim b/solr/solr-ref-guide/src/_templates/admonition.html.slim
deleted file mode 100644
index 80af180..0000000
--- a/solr/solr-ref-guide/src/_templates/admonition.html.slim
+++ /dev/null
@@ -1,12 +0,0 @@
-- capture
- h6.block-title class=('label-only' unless title?)
- span.title-label ="#{local_attr :textlabel}: "
- =title
- = html_tag_if !blocks?, :p
- =content
-- if admonition_aside?
- aside.admonition-block id=id class=[(attr :name), role] role=admonition_aria
- - yield_capture
-- else
- section.admonition-block id=id class=[(attr :name), role] role=admonition_aria
- - yield_capture
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0eb4f354/solr/solr-ref-guide/src/_templates/inline_callout.html.slim
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_templates/inline_callout.html.slim b/solr/solr-ref-guide/src/_templates/inline_callout.html.slim
index ebd38af..23424c6 100644
--- a/solr/solr-ref-guide/src/_templates/inline_callout.html.slim
+++ b/solr/solr-ref-guide/src/_templates/inline_callout.html.slim
@@ -1 +1 @@
-b.conum =text
+i.conum data-value=text
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0eb4f354/solr/solr-ref-guide/src/_templates/listing.html.slim
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_templates/listing.html.slim b/solr/solr-ref-guide/src/_templates/listing.html.slim
index 85dea99..47eb4cd 100644
--- a/solr/solr-ref-guide/src/_templates/listing.html.slim
+++ b/solr/solr-ref-guide/src/_templates/listing.html.slim
@@ -1,4 +1,4 @@
-= block_with_caption :top, :class=>'listing-block'
+= block_with_caption :top, :class=>'listingblock'
- if style == 'source'
- if highlighter == 'html-pipeline'
pre: code data-lang=source_lang =content
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0eb4f354/solr/solr-ref-guide/src/_templates/sidebar.html.slim
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_templates/sidebar.html.slim b/solr/solr-ref-guide/src/_templates/sidebar.html.slim
index 3aa6769..9c2d66b 100644
--- a/solr/solr-ref-guide/src/_templates/sidebar.html.slim
+++ b/solr/solr-ref-guide/src/_templates/sidebar.html.slim
@@ -1,4 +1,4 @@
-aside.sidebar id=id class=role
+aside.sidebarblock id=id class=role
- if title?
h6.block-title =title
=content
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0eb4f354/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 86045a7..8b2d9d3 100755
--- a/solr/solr-ref-guide/src/css/customstyles.css
+++ b/solr/solr-ref-guide/src/css/customstyles.css
@@ -26,7 +26,7 @@
}
/* Adds a custom "lead" style for use in index.html jumbotron box */
-.paragraph.lead-homepage > p {
+.lead-homepage {
font-size: 1.21875em;
line-height: 1.3;
text-align: center;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0eb4f354/solr/solr-ref-guide/src/css/ref-guide.css
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/css/ref-guide.css b/solr/solr-ref-guide/src/css/ref-guide.css
index 4a4d777..d010cd6 100644
--- a/solr/solr-ref-guide/src/css/ref-guide.css
+++ b/solr/solr-ref-guide/src/css/ref-guide.css
@@ -574,7 +574,7 @@ h6 small
}
/* Pad the page title and sidebar header */
-h1.post-title-main,
+h1.title-main,
li.sidebarTitle {
padding-top: 20px;
}
@@ -660,7 +660,7 @@ ul li ol,
ul li ul
{
margin-bottom: 0;
- margin-left: 1.25em;
+ margin-left: .25em;
font-size: 1em;
}
@@ -1162,32 +1162,33 @@ body.toc2 #header > h1:nth-last-child(2)
font-size: 1.2em;
}
-div.toc ul li {
+nav.toc ul li {
margin: 8px 0 8px 22px;
list-style: disc;
line-height: 1.25;
}
-div.toc ul {
- background-color: whitesmoke;
- padding: 5px;
+nav.toc ul {
+ background-color: #f1f1f1;;
+ padding: 0 5px;
border-radius: 5px;
color: gray;
}
-div.toc ul li ul {
+nav.toc ul li ul {
padding-left:8px;
}
-div.toc ul li ul li::before {
- content: "– ";
+nav.toc ul li ul li {
+ list-style: circle;
+ line-height: 1;
}
-div.toc.section-toc >ul::before {
+nav.toc.section-toc >ul::before {
content: "In this section";
}
-div.toc >ul::before {
+nav.toc >ul::before {
content: "On this Page";
font-weight: bold;
color: #555;
@@ -1556,12 +1557,13 @@ table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p
margin-bottom: 0;
}
-.sidebarblock > .content > .title
+h6.block-title
{
margin-top: 0;
color: #7a2518;
text-align: center;
padding-bottom: 10px;
+ font-size: 1.6875em;
}
.exampleblock > .content > :last-child>:last-child,