Skip to content

Commit 6eda748

Browse files
authored
Merge pull request #374 from webpack/feature/refactoring
Refactoring and Fixes
2 parents eda0f1a + c5dd7df commit 6eda748

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+307
-525
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ root = true
66
charset = utf-8
77

88
# 4 space indentation
9-
[*.{md,js,jsx,scss}]
9+
[*.{md,js,jsx,scss,hbs}]
1010
indent_style = space
1111
indent_size = 2
1212

assets/icons.woff

-3.45 KB
Binary file not shown.

assets/icons.woff2

-1.92 KB
Binary file not shown.

assets/module-coffee.png

-46.4 KB
Binary file not shown.

assets/module-js.png

-29.6 KB
Binary file not shown.

assets/module-less.png

-32.1 KB
Binary file not shown.

assets/module-sass.png

-37.5 KB
Binary file not shown.

assets/modules.png

55.6 KB
Loading

components/cube/cube-style.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'vars';
1+
@import 'functions';
22

33
.cube {
44
position:relative;
@@ -23,14 +23,14 @@
2323
position:absolute;
2424
width:100%;
2525
height:100%;
26-
border: 3px solid map-get($colors, white);
26+
border: 3px solid getColor(white);
2727
}
2828

2929
.cube__outer .cube__face {
30-
background:transparentize(map-get($colors, malibu), 0.5);
30+
background:transparentize(getColor(malibu), 0.5);
3131
}
3232

3333
.cube__inner .cube__face {
34-
background:map-get($colors, denim);
34+
background:getColor(denim);
3535
}
3636
}

components/footer/footer-style.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import 'vars';
21
@import 'mixins';
32
@import 'functions';
43

@@ -13,7 +12,7 @@
1312
justify-content: space-between;
1413
align-content: center;
1514
padding: 0.4em 0;
16-
border-top:1px solid map-get($colors, concrete);
15+
border-top:1px solid getColor(concrete);
1716

1817
@include break {
1918
flex-direction: initial;
@@ -68,13 +67,13 @@
6867
.footer__link {
6968
font-size: getFontSize(-2);
7069
text-transform: uppercase;
71-
color: map-get($colors, dusty-grey);
70+
color: getColor(dusty-grey);
7271

7372
&:not(:last-child) {
7473
margin-right: 1.5em;
7574
}
7675

7776
&:hover {
78-
color: map-get($colors, mine-shaft);
77+
color: getColor(mine-shaft);
7978
}
8079
}

0 commit comments

Comments
 (0)