Update with new homepage

content/about/_index.md

@@ -9,11 +9,7 @@ categories: []
 tags: []
 weight: 01
 draft: false
-<<<<<<< HEAD:content/about/_index.md
-aliases: [/about-hugo/]
-=======
-aliases: [/docs/]
->>>>>>> homepage:content/about-hugo/_index.md
+aliases: [/about-hugo/,/docs/]
 toc: false
 ---
 

content/about/what-is-hugo.md

@@ -67,11 +67,8 @@ I wanted to develop a fast and full-featured website framework without any depen
 [Middleman]: https://middlemanapp.com/
 [Nanoc]: http://nanoc.ws/
 [Nanoc]: https://nanoc.ws/
-<<<<<<< HEAD:content/about/what-is-hugo.md
 [rackspace]: https://www.rackspace.com/cloud/files
 [static site generator]: /about/benefits/
-=======
 [Rackspace]: https://www.rackspace.com/cloud/files
-[static site generator]: /about-hugo/benefits/
->>>>>>> homepage:content/about-hugo/what-is-hugo.md
+[static site generator]: /about/benefits/
 [Surge]: https://surge.sh

content/functions/adddate.md

@@ -14,8 +14,6 @@ hugoversion:
 relatedfuncs: [now]
 deprecated: false
 aliases: []
-<<<<<<< HEAD
-needsexamples: true
 ---
 
 
@@ -54,9 +52,5 @@ Let's assume you want to grab Tweets from the last two years and present them in
 {{% /code %}}
 
 <!-- Look to example in docs site here: https://github.com/spf13/hugo/blob/master/docs/layouts/index.html--e.g., can be paired with now and where -->
-=======
----
 
-<!-- Look to example in docs site here: https://github.com/spf13/hugo/blob/master/docs/layouts/index.html--e.g., can be paired with now and where -->
 
->>>>>>> homepage

layouts/_default/single.html

@@ -7,14 +7,6 @@
 			{{- partial "page-title.html" . -}}
 			{{- partial "content-header-links.html" . -}}
 			{{- partial "tags.html" . -}}
-<<<<<<< HEAD
-			<!-- temporary WIP badge; should be removed before site launch -->
-			<!-- {{- if .Params.wip -}}
-			<div id="beingreviewed">WIP</div>
-			{{- end -}} -->
-			{{ $title := .Title }}
-=======
->>>>>>> homepage
 		</header>
 		<div class="body-copy" data-section={{.Section | urlize}}>
 		{{.Content}}

layouts/partials/head/site-style.html

@@ -1,10 +1,6 @@
 <link rel="stylesheet" href="/css/style.min.css">
 <script src="https://use.typekit.net/bmc1jgv.js"></script>
-<<<<<<< HEAD
 <script>try{Typekit.load({ async: false });}catch(e){}</script>
 {{if .Site.Params.usefontawesome}}
 <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
 {{end}}
-=======
-<script>try{Typekit.load({ async: false });}catch(e){}</script>
->>>>>>> homepage

pipeline/scss/components/_code.scss

@@ -5,12 +5,6 @@
     font-size: .9em;
     weight: inherit;
     font-weight: $code-font-base-weight;
-<<<<<<< HEAD
-    position: relative;
-    overflow-y: visible;
-    z-index:1;
-  }
-=======
     overflow-y: visible;
     z-index: 1;
   }
@@ -18,7 +12,6 @@
     position: relative;
     margin-bottom: 1.5em;
   }
->>>>>>> homepage
   pre > code,
   .code {
     background-color: $code-block-background-color;
@@ -51,10 +44,7 @@
   overflow: hidden;
   padding: .5em;
   overflow-y: visible;
-<<<<<<< HEAD
-=======
   margin-bottom: 1.5em;
->>>>>>> homepage
 }
 
 code[class^="language-"] {
@@ -63,24 +53,12 @@ code[class^="language-"] {
     position: absolute;
     top: 4px;
     right: 4px;
-<<<<<<< HEAD
-    color: lighten($base-font-color, 25%);
-=======
     color: lighten($base-font-color, 35%);
->>>>>>> homepage
     font-family: 'fontello';
     content: '\f121';
   }
 }
 
