Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Some bootstrap4 fixes
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Apr 22, 2018
1 parent 3cf5ee9 commit 353acf3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 30 deletions.
17 changes: 3 additions & 14 deletions nikola/data/themes/bootstrap4-jinja/assets/css/theme.css
Expand Up @@ -14,16 +14,10 @@ img {
max-width: 90%;
}

.postbox {
border-bottom: 2px solid darkgrey;
margin-bottom: 12px;
}

.titlebox {
text-align: right;
}

#addthisbox {margin-bottom: 12px;}

td.label {
/* Issue #290 */
Expand All @@ -36,7 +30,6 @@ td.label {
font-size: xx-small;
}


.caption {
/* Issue 292 */
text-align: center;
Expand Down Expand Up @@ -100,6 +93,9 @@ article.post-micro {

.tags > li {
display: inline-block;
}
.tags > li a {
display: inline-block;
padding: .25em .4em;
font-size: 75%;
font-weight: 700;
Expand All @@ -109,14 +105,9 @@ article.post-micro {
white-space: nowrap;
vertical-align: baseline;
border-radius: .25rem;
color: #fff;
background-color: #868e96;
}

.tags > li a {
color: #fff;
}

.tags > li a:hover {
color: #fff;
text-decoration: none;
Expand Down Expand Up @@ -243,8 +234,6 @@ ul.pager li a {
padding: .5rem .75rem;
margin-left: -1px;
line-height: 1.25;
color: #007bff;
background-color: #fff;
border: 1px solid #ddd;
border-radius: .25rem;
}
Expand Up @@ -188,7 +188,7 @@ lang="{{ lang }}">
{% macro html_translations() %}
{% for langname in translations|sort %}
{% if langname != lang %}
<li><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}">{{ messages("LANGUAGE", langname) }}</a></li>
<li class="nav-item"><a href="{{ abs_link(_link("root", None, langname)) }}" rel="alternate" hreflang="{{ langname }}" class="nav-link">{{ messages("LANGUAGE", langname) }}</a></li>
{% endif %}
{% endfor %}
{% endmacro %}
17 changes: 3 additions & 14 deletions nikola/data/themes/bootstrap4/assets/css/theme.css
Expand Up @@ -14,16 +14,10 @@ img {
max-width: 90%;
}

.postbox {
border-bottom: 2px solid darkgrey;
margin-bottom: 12px;
}

.titlebox {
text-align: right;
}

#addthisbox {margin-bottom: 12px;}

td.label {
/* Issue #290 */
Expand All @@ -36,7 +30,6 @@ td.label {
font-size: xx-small;
}


.caption {
/* Issue 292 */
text-align: center;
Expand Down Expand Up @@ -100,6 +93,9 @@ article.post-micro {

.tags > li {
display: inline-block;
}
.tags > li a {
display: inline-block;
padding: .25em .4em;
font-size: 75%;
font-weight: 700;
Expand All @@ -109,14 +105,9 @@ article.post-micro {
white-space: nowrap;
vertical-align: baseline;
border-radius: .25rem;
color: #fff;
background-color: #868e96;
}

.tags > li a {
color: #fff;
}

.tags > li a:hover {
color: #fff;
text-decoration: none;
Expand Down Expand Up @@ -243,8 +234,6 @@ ul.pager li a {
padding: .5rem .75rem;
margin-left: -1px;
line-height: 1.25;
color: #007bff;
background-color: #fff;
border: 1px solid #ddd;
border-radius: .25rem;
}
2 changes: 1 addition & 1 deletion nikola/data/themes/bootstrap4/templates/base_helper.tmpl
Expand Up @@ -188,7 +188,7 @@ lang="${lang}">
<%def name="html_translations()">
%for langname in sorted(translations):
%if langname != lang:
<li><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}">${messages("LANGUAGE", langname)}</a></li>
<li class="nav-item"><a href="${abs_link(_link("root", None, langname))}" rel="alternate" hreflang="${langname}" class="nav-link">${messages("LANGUAGE", langname)}</a></li>
%endif
%endfor
</%def>
1 change: 1 addition & 0 deletions scripts/jinjify.py
Expand Up @@ -25,6 +25,7 @@
['dir="rtl" \\', 'dir="rtl"'],
['sorted(translations)', 'translations|sort'],
['abs(i - current_page)', '(i - current_page)|abs'],
['loop.index', 'loop.index0'],
]

dumber_replacements = [
Expand Down

0 comments on commit 353acf3

Please sign in to comment.