autonomic-cooperative
/
hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
gaelle morin 2020-05-25 15:42:42 +02:00
parent e26b5f45f5
commit 581d89709d
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/styles/base/main.scss
View File

@ -154,17 +154,6 @@ h5 {
font-size: 2rem; 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 { .avatar {
align-items: center; align-items: center;
background-color: var(--color-avatar-background); background-color: var(--color-avatar-background);

6
src/styles/components/sidebar.scss
View File

@ -1,13 +1,9 @@
.no-sidebar { .no-sidebar {
flex: 1; flex: 1;
<<<<<<< HEAD
&.with-padding { &.with-padding {
@extend %padding-main; padding: 1.3rem;
} }
=======
padding: 5rem;
>>>>>>> d9b2c89... update: flex class added in other files + %padding removed
} }
.with-sidebar { .with-sidebar {