From adcf615e5b583d1e2a95e385f96b6511131f091f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= <contact@tobast.fr>
Date: Thu, 19 Oct 2017 21:43:31 +0200
Subject: [PATCH] Clean up swap files and trailing whitespaces

---
 mainsite/static/sass/_colors.scss~ |  0
 mainsite/static/sass/screen.scss   | 24 ++++++++++++------------
 mainsite/static/sass/screen.scss~  | 25 -------------------------
 3 files changed, 12 insertions(+), 37 deletions(-)
 delete mode 100644 mainsite/static/sass/_colors.scss~
 delete mode 100644 mainsite/static/sass/screen.scss~

diff --git a/mainsite/static/sass/_colors.scss~ b/mainsite/static/sass/_colors.scss~
deleted file mode 100644
index e69de29..0000000
diff --git a/mainsite/static/sass/screen.scss b/mainsite/static/sass/screen.scss
index e523e63..c3b7567 100644
--- a/mainsite/static/sass/screen.scss
+++ b/mainsite/static/sass/screen.scss
@@ -82,7 +82,7 @@ header {
         position: relative;
         padding-bottom: 30px;
         margin: 30px auto;
-        
+
         &:after {
             content: " ";
             position: absolute;
@@ -113,15 +113,15 @@ header {
     .minimenu {
         display: none;
     }
-    
+
     ul.nav {
         margin-bottom: 30px;
-        
+
         li {
             display: block;
             font-weight: normal;
             margin: 7px 0;
-            
+
             a {
                 border: 1px solid $rouge;
                 background: $blanc;
@@ -129,11 +129,11 @@ header {
                 padding: 10px 0;
                 display: block;
                 text-align: center;
-                
+
                 @media screen and (min-width:$switchwidth) {
                     box-shadow: -2px 2px 0 $orange;
                     transition: box-shadow 0.4s ease-out, transform 0.4s ease-out;
-                    
+
                     &:hover {
                         box-shadow: -6px 6px 0 $orange;
                         transform: translateX(2px) translateY(-2px);
@@ -165,7 +165,7 @@ header {
         font-family: $hfont;
         box-shadow: 0 0 0 rgba($rouge, 0);
         transition: box-shadow 1s ease-out;
-        
+
         &:hover {
             box-shadow: 0 0 5px $rouge;
         }
@@ -177,17 +177,17 @@ header {
     margin-left: 30px;
     padding: 0 30px;
     max-width: 700px;
-    
+
     .publication-entry {
         display: flex;
         align-items: center;
         position: relative;
         border-bottom: 1px solid lighten($bleu, 20%);
-        
+
         &:first-child {
             border-top: 1px solid lighten($bleu, 20%);
         }
-        
+
         & > span {
             padding: 7px 5px;
             display: inline-block;
@@ -260,7 +260,7 @@ header {
             justify-content: space-around;
             font-size: 0.95em;
             margin-bottom: 10px;
-            
+
             li {
                 display: inline-block;
                 min-width: 150px;
@@ -270,7 +270,7 @@ header {
                 }
             }
         }
-        
+
         &.collapse {
             ul {
                 display: none;
diff --git a/mainsite/static/sass/screen.scss~ b/mainsite/static/sass/screen.scss~
deleted file mode 100644
index 523c975..0000000
--- a/mainsite/static/sass/screen.scss~
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Welcome to Compass.
- * In this file you should write your main styles. (or centralize your imports)
- * Import this file using the following HTML or equivalent:
- * <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
-
-@import "compass/reset";
-@import "_colors.scss";
-
-body, html {
-    background: $fond;
-    padding: 0;
-    margin: 0;
-}
-
-.container {
-    background: #fff;
-    margin: 0 auto;
-    max-width: 700px;
-}
-
-
-header {
-    background: #fff;
-    
-}