chiark / gitweb /
~cjwatson / blog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5b84019)
css: renamed .m-navbar-jumbo to .m-navbar-cover.
authorVladimír Vondruš <mosra@centrum.cz>
Mon, 1 Jan 2018 17:58:42 +0000 (18:58 +0100)
committerVladimír Vondruš <mosra@centrum.cz>
Mon, 1 Jan 2018 20:31:20 +0000 (21:31 +0100)
Breaking change: if you aren't using the Pelican theme, make sure to
change all occurences of m-navbar-jumbo to m-navbar-cover in your HTML
markup in order to retain the feature of semi-transparent navbar on
jumbo articles.

16 files changed:
css/m-components.css patch | blob | history
doc/css/page-layout.rst patch | blob | history
pelican-plugins/m/test/htmlsanity_typography/article-jumbo.html patch | blob | history
pelican-plugins/m/test/metadata/article-jumbo.html patch | blob | history
pelican-theme/templates/base.html patch | blob | history
pelican-theme/test/blog/article-jumbo.html patch | blob | history
pelican-theme/test/blog_author_list/article-jumbo.html patch | blob | history
pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html patch | blob | history
pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html patch | blob | history
pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html patch | blob | history
pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html patch | blob | history
pelican-theme/test/blog_hide_summary_both/article-jumbo.html patch | blob | history
pelican-theme/test/blog_hide_summary_global/article-jumbo.html patch | blob | history
pelican-theme/test/blog_html_escape/article-jumbo.html patch | blob | history
pelican-theme/test/blog_jumbo_inverted/article-jumbo.html patch | blob | history
pelican-theme/test/blog_minimal/article-jumbo.html patch | blob | history

diff --git a/css/m-components.css b/css/m-components.css
index 71486ddb3fe468e6b2583f8380092d30f76e3375..c02226ef57d329b892eb59ac2aeca784d3419759 100644 (file)
--- a/css/m-components.css
+++ b/css/m-components.css
@@ -136,24 +136,24 @@ body > header > nav {
   min-height: 3rem;
 }
 body > header > nav.m-navbar-landing,