-<<<<<<< HEAD
-.copy-button + .code-copy-content {
-  code[class^="language-"] {
-    &:after {
-      display: none;
-      position: absolute;
-      top: -14px;
-=======
 // .filename + .code-copy-content {
 //   code[class^="language-"] {
 //     &:after {
@@ -98,7 +76,6 @@ code[class^="language-"] {
       // display: none;
       position: absolute;
       top: -4px;
->>>>>>> homepage
       right: 4px;
     }
   }
@@ -129,62 +106,6 @@ code.language-scss:after {
   content: '\e803';
 }
 
-<<<<<<< HEAD
-.filename {
-  font-family: $code-font-family;
-  color: lighten($base-font-color, 45%);
-  padding-left: 1em;
-  padding-top: .25em;
-  font-size: .7em;
-  background-color: $code-block-background-color;
-  width: 100%;
-  font-style: italic;
-  margin-bottom: 0px;
-}
-
-.code-icon {
-  position: absolute;
-  top: 2px;
-  right: 4px;
-}
-
-.copy-button {
-  transition: opacity .3s ease-in-out;
-  opacity: 1;
-  position: absolute;
-  right: 1px;
-  top: 1px;
-  background-color: white;
-  color: $base-font-color;
-  border-radius: 0px;
-  @include card(1);
-  height: 30px;
-  width: auto;
-  font-size: 12px;
-  display: block;
-  z-index: 999;
-  &:hover {
-    @include card(3);
-  }
-  span.button-text {
-    text-transform: uppercase;
-    margin-left: 3px;
-  }
-}
-
-.download-button {
-  display: none!important;
-}
-
-.code:hover {
-  .copy-button,
-  .download-button {
-    transition: all .3s ease-in-out;
-    opacity: 1;
-  }
-}
-
-=======
 code.language-bash:after,
 code.language-sh:after {
   font-family: 'fontello';
@@ -240,7 +161,8 @@ code.language-markdown:after {
   right: 4px;
 }
 
-.copy-button,.download-button {
+.copy-button,
+.download-button {
   transition: opacity .3s ease-in-out;
   opacity: 1;
   position: absolute;
@@ -265,13 +187,12 @@ code.language-markdown:after {
 }
 
 .download-button {
-  position:absolute;
+  position: absolute;
   min-width: 70px;
-  top:1px;
-  right:72px;
+  top: 1px;
+  right: 72px;
 }
 
->>>>>>> homepage
 .tooltipped {
   position: absolute;
   // background-color: $code-tooltip-bg-color;
@@ -391,8 +312,6 @@ code.language-markdown:after {
 
 .tooltipped-s:after,
 .tooltipped-n:after {
-  -webkit-transform: translateX(50%);
-  -ms-transform: translateX(50%);
   transform: translateX(50%)
 }
 
@@ -400,8 +319,6 @@ code.language-markdown:after {
   right: 100%;
   bottom: 50%;
   margin-right: 5px;
-  -webkit-transform: translateY(50%);
-  -ms-transform: translateY(50%);
   transform: translateY(50%)
 }
 
@@ -417,8 +334,6 @@ code.language-markdown:after {
   bottom: 50%;
   left: 100%;
   margin-left: 5px;
-  -webkit-transform: translateY(50%);
-  -ms-transform: translateY(50%);
   transform: translateY(50%)
 }
 

pipeline/scss/vendor/_highlightjs-OLD.scss

@@ -1,87 +0,0 @@
-/*
-Monokai Sublime style. Derived from Monokai by noformnocontent http://nn.mit-license.org/
-*/
-/* SEE HUGO SPECIFIC CLASSES AT BOTTOM OF PAGE*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  background: $code-block-background-color;
-  font-size:.9em;
-}
-
-.hljs,
-.hljs-tag,
-.hljs-subst {
-  color: $hugo-white;
-}
-
-.hljs-strong,
-.hljs-emphasis {
-  color: $hugo-gray-light;
-}
-
-.hljs-bullet,
-.hljs-quote,
-.hljs-number,
-.hljs-regexp,
-.hljs-literal,
-.hljs-link {
-  color: $hugo-blue;
-}
-
-.hljs-code,
-.hljs-title,
-.hljs-section,
-.hljs-selector-class {
-  color: $hugo-green-light;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-name,
-.hljs-attr {
-  color: $hugo-pink-light;
-}
-
-.hljs-symbol,
-.hljs-attribute {
-  color: $hugo-blue-light;
-}
-
-.hljs-params,
-.hljs-class .hljs-title {
-  color: $hugo-white;
-}
-
-.hljs-string,
-.hljs-type,
-.hljs-built_in,
-.hljs-builtin-name,
-.hljs-selector-id,
-.hljs-selector-attr,
-.hljs-selector-pseudo,
-.hljs-addition,
-.hljs-variable,
-.hljs-template-variable {
-  color: $hugo-yellow;
-}
-
-.hljs-comment,
-.hljs-deletion,
-.hljs-meta {
-  color: $hugo-gray-light;
-}
-
-.language-toml.hljs .hljs-section {
-  color:$hugo-pink-light;
-}