Skip to content
This repository was archived by the owner on Apr 5, 2020. It is now read-only.

Commit 592ca13

Browse files
committed
moved common styling pieces into variables.scss file
1 parent 19fbaf3 commit 592ca13

File tree

9 files changed

+38
-27
lines changed

9 files changed

+38
-27
lines changed

src/components/App.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1+
@import "../variables.scss";
2+
13
.link {
24
&.light {
3-
color: #81D4FA; /* lightBlue200 */
5+
color: $darkPurple;
46
&:hover {
5-
color: #B3E5FC; /* lightBlue100 */
7+
color: $lightPurple;
68
}
79
}
810
&.dark {
9-
color: #3d5afe; /* indigoA200 */
11+
color: $lightBlue100;
1012
&:hover {
11-
color: #536DFE; /* indigoA400 */
13+
color: $lightBlue200;
1214
}
1315
}
1416
}

src/components/Layout/FrontendPage.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// Components/Layout/FrontendPage.scss
2-
//
3-
4-
$darkPurple: #3d5afe;
1+
@import "../../variables.scss";
52

63
.frontend-page-container {
74
padding-top: 56px;

src/components/Menu/SpeedDial.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$actionSpacing: 8px;
1+
@import "../../variables.scss";
22

33
.cover {
44
position: fixed;
@@ -52,7 +52,6 @@ $actionSpacing: 8px;
5252
height: 200px;
5353

5454
.action {
55-
// flex-direction: row-reverse;
5655
display: flex;
5756
height: 42px;
5857
padding: $actionSpacing 0;

src/components/Nav/AdminNav.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class AdminNav extends React.Component {
2020
this.state = { menuOpen: true };
2121
}
2222

23-
handleToggleMenu() {
23+
toggleMenu() {
2424
this.setState({
2525
menuOpen: !this.state.menuOpen
2626
});
@@ -71,7 +71,7 @@ class AdminNav extends React.Component {
7171
<Drawer
7272
open={this.state.menuOpen}
7373
docked={false}
74-
onRequestChange={() => this.handleToggleMenu()}
74+
onRequestChange={() => this.toggleMenu()}
7575
>
7676
<AdminMenu currentUser={this.props.user} routeOptions={AppConfig.routes.admin} />
7777
</Drawer>
@@ -83,7 +83,7 @@ class AdminNav extends React.Component {
8383
{this.renderBackButton()}
8484
</div>
8585
)}
86-
onLeftIconButtonTouchTap={() => this.handleToggleMenu()}
86+
onLeftIconButtonTouchTap={() => this.toggleMenu()}
8787
style={{ position: 'fixed' }}
8888
iconElementRight={iconElementRight}
8989
/>

src/components/Nav/Breadcrumb.scss

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
// components/Nav/Breadcumb.scss
2-
//
3-
$darkGrey: #424242;
4-
$lightPrimary: #aab7ff;
5-
$darkPrimary: #3d5afe;
1+
@import "../../variables.scss";
62

73
.breadcrumb-links {
8-
background-color: $darkGrey;
4+
background-color: $midGrey;
95
height: 30px;
106
margin-top: -1px;
117

src/components/Nav/SiteTopNav.scss

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
$darkPurple: #3d5afe;
2-
$linkColor: #e6e6e6;
1+
@import "../../variables.scss";
32

43
.top-nav {
54
position: fixed;
65
height: 56px;
76
width: 100%;
8-
background-color: #212121;
7+
background-color: $darkGrey;
98
z-index: 100;
109
margin: 0;
1110
padding: 0;
@@ -38,12 +37,12 @@ $linkColor: #e6e6e6;
3837
font-weight: 300;
3938
max-width: 140px;
4039
text-decoration: none;
41-
padding: 0 0.5rem 2px 0.5rem;
40+
padding: 14px 0.5rem 14px 0.5rem;
4241

4342
&.active, &:hover, &:focus {
4443
color: #fff;
4544
padding-bottom: 0;
46-
border-bottom: 2px solid $darkPurple;
45+
border-bottom: 2px solid $darkPrimary;
4746
}
4847
}
4948
}
@@ -58,7 +57,7 @@ $linkColor: #e6e6e6;
5857
font-weight: 300;
5958
color: $linkColor;
6059
&:hover, &:focus {
61-
color: $darkPurple;
60+
color: $darkPrimary;
6261
}
6362
}
6463
}

src/components/Pages/Card/Card.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "../../../variables.scss";
2+
13
.admin-container {
24
display: flex;
35
align-items: center;
@@ -12,7 +14,7 @@
1214

1315
&.basic {
1416
.front, .back {
15-
border: 2px solid #e6e6e6;
17+
border: 2px solid $linkColor;
1618
background: #252429;
1719
}
1820
}

src/components/Pages/Errors/ErrorPage.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "../../../variables.scss";
2+
13
body {
24
background-blend-mode: soft-light;
35
}
@@ -10,7 +12,7 @@ body {
1012
.page-container {
1113
position: relative;
1214
top: 100px;
13-
border: 1px solid #e6e6e6;
15+
border: 1px solid $linkColor;
1416
padding: 30px;
1517

1618
.content {

src/variables.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// colors
2+
$red: red;
3+
$lightBlue200: #81D4FA; /* lightBlue200 */
4+
$lightBlue100: #B3E5FC; /* lightBlue100 */
5+
$lightPurple: #536DFE; /* indigoA400 */
6+
$darkPurple: #3d5afe;
7+
$midGrey: #424242;
8+
$darkGrey: #212121;
9+
$lightPrimary: #aab7ff;
10+
$darkPrimary: $darkPurple;
11+
$linkColor: #e6e6e6;
12+
13+
// spacing
14+
$actionSpacing: 8px;

0 commit comments

Comments
 (0)