Merge pull request #28 from artem-forks/small-cleanups

artem-sidorenko · web-flow · commit bac941b4d1af · 2018-12-19T22:31:33.000+01:00
Small cleanups
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ tools/contributors/node_modules
 tools/contributors/contributors.json
 /public
 /deployment
+.DS_Store
diff --git a/config.toml b/config.toml
@@ -25,7 +25,7 @@ metaDataFormat = "yaml"
 [[menu.global]]
   name = "Community"
   weight = 3
-  identifier = "comunity"
+  identifier = "community"
   url = "/community/"
 
 [[menu.global]]
diff --git a/content/blog/_index.md b/content/blog/_index.md
@@ -1,3 +1,3 @@
 ---
-title: "DevSec Blog"
+title: "News"
 ---
diff --git a/themes/devsec/layouts/_default/baseof.html b/themes/devsec/layouts/_default/baseof.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>{{ block "title" . }} {{ .Site.Title }}  {{ end }}</title>
+    <title>{{ block "title" . }} {{ .Title }} – {{ .Site.Title }} {{ end }}</title>
 
     <link rel="stylesheet" href="/css/app.css" />
     <link rel="stylesheet" href="/css/github_buttons.css" />
diff --git a/themes/devsec/layouts/_default/single.html b/themes/devsec/layouts/_default/single.html
@@ -1,6 +1,3 @@
-{{ define "title" }}
-  {{ .Title }} – {{ .Site.Title }}
-{{ end }}
 {{ define "main" }}
   <h1>{{ .Title }}</h1>
   {{ .Content }}
diff --git a/themes/devsec/layouts/baselines/profile.html b/themes/devsec/layouts/baselines/profile.html
@@ -1,7 +1,3 @@
-{{ define "title" }}
-  {{ .Title }} – {{ .Site.Title }}
-{{ end }}
-
 {{ define "main" }}
 
 {{ partial "baselines/urlbar.html" (index $.Site.Data.baselines .Params.baseline)  }}
@@ -25,4 +21,4 @@
   profile.profile = {{ getJSON .Params.inspec }}
 </script>
 
-{{end}}
+{{end}}
diff --git a/themes/devsec/layouts/blog/list.html b/themes/devsec/layouts/blog/list.html
@@ -1,34 +1,34 @@
 {{ define "main" }}
-<section id="blog-header">
+<section id="page-header">
   <div class="row">
     <div class="large-12 medium-12 small-12 small-center columns">
       <h2>News</h2>
     </div>
   </div>
 </section>
 
-  <!-- merge internal and external content -->
-  {{ $list := .Data.Pages  }}
-  <section class="blog overview">
-    {{ range $list }}
-    <div class="row">
-      <article class="large-12 medium-12 small-12 small-center columns">
-        {{if eq .Params.External true}}
-        <a href="{{ .Params.External_url }}" class="external">
-          <h2>{{ .Title }}</h2>
-          <span class="time">{{ dateFormat "Monday, Jan 2, 2006" .Date }}</span><div class="tag">external</div>
-        </a>
-        {{else}}
-        <a href="{{ .RelPermalink }}">
-          <h2>{{ .Title }}</h2>
-          <span class="time">{{ dateFormat "Monday, Jan 2, 2006" .Date }}</span>
-          {{ .Summary }}
-            Read More &raquo;
-        </a>
-        {{end}}
-      </article>
-    </div>
-    <br>
-    {{ end }}
-  </section>
+<!-- merge internal and external content -->
+{{ $list := .Data.Pages  }}
+<section class="blog overview">
+  {{ range $list }}
+  <div class="row">
+    <article class="large-12 medium-12 small-12 small-center columns">
+      {{if eq .Params.External true}}
+      <a href="{{ .Params.External_url }}" class="external">
+        <h2>{{ .Title }}</h2>
+        <span class="time">{{ dateFormat "Monday, Jan 2, 2006" .Date }}</span><div class="tag">external</div>
+      </a>
+      {{else}}
+      <a href="{{ .RelPermalink }}">
+        <h2>{{ .Title }}</h2>
+        <span class="time">{{ dateFormat "Monday, Jan 2, 2006" .Date }}</span>
+        {{ .Summary }}
+          Read More &raquo;
+      </a>
+      {{end}}
+    </article>
+  </div>
+  <br>
+  {{ end }}
+</section>
 {{ end }}
