Skip to content

Commit bb31cb1

Browse files
authored
Merge pull request #106 from oslabs-beta/josh/sass
removed styles.scss
2 parents da62ec0 + bf4620b commit bb31cb1

File tree

7 files changed

+82
-85
lines changed

7 files changed

+82
-85
lines changed

src/app/styles/base/_base.scss

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
html {
2+
height: 100%;
3+
}
4+
5+
body {
6+
margin: 0;
7+
height: 100%;
8+
}
9+
10+
#root {
11+
height: 100%;
12+
}
13+
14+
.travel-container {
15+
grid-area: travel;
16+
}
17+
.action-container {
18+
grid-area: actions;
19+
}
20+
.state-container {
21+
grid-area: states;
22+
}
23+
.buttons-container {
24+
grid-area: buttons;
25+
}
26+
27+
.action-container,
28+
.state-container,
29+
.travel-container {
30+
border-style: solid;
31+
border-color: $border-color;
32+
border-width: 1px;
33+
}

src/app/styles/base/_fonts.scss

Whitespace-only changes.
+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.body-container {
2+
height: 94%;
3+
display: grid;
4+
grid-template-columns: 1fr 2fr;
5+
grid-template-rows: 8fr 1fr;
6+
grid-template-areas:
7+
'actions states'
8+
'travel travel'
9+
'buttons buttons';
10+
}
11+
12+
/* if extension width is less than 500px, stack the body containers */
13+
@media (max-width: 500px) {
14+
.body-container {
15+
grid-template-rows: 3fr 5fr 1fr;
16+
grid-template-columns: auto;
17+
grid-template-areas:
18+
'actions'
19+
'states'
20+
'travel'
21+
'buttons';
22+
}
23+
}
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.error-container {
2+
height: 100%;
3+
margin: 0 auto;
4+
background-color: $brand-color;
5+
overflow: hidden;
6+
7+
display: grid;
8+
justify-content: center;
9+
a {
10+
color: white;
11+
margin-top: 5%;
12+
height: 3%;
13+
}
14+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.main-container {
2+
height: 100%;
3+
margin: 0 auto;
4+
background-color: $brand-color;
5+
overflow: hidden;
6+
}

src/app/styles/main.scss

+6-7
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
@import 'abstracts/variables';
55

66
// 3. Base stuff
7-
@import 'base/base', 'base/fonts', 'base/helpers', 'base/typography';
7+
@import 'base/base', 'base/helpers', 'base/typography';
88

99
// 4. Layout-related sections
10-
@import 'layout/actionContainer', 'layout/stateContainer',
11-
'layout/travelContainer', 'layout/buttonsContainer',
12-
'layout/headContainer.scss';
10+
@import 'layout/mainContainer', 'layout/bodyContainer', 'layout/actionContainer',
11+
'layout/errorContainer', 'layout/stateContainer', 'layout/travelContainer',
12+
'layout/buttonsContainer', 'layout/headContainer.scss';
1313

1414
// 5. Components
15-
@import 'components/buttons', 'components/actionComponent',
16-
'components/jsonTree';
15+
@import 'components/buttons', 'components/actionComponent', 'components/jsonTree';
1716

1817
// other styles that needs to be modularized
1918
@import 'styles';
@@ -25,4 +24,4 @@
2524
@import './components/d3Tree';
2625

2726
// diff component
28-
@import './components/diff';
27+
@import './components/diff';

src/app/styles/styles.scss

-78
This file was deleted.

0 commit comments

Comments
 (0)