Skip to content

Commit f4b73a7

Browse files
author
Darius Rosendahl
committed
Changed stylesheets: now following the sass-linter rules, removed old code comments
1 parent 71147fd commit f4b73a7

File tree

6 files changed

+77
-60
lines changed

6 files changed

+77
-60
lines changed

scss/base/defaults.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,27 @@
22
html {
33
overflow-y: scroll;
44
}
5+
56
a {
67
color: $theme02;
78
}
9+
810
table {
911
border-top: 1px solid $color03;
1012
}
13+
1114
tr > * {
1215
padding: 1rem 1.5rem;
1316
vertical-align: top;
1417
text-align: left;
1518
border-bottom: 1px solid $color03;
1619
}
20+
1721
.block {
1822
margin-bottom: $margin-default * 3;
1923

20-
}
21-
.block-invert {
22-
border: 1px solid $color03;
23-
}
24+
&-invert {
25+
border: 1px solid $color03;
26+
}
27+
28+
}

scss/layout/docs_code.scss

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,23 @@ code {
22
display: inline;
33
padding: 1px;
44
background: #fff0c3;
5-
border: 1px solid darken(#fff0c3, 10%);
5+
border: 1px solid darken(#fff0c3, 10%);
66
}
7-
.code-multi {
7+
8+
%code-multi {
89
display: block;
910
padding: 5px;
1011
}
12+
13+
.code-multi {
14+
@extend %code-multi;
15+
}
16+
1117
.code-structure {
12-
@extend .code-multi;
18+
@extend %code-multi;
1319
line-height: 1;
1420
}
21+
1522
.specs {
1623
overflow-x: auto;
1724
-webkit-overflow-scrolling: touch;
@@ -30,12 +37,14 @@ table {
3037

3138
.demo-block {
3239
display: block;
33-
background: #d2f2ff;
34-
color: rgba(30, 149, 191, 1);
3540
margin-bottom: $margin-default;
3641
padding: $padding-default;
42+
//sass-lint:disable-all
3743
@include ellipsis;
44+
//sass-lint:enable-all
3845
text-align: center;
46+
color: rgba(30, 149, 191, 1);
47+
background: #d2f2ff;
3948
border-radius: $radius;
4049

4150
.demo-block {
@@ -51,13 +60,15 @@ table {
5160
&.two {
5261
background: $theme03;
5362

63+
// sass-lint:disable-all
5464
.demo-block.two {
5565
background: lighten( $theme03, 10% );
5666

5767
.demo-block.two {
5868
background: lighten( $theme03, 20% );
5969
}
6070
}
71+
// sass-lint:enable-all
6172
}
6273
}
6374

@@ -76,14 +87,14 @@ table {
7687
*
7788
* @version
7889
* 3.0.83 (July 02 2010)
79-
*
90+
*
8091
* @copyright
8192
* Copyright (C) 2004-2010 Alex Gorbatchev.
8293
*
8394
* @license
8495
* Dual licensed under the MIT and GPL licenses.
8596
*/
86-
// sasslint:disable-all
97+
// sass-lint:disable-all
8798
.syntaxhighlighter a,
8899
.syntaxhighlighter div,
89100
.syntaxhighlighter code,

scss/layout/docs_layout.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
white-space: nowrap;
33
}
44

5-
5+
66
/* equal height for some blocks */
77
.eq {
8-
display: flex;
8+
display: flex;
99

1010
> * {
1111
flex: 1;

scss/layout/docs_mainvisual.scss

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.doc-mainvisual {
22
display: flex;
3-
width: 100%; height: calc(100vh - 72px);
43
align-items: center;
54
justify-content: center;
5+
width: 100%; height: calc(100vh - 72px);
66

77
> * {
88
width: 100%;
@@ -17,51 +17,48 @@
1717

1818
}
1919

20-
.wrapper.home {
21-
background-color: $theme04;
20+
.wrapper {
21+
22+
&.home {
23+
background-color: $theme04;
24+
}
2225
}
26+
2327
.nav-label {
28+
//sass-lint:disable-all
2429
@extend .btn-theme04;
30+
//sass-lint:enable-all
2531
display: none;
26-
position: absolute; right: 12px; top: 12px;
32+
position: absolute; top: 12px; right: 12px;
2733
text-transform: uppercase;
2834
cursor: pointer;
2935
}
36+
3037
.nav-logo {
3138
display: block;
3239
}
3340

3441
.nav-container {
35-
overflow: hidden;
3642
position: relative;
43+
overflow: hidden;
3744
background-color: $theme06;
3845
line-height: 1.7;
3946

4047
ul {
41-
transition: max-height 0.4s ease-out;
48+
transition: max-height .4s ease-out;
4249

4350
a {
4451
display: block;
52+
padding-bottom: 12px;
4553
color: $color01;
4654
text-decoration: none;
47-
padding-bottom: 12px;
4855

4956
&.active {
5057
color: $theme04;
51-
52-
// + ul {
53-
// max-height: 500px;
54-
// padding-bottom: 20px;
55-
// }
5658
}
5759

5860
&:hover {
5961
text-decoration: underline;
60-
61-
// + ul {
62-
// max-height: 500px;
63-
// padding-bottom: 20px;
64-
// }
6562
}
6663
}
6764

@@ -71,8 +68,8 @@
7168
padding-left: 20px;
7269

7370
ul {
74-
padding-left: 12px;
7571
padding-bottom: 12px;
72+
padding-left: 12px;
7673
}
7774

7875
}
@@ -95,10 +92,12 @@
9592
height: 100vh;
9693
max-height: 100%;
9794

98-
.nav-wrap.fixed {
99-
position: fixed; top: 26px; left: 0;
95+
.nav-wrap {
96+
&.fixed {
97+
position: fixed; top: 26px; left: 0;
98+
}
10099
}
101-
100+
102101
.nav-label {
103102
display: none;
104103
}
@@ -115,13 +114,14 @@
115114
width: 100%; height: 72px;
116115

117116
.nav-wrap > ul {
118-
padding-top: 96px;
119117
margin-bottom: $padding-default*3;
118+
padding-top: 96px;
120119
}
120+
121121
.nav-logo {
122-
position: absolute; left: 10px; top: 10px; z-index: 2;
123-
margin: 0 auto;
124-
height: 50px; width: auto;
122+
position: absolute; z-index: 2; top: 10px; left: 10px;
123+
margin: 0 auto;
124+
width: auto; height: 50px;
125125

126126
img {
127127
display: block;
@@ -130,28 +130,30 @@
130130
}
131131

132132
}
133+
133134
.nav-container-active {
134-
height: auto;
135135
position: relative;
136+
height: auto;
136137

137138
.nav-logo {
138-
left: -2px; top: -2px;
139+
top: -2px; left: -2px;
139140
}
140141

141142
img {
142-
position: absolute; left: 12px; top: 12px;
143+
position: absolute; top: 12px; left: 12px;
143144
}
144145
}
146+
145147
.nav-label {
146148
display: block;
147149
}
148150
}
149151

150152
@media only screen and (max-width: $b2 - 1 ) {
153+
151154
.nav-container {
152155

153156
.nav-logo {
154-
//top: 14px;
155157
height: 40px;
156158
}
157159
}

scss/layout/icons_layout.scss

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
.docs-icon {
2-
position: relative;
32
display: inline-block;
3+
position: relative;
44
padding-bottom: 100%;
55
width: 100%; height: 0;
6-
font-size: 2.8rem;
6+
font-size: 2.8rem;
77
background: $color03;
88

9-
> * {
10-
position: absolute; top: 50%; left: 50%;
11-
margin-right: -50%;
12-
transform: translate(-50%, -50%);
13-
}
14-
15-
+ .docs-code {
16-
display: block;
17-
margin-bottom: $margin-default/2;
18-
font-size: 12px;
19-
word-wrap: break-word;
20-
}
21-
}
9+
> * {
10+
position: absolute; top: 50%; left: 50%;
11+
margin-right: -50%;
12+
transform: translate(-50%, -50%);
13+
}
2214

15+
+ .docs-code {
16+
display: block;
17+
margin-bottom: $margin-default/2;
18+
font-size: 12px;
19+
word-wrap: break-word;
20+
}
21+
}

scss/variables.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Base colors
1010
Color 01 and 02 reservered for white and black
1111
*/
12-
$color03: #eeeeee;
12+
$color03: #eee;
1313
$color04: #aaa;
1414
$color05: #ccc;
1515
$color06: #797979;
@@ -21,7 +21,7 @@ $theme01: #1b94bf; // Knight blue
2121
$theme02: #093142; // Royal blue
2222
$theme03: #12637f; // Falcon blue
2323
$theme04: #ffc200; // Royal yellow
24-
$theme05: #ffffff; // Destroyer white
24+
$theme05: #fff; // Destroyer white
2525
$theme06: #164558;
2626

2727
/*
@@ -99,7 +99,7 @@ $grid-gutter-b3: 12px;
9999
$grid-gutter-b4: 12px;
100100
$grid-gutter-b5: 12px;
101101
$grid-gutter-b6: 12px;
102-
102+
103103
/*
104104
Default margin and padding
105105
*/

0 commit comments

Comments
 (0)