diff --git a/themes/devsec/layouts/blog/single.html b/themes/devsec/layouts/blog/single.html
@@ -1,7 +1,3 @@
-{{ define "title" }}
-  {{ .Title }} – {{ .Site.Title }}
-{{ end }}
-
 {{ define "main" }}
 <section class="blog content">
   <div class="row">
diff --git a/themes/devsec/layouts/page/community.html b/themes/devsec/layouts/page/community.html
@@ -1,7 +1,3 @@
-{{ define "title" }}
-  {{ .Title }} – {{ .Site.Title }}
-{{ end }}
-
 {{ define "main" }}
 
 <div class="explain" id="team">
diff --git a/themes/devsec/layouts/page/legal.html b/themes/devsec/layouts/page/legal.html
@@ -1,7 +1,3 @@
-{{ define "title" }}
-  {{ .Title }} – {{ .Site.Title }}
-{{ end }}
-
 {{ define "main" }}
 
 <section class="landing_container imprint">
diff --git a/themes/devsec/layouts/page/project.html b/themes/devsec/layouts/page/project.html
@@ -1,7 +1,3 @@
-{{ define "title" }}
-  {{ .Title }} – {{ .Site.Title }}
-{{ end }}
-
 {{ define "main" }}
 <section class="contributing content">
     <div class="row">
@@ -71,4 +67,4 @@ <h3>Edmund Haselwanter</h3>
   </section>
 </div>
 
-{{ end }}
+{{ end }}
diff --git a/themes/devsec/layouts/page/text.html b/themes/devsec/layouts/page/text.html
@@ -1,7 +1,3 @@
-{{ define "title" }}
-  {{ .Title }} – {{ .Site.Title }}
-{{ end }}
-
 {{ define "main" }}
 <section class="contributing content">
   <div class="row">
@@ -13,4 +9,4 @@ <h1>{{ .Title }}</h1>
     </div>
   </div>
 </section>
-{{ end }}
+{{ end }}
diff --git a/themes/devsec/layouts/page/videos.html b/themes/devsec/layouts/page/videos.html
@@ -1,19 +1,16 @@
-{{ define "title" }}
-  {{ .Title }} – {{ .Site.Title }}
-{{ end }}
-
 {{ define "main" }}
+<section id="page-header">
+  <div class="row">
+    <div class="large-12 medium-12 small-12 small-center columns">
+      <h2>Videos</h2>
+    </div>
+  </div>
+</section>
 
-<section class="articles bg-gray">
+<section class="articles">
   <div class="row">
     <div class="large-12 medium-12 small-12 small-center columns">
     <div>
-      <div class="row articles-header">
-        <div class="small-12 columns">
-          <h2>Videos</h2>
-        </div>
-      </div>
-
       <div class="row articles-container" data-equalizer="">
         {{ range $ind, $vid := $.Site.Data.videos.videos }}
         <div class="large-6 medium-12 small-12 columns text-center video">
diff --git a/themes/devsec/static/css/app.css b/themes/devsec/static/css/app.css
@@ -10234,14 +10234,6 @@ th.hide-for-touch {
   color: white;
 }
 
-.bg-gray {
-  background-color: #edeeed;
-}
-
-.bg-gray h2 {
-  color: black !important;
-}
-
 .bg-landing {
   background: url('/images/bg.png');
   -moz-background-size: 100% 100%;
@@ -10463,10 +10455,10 @@ th.hide-for-touch {
   padding-bottom: 20px;
 }
 
-#blog-header {
+#page-header {
 }
 
-#blog-header h2 {
+#page-header h2 {
   text-align: center;
 }
 
@@ -11274,8 +11266,7 @@ footer ul li a:hover {
 
 @media only screen {
 
-  .imprint,
-  .articles {
+  .imprint {
     padding-top: 3rem;
   }
 
@@ -11306,8 +11297,7 @@ footer ul li a:hover {
 
 @media only screen and (min-width: 40.063em) {
 
-  .imprint,
-  .articles {
+  .imprint {
     padding-top: 5rem;
   }
 }
@@ -11385,4 +11375,4 @@ blockquote p {
 
 .profile {
   min-height: 400px;
-}
+}

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 ---
 -title: "DevSec Blog"
 +title: "News"
 ---