Merge branch 'master' of github.com:TheBiggerGuy/com.chelsislotten.www

TheBiggerGuy · Jan 14, 2019 · d2ff277 · d2ff277
2 parents 6d141e5 + fc8ccc6
commit d2ff277
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 82 deletions.
diff --git a/site/assets/.gitkeep b/site/assets/.gitkeep
diff --git a/site/assets/scss/main.scss b/site/assets/scss/main.scss
@@ -0,0 +1,75 @@
+/* GLOBAL STYLES
+-------------------------------------------------- */
+/* Padding below the footer and lighter body text */
+
+body {
+  padding-top: 8.5rem;
+  padding-bottom: 3rem;
+  color: #5a5a5a;
+}
+
+body { /* .dont-break-out { */
+  /* These are technically the same, but use both */
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+
+  -ms-word-break: break-all;
+  /* This is the dangerous one in WebKit, as it breaks things wherever */
+  word-break: break-all;
+  /* Instead use this non-standard one: */
+  word-break: break-word;
+
+  /* Adds a hyphen where the word breaks, if supported (No Blink) */
+  -ms-hyphens: auto;
+  -moz-hyphens: auto;
+  -webkit-hyphens: auto;
+  hyphens: auto;
+
+}
+
+
+/* MARKETING CONTENT
+-------------------------------------------------- */
+
+/* Center align the text within the three columns below the carousel */
+.marketing .col-lg-4 {
+  margin-bottom: 1.5rem;
+  text-align: center;
+}
+.marketing h2 {
+  font-weight: 400;
+}
+.marketing .col-lg-4 p {
+  margin-right: .75rem;
+  margin-left: .75rem;
+}
+
+
+/* Featurettes
+------------------------- */
+
+.featurette-divider {
+  margin: 5rem 0; /* Space out the Bootstrap <hr> more */
+}
+
+/* Thin out the marketing headings */
+.featurette-heading {
+  font-weight: 300;
+  line-height: 1;
+  letter-spacing: -.05rem;
+}
+
+.featurette-image {
+  width: 500px;
+  height: 500px;
+}
+
+
+/* RESPONSIVE CSS
+-------------------------------------------------- */
+
+@media (min-width: 40em) {
+  .featurette-heading {
+    font-size: 50px;
+  }
+}
diff --git a/site/content/podcast/cropped-wia_sticker_official1.jpg b/site/content/podcast/cropped-wia_sticker_official1.jpg
diff --git a/site/layouts/_default/baseof.html b/site/layouts/_default/baseof.html
@@ -15,85 +15,10 @@
     <!-- Icons -->
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.0/css/all.css" integrity="sha384-aOkxzJ5uQz7WBObEZcHvV5JvRW3TUc2rNPA7pe3AwnsUohiw1Vj2Rgx2KSOkF5+h" crossorigin="anonymous">
 
-    <!-- Custom styles for this template -->
-    <style type="text/css">
-        /* GLOBAL STYLES
-        -------------------------------------------------- */
-        /* Padding below the footer and lighter body text */
-
-        body {
-          padding-top: 8.5rem;
-          padding-bottom: 3rem;
-          color: #5a5a5a;
-        }
-
-        body { /* .dont-break-out { */
-          /* These are technically the same, but use both */
-          overflow-wrap: break-word;
-          word-wrap: break-word;
-
-          -ms-word-break: break-all;
-          /* This is the dangerous one in WebKit, as it breaks things wherever */
-          word-break: break-all;
-          /* Instead use this non-standard one: */
-          word-break: break-word;
-
-          /* Adds a hyphen where the word breaks, if supported (No Blink) */
-          -ms-hyphens: auto;
-          -moz-hyphens: auto;
-          -webkit-hyphens: auto;
-          hyphens: auto;
-
-        }
-
-
-        /* MARKETING CONTENT
-        -------------------------------------------------- */
-
-        /* Center align the text within the three columns below the carousel */
-        .marketing .col-lg-4 {
-          margin-bottom: 1.5rem;
-          text-align: center;
-        }
-        .marketing h2 {
-          font-weight: 400;
-        }
-        .marketing .col-lg-4 p {
-          margin-right: .75rem;
-          margin-left: .75rem;
-        }
-
-
-        /* Featurettes
-        ------------------------- */
-
-        .featurette-divider {
-          margin: 5rem 0; /* Space out the Bootstrap <hr> more */
-        }
-
-        /* Thin out the marketing headings */
-        .featurette-heading {
-          font-weight: 300;
-          line-height: 1;
-          letter-spacing: -.05rem;
-        }
-
-
-        /* RESPONSIVE CSS
-        -------------------------------------------------- */
-
-        @media (min-width: 40em) {
-          .featurette-heading {
-            font-size: 50px;
-          }
-        }
-
-        @media (min-width: 62em) {
-          .featurette-heading {
-            margin-top: 7rem;
-          }
-        }
-    </style>
+    {{ "<!-- Custom styles for this template -->" | safeHTML }}
+    {{- with resources.Get "scss/main.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint "sha256" }}
+    <link rel="stylesheet" href="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+    {{- end }}
   </head>
   <body>
 

diff --git a/site/layouts/index.html b/site/layouts/index.html
@@ -21,17 +21,17 @@ <h2>{{ $page.Title }}</h2>
 
 <hr class="featurette-divider">
 
-{{ range $page := .Pages }}
+{{ range $index, $page := .Pages }}
   {{ $image_name := $page.Params.image }}
   {{ $image := $page.Resources.GetMatch $image_name }}
   {{ if ne $image.ResourceType "image" }}{{ errorf "Image ResourceType not jpg: %s %s" .Path $image.ResourceType }}{{ end }}
   {{ $image_resized := $image.Fit "500x500" }}
   <div class="row featurette" id="{{ anchorize $page.Title }}">
-    <div class="col-md-7">
+    <div class="col-md-7 {{if (modBool $index 2)}}order-md-2{{end}}">
       <h2 class="featurette-heading">{{ $page.Params.subtitle }}</h2>
       {{ $page.Content }}
     </div>
-    <div class="col-md-5">
+    <div class="col-md-5 {{if (modBool $index 2)}}order-md-1{{end}}">
       <img class="featurette-image img-fluid mx-auto" src="{{ $image_resized.Permalink }}" alt="Generic placeholder image">
     </div>
   </div>