update: flex class added in other files + %padding removed

2020-05-18 14:18:15 +02:00
parent af1d40cbd4
commit 56f9151345
11 changed files with 18 additions and 17 deletions
--- a/src/styles/components/sidebar.scss
+++ b/src/styles/components/sidebar.scss
@ -1,9 +1,13 @@
 .no-sidebar {
  flex: 1;
+<<<<<<< HEAD

  &.with-padding {
    @extend %padding-main;
  }
+=======
+  padding: 5rem;
+>>>>>>> d9b2c89... update: flex class added in other files + %padding removed
 }

 .with-sidebar {