From 581d89709deaf3fa79d8d7ba509f69d1acd890a0 Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Mon, 25 May 2020 15:42:42 +0200
Subject: [PATCH] upate: .no-sidebar separated into .no-sidebar + .with-padding

---
 src/styles/base/main.scss          | 11 -----------
 src/styles/components/sidebar.scss |  6 +-----
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss
index fb90a79..1ef7c31 100644
--- a/src/styles/base/main.scss
+++ b/src/styles/base/main.scss
@@ -154,17 +154,6 @@ h5 {
   font-size: 2rem;
 }
 
-<<<<<<< HEAD
-%padding-main {
-  padding: 1.3rem;
-}
-
-%padding-block {
-  padding: 3.2rem;
-}
-
-=======
->>>>>>> d9b2c89... update: flex class added in other files + %padding removed
 .avatar {
   align-items: center;
   background-color: var(--color-avatar-background);
diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss
index 90bd98c..ef70cd7 100644
--- a/src/styles/components/sidebar.scss
+++ b/src/styles/components/sidebar.scss
@@ -1,13 +1,9 @@
 .no-sidebar {
   flex: 1;
-<<<<<<< HEAD
 
   &.with-padding {
-    @extend %padding-main;
+    padding: 1.3rem;
   }
-=======
-  padding: 5rem;
->>>>>>> d9b2c89... update: flex class added in other files + %padding removed
 }
 
 .with-sidebar {