simplify css

7 files changed, 41 insertions, 63 deletions

diff --git a/NEWS.md b/NEWS.md
index cf85e46..4dee376 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,14 +1,4 @@
 ---
-layout: page
+layout: relnews
 title: Irssi NEWS
-container_class: news
 ---
-{% include relnews.markdown %}
-<script src="https://scripts.irssi.org/assets/js/jquery.min.js"></script>
-<script src="https://scripts.irssi.org/assets/js/jquery.timeago.js"></script>
-<script>
-$(function() {
-  jQuery.timeago.settings.cutoff = 365*24*60*60*1000;
-  $("abbr.timeago").timeago();
-});
-</script>
diff --git a/_layouts/default.html b/_layouts/default.html
index c783d3a..4692fb1 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -7,7 +7,7 @@
 
         <div class="page-content">
             <div class="toprule tr-{{page.layout}}"></div>
-            <div class="container {{page.container_class}} {{page.layout}}">
+            <div class="container {{page.container_class | default: layout.container_class}} {{page.collection}} {{page.layout}}">
                 {% if page.sidebar %}
                 <div class="col-xs-12 col-md-8">
                     {{ content }}
diff --git a/_layouts/page.html b/_layouts/page.html
index 0adbd61..ff58b6f 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -1,5 +1,6 @@
 ---
 layout: default
+container_class: wrc
 ---
 
 <h1>{{ page.title }}</h1>
diff --git a/_layouts/post.html b/_layouts/post.html
index 7add29a..7dbbbdf 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -1,5 +1,6 @@
 ---
 layout: default
+container_class: wrc
 ---
 
 <h1>{{ page.title }}</h1>
diff --git a/_layouts/relnews.html b/_layouts/relnews.html
new file mode 100644
index 0000000..26898c0
--- /dev/null
+++ b/_layouts/relnews.html
@@ -0,0 +1,13 @@
+---
+layout: page
+container_class: wrc
+---
+{% capture markdown %}{% include relnews.markdown %}{% endcapture %}{{ markdown | markdownify }}
+<script src="https://scripts.irssi.org/assets/js/jquery.min.js"></script>
+<script src="https://scripts.irssi.org/assets/js/jquery.timeago.js"></script>
+<script>
+$(function() {
+  jQuery.timeago.settings.cutoff = 365*24*60*60*1000;
+  $("abbr.timeago").timeago();
+});
+</script>
diff --git a/_layouts/security_html.html b/_layouts/security_html.html
index 5cd9690..164a8bf 100644
--- a/_layouts/security_html.html
+++ b/_layouts/security_html.html
@@ -2,6 +2,7 @@
 layout: default
 title: Security Advisory
 title_from: name
+container_class: wrc
 ---
 
 {% capture markdown %}{% include sec_txt/master.txt md=true %}{% endcapture %}{{ markdown | markdownify }}{%
diff --git a/assets/css/style.css b/assets/css/style.css
index 677d0ff..c933818 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -261,7 +261,7 @@ blockquote {
     height: calc(100vh - 50px);
 }
 
-.page > .sticken > .default-sidebar {
+.container > .sticken > .default-sidebar {
     height: calc(100vh - 74px);
     overflow-y: auto;
 }
@@ -279,8 +279,8 @@ blockquote {
     padding-top: 20px;
 }
 
-.container.news > div > hr,
-.container.news > hr {
+.container.relnews > div > hr,
+.container.relnews > hr {
     border-top: 2px solid #eceff4; /* .page-header (thicker) */
     max-width: 730px;
     margin-left: 0;
@@ -399,73 +399,45 @@ blockquote {
 }
 }
 
-.container.post > div > p,
-.container.post > div > ul,
-.container.post > div > blockquote,
-.container.page > div > p,
-.container.page > div > ul,
-.container.page > div > ol,
-.container.page > div > blockquote,
-.container.page > div > dl,
-.container.security_html > div > p,
-.container.security_html > div > ul,
-.container.security_html > div > ol,
-.container.security_html > div > blockquote,
-.container.security_html > div > dl,
-.container.post > p,
-.container.post > ul,
-.container.post > blockquote,
-.container.page > p,
-.container.page > ul,
-.container.page > ol,
-.container.page > blockquote,
-.container.page > dl,
-.container.security_html > p,
-.container.security_html > ul,
-.container.security_html > ol,
-.container.security_html > blockquote,
-.container.security_html > dl {
+.container.wrc > blockquote,
+.container.wrc > div > blockquote,
+.container.wrc > div > dl,
+.container.wrc > div > ol,
+.container.wrc > div > p,
+.container.wrc > div > ul,
+.container.wrc > dl,
+.container.wrc > ol,
+.container.wrc > p,
+.container.wrc > ul {
     max-width: 730px;
 }
 
-.container.page > div > dl > dd,
-.container.security_html > div > dl > dd,
-.container.page > dl > dd,
-.container.security_html > dl > dd {
+.container.wrc > div > dl > dd,
+.container.wrc > dl > dd {
     margin-left: 1em;
 }
 
-.container.page > div > h3,
-.container.security_html > div > h3,
-.container.page > h3,
-.container.security_html > h3 {
+.container.wrc > div > h3,
+.container.wrc > h3 {
     max-width: 750px;
 }
 
-.container.post > div > .wide,
-.container.post > .wide {
+.container.wrc > div > .wide,
+.container.wrc > .wide {
     max-width: 100%;
 }
 
 @media (min-width:768px) and (max-width: 991px) {
-    .container.post > div > div > div.highlight,
-    .container.page > div > div > div.highlight,
-    .container.security_html > div > div > div.highlight,
-    .container.post > div > div.highlight,
-    .container.page > div > div.highlight,
-    .container.security_html > div > div.highlight {
+    .container.wrc > div > div > div.highlight,
+    .container.wrc > div > div.highlight {
 	display: inline-block;
 	min-width: 720px;
     }
 }
 
 @media (min-width: 992px) {
-    .container.post > div > div > div.highlight,
-    .container.page > div > div > div.highlight,
-    .container.security_html > div > div > div.highlight,
-    .container.post > div > div.highlight,
-    .container.page > div > div.highlight,
-    .container.security_html > div > div.highlight {
+    .container.wrc > div > div > div.highlight,
+    .container.wrc > div > div.highlight {
 	display: inline-block;
 	min-width: 730px;
     }