Skip to content

Commit

Permalink
style(core): rename to scss modules [#94]
Browse files Browse the repository at this point in the history
  • Loading branch information
Drapegnik committed Mar 14, 2020
1 parent e6eb799 commit d783437
Show file tree
Hide file tree
Showing 43 changed files with 143 additions and 136 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.admin-sidebar {
&-nav-list {
&__nav-list {
list-style-type: none;
margin: 0 0 30px;
padding: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.admin-panel {
padding: 0 90px 60px;

&-grid {
&__grid {
display: flex;

&__aside {
&-aside {
flex: 0 0 auto;
padding-right: 20px;
width: 100px;
}

&__main {
&-main {
flex: 1 1 auto;
font-size: 0.9rem;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

.articles-by-tag-2 {
display: flex;
Expand Down Expand Up @@ -127,7 +127,7 @@
}

// ALERT HACK.
&__card1 {
&__card-1 {
margin: 20px 0;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

.articles-by-tag-3 {
&__title {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

.banner {
position: relative;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

.block {
&.wir-no-background {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

.diary {
&__content {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'responsiveness';
@import 'styles/responsiveness';

.tag-page-block-b {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'responsiveness';
@import 'styles/responsiveness';

.tag-page-block-cd {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'responsiveness';
@import 'styles/responsiveness';

.tags-by-topic {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'responsiveness';
@import 'styles/responsiveness';

.two-in-row {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

@import './cards';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

@import './cards';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

@import './cards';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

@import './cards';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'responsiveness';
@import 'styles/responsiveness';

@import './cards';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

.tag-card {
//
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'variables';
@import 'styles/variables';

.login-form {
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'variables';
@import 'styles/variables';

.form-error {
color: $error;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'variables';
@import 'responsiveness';
@import 'styles/variables';
@import 'styles/responsiveness';

.error-message {
padding: 1.5rem 2rem 3rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,58 +1,5 @@
@import 'responsiveness';
@import 'variables';

.footer-layout {
margin: 5rem 2rem 1rem 1rem;
padding: 2rem 0 0;

@include touch {
margin: 3rem 6rem 3rem 3rem;
}

&__nested1 {
display: flex;
flex-direction: column;

@include desktop {
flex-direction: row;
}
}

&__nested2 {
display: flex;
flex-direction: column;

@media screen and (min-width: 720px) {
flex-direction: row;
}

@include desktop {
flex: 5;
}
}

&__block1 {
@include touch {
flex: 1;
}
}

&__block2 {
@include touch {
flex: 1;
}
}

&__block3 {
@include desktop {
flex: 2;
}
}

&__block4 {
// Bottom block.
}
}
@import 'styles/responsiveness';
@import 'styles/variables';

.footer {
border-top: solid 1px $primary-grey;
Expand Down
51 changes: 51 additions & 0 deletions components/common/layout/footer/layout.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
@import 'styles/responsiveness';
@import 'styles/variables';

.footer-layout {
margin: 5rem 2rem 1rem 1rem;
padding: 2rem 0 0;

@include touch {
margin: 3rem 6rem 3rem 3rem;
}

&__nested1 {
display: flex;
flex-direction: column;

@include desktop {
flex-direction: row;
}
}

&__nested2 {
display: flex;
flex-direction: column;

@media screen and (min-width: 720px) {
flex-direction: row;
}

@include desktop {
flex: 5;
}
}

&__block1 {
@include touch {
flex: 1;
}
}

&__block2 {
@include touch {
flex: 1;
}
}

&__block3 {
@include desktop {
flex: 2;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

$navbar-base-height: 42px;

Expand Down
4 changes: 2 additions & 2 deletions components/common/layout/layout.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

html {
height: 100%;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

.sidebar {
background-color: $primary-concrete;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'responsiveness';
@import 'variables';
@import 'styles/responsiveness';
@import 'styles/variables';

.wir-modal {
height: 100%;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
@import 'variables';
@import 'styles/variables';

.wir-button-group {
.button-group {
display: flex;
font-size: 0.8rem;
position: relative;

.wir-button {
&__icon {
button {
flex-basis: auto;
flex-grow: 1;
}
}

button {
background-color: $primary-white;
border: 1px solid $primary-grey;
border-left: 0;
float: left;
outline: none;
text-align: center;

&__icon {
flex-basis: auto;
flex-grow: 1;
}

&:hover {
background-color: $primary-white;
box-shadow: inset 0 0 1px $primary-grey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'variables';
@import 'styles/variables';

.wir-kit-button {
background-color: $primary-white;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'variables';
@import 'styles/variables';

.wir-input {
display: flex;
Expand Down Expand Up @@ -37,7 +37,7 @@
color: $error;
}

&__input {
&__control {
background: inherit;
border: 0;
flex-grow: 1;
Expand Down Expand Up @@ -88,12 +88,12 @@
transform: rotate(360deg);
}
}
}

// change autocomplete styles in Chrome
input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus,
input:-webkit-autofill:active {
transition: background-color 5000s ease-in-out 0s;
// change autocomplete styles in Chrome
input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus,
input:-webkit-autofill:active {
transition: background-color 5000s ease-in-out 0s;
}
}
2 changes: 1 addition & 1 deletion components/common/ui/link.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'variables';
@import 'styles/variables';

.wir-link {
color: $primary;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
picture {
.picture {
source {
height: 100%;
width: 100%;
Expand Down
File renamed without changes.
Loading

0 comments on commit d783437

Please sign in to comment.