Skip to content

Commit

Permalink
Feat/css modules (#813)
Browse files Browse the repository at this point in the history
* add css linter

* Add css modules package

* lint fixes
  • Loading branch information
brianmarete authored Oct 4, 2021
1 parent 3e95aa6 commit ea3b4c4
Show file tree
Hide file tree
Showing 52 changed files with 1,685 additions and 570 deletions.
30 changes: 30 additions & 0 deletions frontend/.stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"extends": [
"stylelint-prettier/recommended"
],
"plugins": [
"stylelint-prettier"
],
"rules": {
"prettier/prettier": [
true,
{
"printWidth": 120
}
],
"declaration-no-important": [
true,
{
"severity": "warning"
}
],
"property-disallowed-list": [
[
"font"
],
{
"message": "Use seperate font-* attributes"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$palette: (
primary: #F57010,
primary: #f57010,
black: #000000,
boxShadow: #0A4B6D2E,
gray30: #3F484D,
boxShadow: #0a4b6d2e,
gray30: #3f484d,
);

.badges .badges-homepage {
Expand Down Expand Up @@ -33,7 +33,7 @@ $palette: (
font-size: 14px;

circle {
fill: #F5D4BD;
fill: #f5d4bd;
}

path {
Expand All @@ -46,7 +46,8 @@ $palette: (
padding-top: 10px;
}

.badges-earned-total-card, .badges-total-card {
.badges-earned-total-card,
.badges-total-card {
.badges-total-count {
font-size: 26px;
}
Expand All @@ -68,7 +69,6 @@ $palette: (

.badges .badges-homepage {
.badges-section .submenu-section {

.dropdown-toggle {
color: map-get($palette, black);
}
Expand Down Expand Up @@ -106,11 +106,9 @@ $palette: (
}
}
}

}
}


.badges .badges-manage-page {
.title {
font-size: 16px;
Expand All @@ -133,7 +131,8 @@ $palette: (
padding-bottom: 20px;
}

.badge-card, .create-badge-card {
.badge-card,
.create-badge-card {
border: 1px solid rgba(201, 202, 203, 1);
box-shadow: 0px 3px 16px rgba(10, 75, 109, 0.18);
min-height: 165px;
Expand Down Expand Up @@ -279,10 +278,8 @@ $palette: (

.badges .badges-manage-page {
.creation-form {


.badge-icon-card {
box-shadow: 0 3px 16px rgba(10, 75, 109, 0.18);;
box-shadow: 0 3px 16px rgba(10, 75, 109, 0.18);
min-width: 400px;
min-height: 194px;

Expand Down Expand Up @@ -327,9 +324,9 @@ $palette: (
}

input::placeholder,
select:invalid, {
select:invalid {
font-size: 13px;
color: #A6ADB4;
color: #a6adb4;
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions frontend/app/styles/_badge-modal.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$palette: (
primary: #F57010,
studio: #5A47AD,
windsor: #4E0B80,
white: #FFFF
primary: #f57010,
studio: #5a47ad,
windsor: #4e0b80,
white: #ffff,
);

.badge-popup {
Expand Down
File renamed without changes.
Loading

0 comments on commit ea3b4c4

Please sign in to comment.