From 1036911011d4634999dc96205515b13f8b7b9554 Mon Sep 17 00:00:00 2001
From: Alexander Bilz <mail@alexbilz.com>
Date: Tue, 05 Jan 2021 09:59:44 +0000
Subject: [PATCH] Reverted breaking SCSS changes

---
 assets/css/markupHighlight.css |    0 
 layouts/partials/head.html     |   12 ------
 assets/css/main.css            |   61 +++++-------------------------
 3 files changed, 11 insertions(+), 62 deletions(-)

diff --git a/assets/scss/main.scss b/assets/css/main.css
similarity index 92%
rename from assets/scss/main.scss
rename to assets/css/main.css
index 4f8356a..50d3425 100644
--- a/assets/scss/main.scss
+++ b/assets/css/main.css
@@ -1,16 +1,5 @@
 @charset "UTF-8";
 
-/* Desktop screen configs */
-$body_max_width: {{ .Site.Params.body_max_width | default "1920px" }};/*SET THIS VALUE ON MEDIA QUERY FOR BEST PRFMANCE*/
-$content_ratio: {{ .Site.Params.content_ratio | default 0.1 }};
-
-/* automated values */
-$sidebar-ratio: 1 - $content-ratio;
-$content-max-width: $body_max_width * $content_ratio;
-$sidebar-max-width: $body_max_width - $content-max-width;
-$content-width: $content_ratio * 100%;
-$sidebar-width: $sidebar-ratio * 100%;
-
 :root {
     --bg-color: #fff;
     --secondary-bg-color: #eeeeee;
@@ -26,10 +15,6 @@
     --blockquote-text-color: #858585;
     --blockquote-border-color: #dfe2e5;
     scroll-padding-top: 100px;
-    
-
-    
-
 }
 
 html[data-theme='dark'] {
@@ -58,8 +43,7 @@
     font-family: 'Verdana', sans-serif;
     font-size: 15px;
     width: 100%;
-    max-width: $body_max_width;
-    margin: 0 auto;
+    margin: 0 auto 30px auto;
     background-color: var(--bg-color);
 }
 
@@ -194,12 +178,12 @@
 .content {
     height: auto;
     float: right;
-    width: $content-width;
+    width: 60%;
     margin-top: 60px;
 }
 
 .page-top {
-    width: $content-width;
+    width: 60%;
     position: fixed;
     right: 0;
     z-index: 3;
@@ -271,14 +255,13 @@
 }
 
 .sidebar {
-    width: $sidebar-width;
+    width: 40%;
     -webkit-background-size: cover;
     background-size: cover;
     background-color: var(--bg-color);
     height: 100%;
     top: 0;
     left: 0;
-    float: left;
     position: fixed;
     z-index: 4;
     border-right: 1px solid var(--border-color);
@@ -438,6 +421,7 @@
 
 .post .post-footer .meta .info .date {
     margin-right: 10px;
+    margin-left: 5px
 }
 
 .info {
@@ -845,7 +829,6 @@
 print {
     .sidebar {
         width: 100%;
-        max-width: 100%;
         position: absolute;
         border-right: none;
         z-index: 1;
@@ -865,10 +848,6 @@
 
     .page-top {
         width: 100%;
-        max-width: 100%;
-        left: 0;
-        margin-left: 0;
-        
     }
 
     .post-title h3 {
@@ -1010,32 +989,15 @@
 	}
 }
 
-/* USE $body_max_width VALUE FOR SEAMLESS TRANSITION */
-@media (min-width: $body_max_width) { 
+@media (min-width: 1921px){
     .content {
-        width: $content-max-width;
+        padding-right: 25%;
+        width: 35%;
     }
-    
     .sidebar {
-        width: $sidebar-max-width;
-        left: 50%;
-        margin-left: calc( -1 * $body_max_width/2);
+        padding-left: 15%;
+        width: 25%;
     }
-    
-    .page-top {
-        width: $content-max-width;
-        position: fixed;
-        left: 50%;
-        margin-left: calc(-1* ($body_max_width/2 - $sidebar-max-width ));
-        z-index: 3;
-        background-color: var(--bg-color);
-        height: 60px;
-        border-bottom: 1px solid var(--border-color);
-    }
-<<<<<<< HEAD:assets/scss/main.scss
-
-}
-=======
 }
 
 
@@ -1107,5 +1069,4 @@
     border: 1px solid var(--form-button-hover-border-color);
 }
 
-/* (CONTACT) FORM END */
->>>>>>> upstream/master:assets/css/style.css
+/* (CONTACT) FORM END */
\ No newline at end of file
diff --git a/assets/scss/markupHighlight.css b/assets/css/markupHighlight.css
similarity index 100%
rename from assets/scss/markupHighlight.css
rename to assets/css/markupHighlight.css
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 983fa1d..c09cf55 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -11,17 +11,6 @@
     {{- end -}}
 
     <!-- CSS -->
-<<<<<<< HEAD
-    {{ $styles := resources.Get "scss/main.scss" | resources.ExecuteAsTemplate "style.main.scss" . | toCSS | minify | fingerprint }}
-
-    <link rel="stylesheet" 
-    href="{{ $styles.Permalink }}"
-    integrity="{{ $styles.Data.Integrity }}"
-    media="screen">
-    {{- $css := "" -}}
-    {{- range .Site.Params.customCss -}}
-    {{ $css := resources.Get . | fingerprint }}
-=======
     {{ $style := resources.Get "css/style.css" | resources.Minify | resources.Fingerprint }}
     <link rel="stylesheet"
           href="{{ $style.Permalink }}"
@@ -29,7 +18,6 @@
           crossorigin="anonymous"
           type="text/css">
     {{ $markupHighlightStyle := resources.Get "css/markupHighlight.css" | resources.Minify | resources.Fingerprint }}
->>>>>>> upstream/master
     <link rel="stylesheet"
         href="{{ $markupHighlightStyle.Permalink }}"
         integrity="{{ $markupHighlightStyle.Data.Integrity }}"

--
Gitblit v1.10.0