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

src/styles/base/main.scss

@@ -154,6 +154,7 @@ h5 {
   font-size: 2rem;
 }
 
+<<<<<<< HEAD
 %padding-main {
   padding: 1.3rem;
 }
@@ -162,6 +163,8 @@ h5 {
   padding: 3.2rem;
 }
 
+=======
+>>>>>>> d9b2c89... update: flex class added in other files + %padding removed
 .avatar {
   align-items: center;
   background-color: var(--color-avatar-background);
@@ -190,7 +193,6 @@ h5 {
 
 .content-box {
   @include window-style-modal();
-  display: flex;
   flex-direction: column;
   flex-grow: 1;
   margin: 2rem 1rem 5rem 2rem;
@@ -202,10 +204,6 @@ h5 {
     margin: 0 auto;
     min-height: 100%;
   }
-
-  &.with-padding {
-    @extend %padding-main;
-  }
 }
 
 /* Header inside circle, project view  */
@@ -268,8 +266,8 @@ h5 {
 }
 
 .content-box__info {
-  @extend %padding-block;
   flex-direction: column;
+  padding: 3.2rem;
 }
 
 /*.modal {
@@ -329,7 +327,6 @@ h5 {
 }
 
 .space-between {
-  display: flex;
   justify-content: space-between;
   padding-bottom: 1.4rem;
 }

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 {