-body > header > nav.m-navbar-jumbo {
+body > header > nav.m-navbar-cover {
   background-color: transparent;
   position: relative;
 }
 body > header > nav.m-navbar-landing {
   opacity: 0.8;
 }
-body > header > nav.m-navbar-jumbo {
+body > header > nav.m-navbar-cover {
   background-color: var(--header-background-color-jumbo);
   opacity: 1;
 }
 body > header > nav.m-navbar-landing:hover,
-body > header > nav.m-navbar-jumbo:hover {
+body > header > nav.m-navbar-cover:hover {
   background-color: var(--header-background-color-landing);
   opacity: 1;
 }
 body> header > nav.m-navbar-landing:target,
-body> header > nav.m-navbar-jumbo:target {
+body> header > nav.m-navbar-cover:target {
   background-color: var(--header-background-color);
   opacity: 1;
 }
@@ -233,11 +233,11 @@ body > header > nav #m-navbar-collapse li a:active {
   background-color: var(--header-link-active-background-color);
 }
 body > header > nav.m-navbar-landing #m-navbar-collapse li a:hover,
-body > header > nav.m-navbar-jumbo #m-navbar-collapse li a:hover,
+body > header > nav.m-navbar-cover #m-navbar-collapse li a:hover,
 body > header > nav.m-navbar-landing #m-navbar-collapse li a:focus,
-body > header > nav.m-navbar-jumbo #m-navbar-collapse li a:focus,
+body > header > nav.m-navbar-cover #m-navbar-collapse li a:focus,
 body > header > nav.m-navbar-landing #m-navbar-collapse li a:active,
-body > header > nav.m-navbar-jumbo #m-navbar-collapse li a:active {
+body > header > nav.m-navbar-cover #m-navbar-collapse li a:active {
   background-color: var(--header-link-active-background-color-semi);
 }
 
diff --git a/doc/css/page-layout.rst b/doc/css/page-layout.rst
index f7490de11201add644ec36439c0ed6939e6b5a72..3cb4b866d2bc478715f6791c77058b1bbb12c066 100644 (file)
--- a/doc/css/page-layout.rst
+++ b/doc/css/page-layout.rst
@@ -591,7 +591,7 @@ such as `image grid <{filename}/css/components.rst#image-grid>`_ possible.
 
 Similarly to `landing pages <#landing-pages>`_, the cover image of the jumbo
 article always spans the whole screen width and goes below the top navbar. If
-you want the navbar to be semi-transparent, put :css:`.m-navbar-jumbo` on the
+you want the navbar to be semi-transparent, put :css:`.m-navbar-cover` on the
 :html:`<nav>` element. Compared to `landing pages <#landing-pages>`_ the navbar
 retains semi-transparent background at all times.
 
diff --git a/pelican-plugins/m/test/htmlsanity_typography/article-jumbo.html b/pelican-plugins/m/test/htmlsanity_typography/article-jumbo.html
index 5a8f029b71ad2d3d604424c465a053bd9a57fc08..921cbfe73c75eae2fe3b85be00a4635170c29a4c 100644 (file)
--- a/pelican-plugins/m/test/htmlsanity_typography/article-jumbo.html
+++ b/pelican-plugins/m/test/htmlsanity_typography/article-jumbo.html
@@ -19,7 +19,7 @@
   <meta property="og:type" content="article" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-plugins/m/test/metadata/article-jumbo.html b/pelican-plugins/m/test/metadata/article-jumbo.html
index ddd1c1f45e77e69be66812317a687be1f459b5e4..55651d452c4644ba7719d638ce6d8f6847653ce8 100644 (file)
--- a/pelican-plugins/m/test/metadata/article-jumbo.html
+++ b/pelican-plugins/m/test/metadata/article-jumbo.html
@@ -21,7 +21,7 @@
   <meta property="og:type" content="article" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-theme/templates/base.html b/pelican-theme/templates/base.html
index 513a41a7ebb3ce1de15d4f5285fa207e8dc9fc24..aed2a29cb5578753ae87f917722b3fff1780537a 100644 (file)
--- a/pelican-theme/templates/base.html
+++ b/pelican-theme/templates/base.html
@@ -32,7 +32,7 @@
   {% endif %}
 </head>
 <body>
-<header><nav id="navigation"{% if page and page.landing and page.cover %} class="m-navbar-landing"{% endif %}{% if article and article.cover %} class="m-navbar-jumbo"{% endif %}>
+<header><nav id="navigation"{% if page and page.landing and page.cover %} class="m-navbar-landing"{% elif (page and page.cover) or (article and article.cover) %} class="m-navbar-cover"{% endif %}>
   <div class="m-container">
     <div class="m-row">
       <a href="{{ SITEURL }}/" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m{% if page and page.landing and page.cover and page.hide_navbar_brand == 'True' %} m-navbar-brand-hidden{% endif %}">
diff --git a/pelican-theme/test/blog/article-jumbo.html b/pelican-theme/test/blog/article-jumbo.html
index 9cf46ccc863043c4036083984e5763bd4a93d356..b3a15b5315c1572dd16c66d44b751a9ce3bb538c 100644 (file)
--- a/pelican-theme/test/blog/article-jumbo.html
+++ b/pelican-theme/test/blog/article-jumbo.html
@@ -19,7 +19,7 @@
   <meta property="og:type" content="article" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-theme/test/blog_author_list/article-jumbo.html b/pelican-theme/test/blog_author_list/article-jumbo.html
index ab955df8f4cab5b762e0f1cffd46c4896a635cec..3c2baba99aa542439e76699b53ed7562fe1dab00 100644 (file)
--- a/pelican-theme/test/blog_author_list/article-jumbo.html
+++ b/pelican-theme/test/blog_author_list/article-jumbo.html
@@ -9,7 +9,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html
index 14d1bf860baea2b6fab9e66838e98b8912289cff..42c26adbe2be2ee07f9d37c49d47a91a38194b77 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html
+++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html
@@ -9,7 +9,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html
index 663039867beccce94341535da0bf95259052fb05..6e7fbaf4e5c2be5bcf436d1382917cdd95650d11 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html
+++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html
@@ -9,7 +9,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html
index 183577655157dbfd4ef72f01c87385d09cc37097..bcd15ea541b0fe286b0c2eeac6c839f4fe226ad3 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html
+++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html
@@ -9,7 +9,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html
index 663039867beccce94341535da0bf95259052fb05..6e7fbaf4e5c2be5bcf436d1382917cdd95650d11 100644 (file)
--- a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html
+++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html
@@ -9,7 +9,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-theme/test/blog_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_hide_summary_both/article-jumbo.html
index d58eae0b481064328fd09f27fc511ffa9a5575fe..205b81df467d9db2f04ad61dd9d75808326726cb 100644 (file)
--- a/pelican-theme/test/blog_hide_summary_both/article-jumbo.html
+++ b/pelican-theme/test/blog_hide_summary_both/article-jumbo.html
@@ -9,7 +9,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-theme/test/blog_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_hide_summary_global/article-jumbo.html
index cab8efc3e260234fdb623bbf05f11e70ca8c3dc6..60092c7c136ef847a698f5f9156a0357d1a4c08a 100644 (file)
--- a/pelican-theme/test/blog_hide_summary_global/article-jumbo.html
+++ b/pelican-theme/test/blog_hide_summary_global/article-jumbo.html
@@ -9,7 +9,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-theme/test/blog_html_escape/article-jumbo.html b/pelican-theme/test/blog_html_escape/article-jumbo.html
index eae60fc6fe25cf5c72a0e836667920e28bbf7381..c38788886c7a0144342d9c5d094bc6a8eae69e70 100644 (file)
--- a/pelican-theme/test/blog_html_escape/article-jumbo.html
+++ b/pelican-theme/test/blog_html_escape/article-jumbo.html
@@ -20,7 +20,7 @@
   <meta property="og:type" content="article" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">&lt;&amp;&gt; in site name</a>
diff --git a/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html b/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html
index da40587e785af2412b4a2f821f6e2a0d1e11be44..7c52de2b9f4b3cf2c155e062135d0f3c4ec05ac7 100644 (file)
--- a/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html
+++ b/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html
@@ -9,7 +9,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
diff --git a/pelican-theme/test/blog_minimal/article-jumbo.html b/pelican-theme/test/blog_minimal/article-jumbo.html
index 1e648198725abed388d2709ffdf1424859cbba7f..726dcbef150dc4bfcce04acaefa1754ff6344735 100644 (file)
--- a/pelican-theme/test/blog_minimal/article-jumbo.html
+++ b/pelican-theme/test/blog_minimal/article-jumbo.html
@@ -17,7 +17,7 @@
   <meta property="og:type" content="article" />
 </head>
 <body>
-<header><nav id="navigation" class="m-navbar-jumbo">
+<header><nav id="navigation" class="m-navbar-cover">
   <div class="m-container">
     <div class="m-row">
       <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
Colin Watson's blog