upate: .no-sidebar separated into .no-sidebar + .with-padding

2020-05-25 15:42:42 +02:00
parent e26b5f45f5
commit 581d89709d
2 changed files with 1 additions and 16 deletions
--- 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);
--- 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 {