Skip to content

Commit 7475e62

Browse files
committed
Merge branch 'node-ts-dev' into node-ts-master
2 parents d4d1b13 + 0a2d6b6 commit 7475e62

22 files changed

+12567
-5227
lines changed

.sass-lint.yml

Lines changed: 0 additions & 111 deletions
This file was deleted.

.stylelintrc

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"processors": ["stylelint-processor-html"],
3+
"extends": "stylelint-config-standard",
4+
"plugins": [
5+
"stylelint-order",
6+
"stylelint-scss"
7+
],
8+
"rules": {
9+
"order/properties-alphabetical-order": true,
10+
"at-rule-no-unknown": null,
11+
"font-family-no-missing-generic-family-keyword": null,
12+
"no-missing-end-of-source-newline": null,
13+
"no-empty-source": null,
14+
"shorthand-property-no-redundant-values": null,
15+
"block-no-empty": null,
16+
"indentation": 2,
17+
"string-quotes": "single",
18+
"no-duplicate-selectors": true,
19+
"color-hex-case": "upper",
20+
"color-hex-length": "long",
21+
"color-named": "never",
22+
"selector-no-qualifying-type": true,
23+
"selector-combinator-space-after": "always",
24+
"selector-attribute-quotes": "always",
25+
"selector-attribute-operator-space-before": "never",
26+
"declaration-block-trailing-semicolon": "always",
27+
"declaration-colon-space-before": "never",
28+
"declaration-colon-space-after": "always",
29+
"property-no-vendor-prefix": true,
30+
"value-no-vendor-prefix": true,
31+
"number-leading-zero": "never",
32+
"font-weight-notation": "numeric",
33+
"at-rule-no-vendor-prefix": true,
34+
"selector-pseudo-element-colon-notation": "single",
35+
"selector-no-vendor-prefix": true,
36+
"media-feature-range-operator-space-before": "always",
37+
"media-feature-range-operator-space-after": "always",
38+
"media-feature-parentheses-space-inside": "never",
39+
"media-feature-name-no-vendor-prefix": true,
40+
"media-feature-colon-space-before": "never",
41+
"media-feature-colon-space-after": "always"
42+
}
43+
}

.ts-lint.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"indent": [true,
88
"spaces"
99
],
10-
"linebreak-style": [true, "CRLF"],
1110
"one-line": [true,
1211
"check-open-brace",
1312
"check-whitespace"

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ To run the tasks we have these three commands:
7979
- Running tasks on development mode:
8080
> npm run dev
8181
82-
- Running tasks on local mode:
83-
> npm run local
84-
8582
- Running tasks on watch mode and serve the app:
8683
> npm start
8784

app/client/scss/app.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
// Base Helpers
2-
@import 'base/fonts';
3-
@import 'base/icons';
4-
@import 'base/states';
5-
@import 'base/utilities';
2+
@import
3+
'base/fonts',
4+
'base/icons',
5+
'base/states',
6+
'base/utilities';
67

78
// Base Files
89
@import 'base/globals';

app/client/scss/base/_fonts.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
// Fonts
55
@include font-include(OpenSans, Bold, $font-weight-bold, normal);
66
@include font-include(OpenSans, BoldItalic, $font-weight-bold, italic);
7-
87
@include font-include(OpenSans, ExtraBold, $font-weight-black, normal);
98
@include font-include(OpenSans, ExtraBoldItalic, $font-weight-black, italic);
10-
119
@include font-include(OpenSans, Regular, $font-weight-normal, normal);
1210
@include font-include(OpenSans, Italic, $font-weight-normal, italic);
13-
1411
@include font-include(OpenSans, Light, $font-weight-light, normal);
1512
@include font-include(OpenSans, LightItalic, $font-weight-light, italic);
16-
1713
@include font-include(OpenSans, SemiBold, $font-weight-semibold, normal);
1814
@include font-include(OpenSans, SemiBoldItalic, $font-weight-semibold, italic);

app/client/scss/base/_globals.scss

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
html,
44
body {
5-
$font-size: 16px;
6-
background: $color-background-bright;
7-
font-family: quando;
8-
font-size: $font-size;
9-
height: 100%;
10-
width: 100%;
5+
$font-size: 16px;
116

12-
@media screen and (max-width: $media-screen-m) {
13-
font-size: $font-size * .8;
14-
}
7+
background: $color-background-bright;
8+
font-size: $font-size;
9+
height: 100%;
10+
width: 100%;
1511

16-
@media screen and (max-width: $media-screen-s) {
17-
font-size: $font-size * .65;
18-
}
12+
@media screen and (max-width: $media-screen-m) {
13+
font-size: $font-size * .8;
14+
}
15+
16+
@media screen and (max-width: $media-screen-s) {
17+
font-size: $font-size * .65;
18+
}
1919
}

app/client/scss/base/_icons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import 'mixins/icomoon';
22

33
$icons: (
4-
ck-play: 'e900'
4+
ck-play: 'e900'
55
);
66

77
@include icomoon-generate($icons);

app/client/scss/base/_states.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
@import 'mixins/medias';
33

44
.is {
5-
&-hidden {
6-
display: none;
7-
}
5+
&-hidden {
6+
display: none;
7+
}
88

9-
&-disabled {
10-
@include medias {
11-
opacity: .5;
12-
}
9+
&-disabled {
10+
@include medias {
11+
opacity: .5;
1312
}
13+
}
1414
}

app/client/scss/base/_utilities.scss

Lines changed: 30 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,41 @@
55
@include generate-offsets(padding, p, 100);
66

77
.u {
8-
&-align {
9-
&-center {
10-
text-align: center;
11-
}
12-
13-
&-left {
14-
text-align: left;
15-
}
16-
17-
&-right {
18-
text-align: right;
19-
}
20-
}
21-
8+
&-align {
229
&-center {
23-
&-vertical {
24-
display: block;
25-
position: absolute;
26-
top: 50%;
27-
transform: translateY(-50%);
28-
}
29-
30-
&-horizontal {
31-
display: block;
32-
left: 50%;
33-
position: absolute;
34-
transform: translateX(-50%);
35-
}
10+
text-align: center;
11+
}
3612

37-
&-both {
38-
display: block;
39-
left: 50%;
40-
position: absolute;
41-
top: 50%;
42-
transform: translate(-50%, -50%);
43-
}
13+
&-left {
14+
text-align: left;
4415
}
4516

46-
&-display {
47-
&-block {
48-
display: block;
49-
}
17+
&-right {
18+
text-align: right;
19+
}
20+
}
21+
22+
&-center {
23+
&-vertical {
24+
display: block;
25+
position: absolute;
26+
top: 50%;
27+
transform: translateY(-50%);
28+
}
5029

51-
&-inline {
52-
display: inline;
53-
}
30+
&-horizontal {
31+
display: block;
32+
left: 50%;
33+
position: absolute;
34+
transform: translateX(-50%);
35+
}
5436

55-
&-inlineblock {
56-
display: inline-block;
57-
}
37+
&-both {
38+
display: block;
39+
left: 50%;
40+
position: absolute;
41+
top: 50%;
42+
transform: translate(-50%, -50%);
5843
}
44+
}
5945
}

0 commit comments

Comments
 (0)