diff options
Diffstat (limited to 'src/scss')
-rw-r--r-- | src/scss/components/_button.scss | 10 | ||||
-rw-r--r-- | src/scss/components/_card.scss | 11 | ||||
-rw-r--r-- | src/scss/components/_circle.scss | 13 | ||||
-rw-r--r-- | src/scss/components/_dropdown.scss | 19 | ||||
-rw-r--r-- | src/scss/components/_footer.scss | 12 | ||||
-rw-r--r-- | src/scss/components/_header.scss | 5 | ||||
-rw-r--r-- | src/scss/components/_link.scss | 6 | ||||
-rw-r--r-- | src/scss/components/_markdown.scss | 9 | ||||
-rw-r--r-- | src/scss/components/_progressbar.scss | 3 | ||||
-rw-r--r-- | src/scss/main.scss | 3 | ||||
-rw-r--r-- | src/scss/objects/_grid.scss | 1 | ||||
-rw-r--r-- | src/scss/objects/_type.scss | 1 | ||||
-rw-r--r-- | src/scss/settings/_colors.scss | 4 | ||||
-rw-r--r-- | src/scss/settings/_spacing.scss | 6 | ||||
-rw-r--r-- | src/scss/settings/_type.scss | 12 | ||||
-rw-r--r-- | src/scss/utilities/_align.scss | 2 |
16 files changed, 97 insertions, 20 deletions
diff --git a/src/scss/components/_button.scss b/src/scss/components/_button.scss index 9f7b70b..8f3e4fa 100644 --- a/src/scss/components/_button.scss +++ b/src/scss/components/_button.scss | |||
@@ -1,13 +1,13 @@ | |||
1 | $button-padding : $baseline-x2 $baseline-x4; | 1 | $button-padding : $baseline-x2 $baseline-x4; |
2 | $button-bgcolor : $color-secondary; | 2 | $button-bgcolor : $color-primary; |
3 | $button-bgcolor-hover : darken($color-secondary, 10%); | 3 | $button-bgcolor-hover : darken($button-bgcolor, 10%); |
4 | $button-color : $color-white; | 4 | $button-color : $color-white; |
5 | $button-radius : 3px; | 5 | $button-radius : 3px; |
6 | 6 | ||
7 | $button-outline-padding : ( $baseline-x2 - 2 )( $baseline-x3 - 2 ); | 7 | $button-outline-padding : ( $baseline-x2 - 2 )( $baseline-x3 - 2 ); |
8 | $button-outline-bgcolor: transparent; | 8 | $button-outline-bgcolor: transparent; |
9 | $button-outline-color: $color-secondary; | 9 | $button-outline-color: $color-primary; |
10 | $button-outline-color-hover: darken( $color-secondary, 10% ); | 10 | $button-outline-color-hover: darken( $button-outline-color, 10% ); |
11 | 11 | ||
12 | .c-button { | 12 | .c-button { |
13 | padding: $button-padding; | 13 | padding: $button-padding; |
@@ -67,7 +67,7 @@ $button-outline-color-hover: darken( $color-secondary, 10% ); | |||
67 | } | 67 | } |
68 | 68 | ||
69 | .c-button--outline:hover { | 69 | .c-button--outline:hover { |
70 | color: #1893E0; | 70 | color: $button-outline-color-hover; |
71 | border-color: $button-outline-color-hover; | 71 | border-color: $button-outline-color-hover; |
72 | background-color: $button-outline-bgcolor; | 72 | background-color: $button-outline-bgcolor; |
73 | } | 73 | } |
diff --git a/src/scss/components/_card.scss b/src/scss/components/_card.scss index 43480d1..2afec74 100644 --- a/src/scss/components/_card.scss +++ b/src/scss/components/_card.scss | |||
@@ -1,3 +1,5 @@ | |||
1 | $clickable-bg-color: darken($color-white, 5%); | ||
2 | |||
1 | .c-card { | 3 | .c-card { |
2 | padding: $baseline-x5; | 4 | padding: $baseline-x5; |
3 | background: rgba($color-white, 0.8); | 5 | background: rgba($color-white, 0.8); |
@@ -10,3 +12,12 @@ | |||
10 | } | 12 | } |
11 | 13 | ||
12 | .c-card--light { background: rgba($color-white, 0.5)} | 14 | .c-card--light { background: rgba($color-white, 0.5)} |
15 | |||
16 | .c-card--clickable{ | ||
17 | cursor: pointer; | ||
18 | } | ||
19 | |||
20 | .c-card--clickable:hover{ | ||
21 | background-color: $clickable-bg-color; | ||
22 | cursor: pointer; | ||
23 | } | ||
diff --git a/src/scss/components/_circle.scss b/src/scss/components/_circle.scss new file mode 100644 index 0000000..733cadf --- /dev/null +++ b/src/scss/components/_circle.scss | |||
@@ -0,0 +1,13 @@ | |||
1 | $circle-diameter: 70px; | ||
2 | |||
3 | .c-circle { | ||
4 | color: $color-black; | ||
5 | height: $circle-diameter; | ||
6 | width: $circle-diameter; | ||
7 | border-radius: 50%; | ||
8 | font-weight: bold; | ||
9 | font-size: $circle-diameter*0.4; | ||
10 | line-height: $circle-diameter; | ||
11 | text-align: center; | ||
12 | vertical-align: middle; | ||
13 | } | ||
diff --git a/src/scss/components/_dropdown.scss b/src/scss/components/_dropdown.scss new file mode 100644 index 0000000..4c24395 --- /dev/null +++ b/src/scss/components/_dropdown.scss | |||
@@ -0,0 +1,19 @@ | |||
1 | .c-dropdown { | ||
2 | position: relative; | ||
3 | display: inline-block; | ||
4 | } | ||
5 | |||
6 | .c-dropdown--item { | ||
7 | display: none; | ||
8 | position: absolute; | ||
9 | background-color: #f9f9f9; | ||
10 | min-width: 160px; | ||
11 | box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); | ||
12 | padding: 12px 16px; | ||
13 | z-index: 1; | ||
14 | } | ||
15 | |||
16 | |||
17 | .c-dropdown:hover .c-dropdown--item { | ||
18 | display: block; | ||
19 | } | ||
diff --git a/src/scss/components/_footer.scss b/src/scss/components/_footer.scss index 8bd8664..bbd3ffc 100644 --- a/src/scss/components/_footer.scss +++ b/src/scss/components/_footer.scss | |||
@@ -1,6 +1,14 @@ | |||
1 | $footer-height: 50px; | ||
2 | |||
1 | .c-footer{ | 3 | .c-footer{ |
2 | bottom: 0px; | 4 | bottom: 0px; |
5 | height: $footer-height; | ||
3 | width: 100%; | 6 | width: 100%; |
4 | background-color: $color-primary; | 7 | background-color: $color-grey-light; |
5 | color: $color-contrary; | 8 | border-top: solid 1px $color-grey; |
9 | position: fixed; | ||
10 | } | ||
11 | |||
12 | .c-footer-fixed{ | ||
13 | height: $footer-height; | ||
6 | } | 14 | } |
diff --git a/src/scss/components/_header.scss b/src/scss/components/_header.scss index 0bf8635..0192252 100644 --- a/src/scss/components/_header.scss +++ b/src/scss/components/_header.scss | |||
@@ -2,6 +2,7 @@ | |||
2 | top:0px; | 2 | top:0px; |
3 | position: sticky; | 3 | position: sticky; |
4 | width: 100%; | 4 | width: 100%; |
5 | background-color: $color-primary; | 5 | background-color: $color-grey-light; |
6 | color: $color-contrary; | 6 | border-bottom: solid 1px $color-grey; |
7 | //color: $color-contrary; | ||
7 | } | 8 | } |
diff --git a/src/scss/components/_link.scss b/src/scss/components/_link.scss index 73f6e00..7a85e3f 100644 --- a/src/scss/components/_link.scss +++ b/src/scss/components/_link.scss | |||
@@ -8,3 +8,9 @@ | |||
8 | .c-link:hover { | 8 | .c-link:hover { |
9 | opacity: 0.8; | 9 | opacity: 0.8; |
10 | } | 10 | } |
11 | |||
12 | .c-link--normal { | ||
13 | text-decoration: none; | ||
14 | cursor: pointer; | ||
15 | color: $color-primary; | ||
16 | } | ||
diff --git a/src/scss/components/_markdown.scss b/src/scss/components/_markdown.scss new file mode 100644 index 0000000..8a5e0a3 --- /dev/null +++ b/src/scss/components/_markdown.scss | |||
@@ -0,0 +1,9 @@ | |||
1 | $markdown-bg-color : darken($color-grey-light, 6%); | ||
2 | |||
3 | .c-markdown { | ||
4 | font-size: inherit; | ||
5 | font-family: monospace; | ||
6 | background-color: $markdown-bg-color; | ||
7 | border-radius: 5px; | ||
8 | padding: 5px; | ||
9 | } | ||
diff --git a/src/scss/components/_progressbar.scss b/src/scss/components/_progressbar.scss index e69de29..b6adeac 100644 --- a/src/scss/components/_progressbar.scss +++ b/src/scss/components/_progressbar.scss | |||
@@ -0,0 +1,3 @@ | |||
1 | .c-progressbar { | ||
2 | |||
3 | } | ||
diff --git a/src/scss/main.scss b/src/scss/main.scss index 4b462e9..18b0408 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss | |||
@@ -31,6 +31,9 @@ | |||
31 | @import 'components/header'; | 31 | @import 'components/header'; |
32 | @import 'components/badge'; | 32 | @import 'components/badge'; |
33 | @import 'components/spinner'; | 33 | @import 'components/spinner'; |
34 | @import 'components/markdown'; | ||
35 | @import 'components/circle'; | ||
36 | @import 'components/dropdown'; | ||
34 | 37 | ||
35 | //@import 'utilities/align-items'; | 38 | //@import 'utilities/align-items'; |
36 | @import 'utilities/align'; | 39 | @import 'utilities/align'; |
diff --git a/src/scss/objects/_grid.scss b/src/scss/objects/_grid.scss index 8a18397..30312ca 100644 --- a/src/scss/objects/_grid.scss +++ b/src/scss/objects/_grid.scss | |||
@@ -43,6 +43,7 @@ $iota-objs-grid-gutter-default: $iota-global-gutter-default; | |||
43 | */ | 43 | */ |
44 | 44 | ||
45 | $iota-objs-grid-gutter-extra: ( | 45 | $iota-objs-grid-gutter-extra: ( |
46 | 'gutter-x3': $baseline-x3, | ||
46 | 'gutter-x4': $baseline-x4 | 47 | 'gutter-x4': $baseline-x4 |
47 | ); | 48 | ); |
48 | 49 | ||
diff --git a/src/scss/objects/_type.scss b/src/scss/objects/_type.scss index 7184ab0..6345517 100644 --- a/src/scss/objects/_type.scss +++ b/src/scss/objects/_type.scss | |||
@@ -25,6 +25,7 @@ $iota-objs-type-sizes: ( | |||
25 | 32: $type-32, | 25 | 32: $type-32, |
26 | 34: $type-34, | 26 | 34: $type-34, |
27 | 35: $type-35, | 27 | 35: $type-35, |
28 | 50: $type-50, | ||
28 | 80: $type-80 | 29 | 80: $type-80 |
29 | ); | 30 | ); |
30 | 31 | ||
diff --git a/src/scss/settings/_colors.scss b/src/scss/settings/_colors.scss index 59a1f88..f6f94a4 100644 --- a/src/scss/settings/_colors.scss +++ b/src/scss/settings/_colors.scss | |||
@@ -27,12 +27,14 @@ $info-bgcolor: #d1ecf1; | |||
27 | $info-border-color: #bee5eb; | 27 | $info-border-color: #bee5eb; |
28 | 28 | ||
29 | $color-primary: $color-purple; | 29 | $color-primary: $color-purple; |
30 | $color-primary-light: lighten($color-primary, 10%); | ||
30 | $color-contrary: $color-white; | 31 | $color-contrary: $color-white; |
31 | $color-secondary: $color-deep-blue; | 32 | $color-secondary: $color-primary-light; |
32 | $color-secondary-light: $color-grey-light; | 33 | $color-secondary-light: $color-grey-light; |
33 | 34 | ||
34 | $colors: ( | 35 | $colors: ( |
35 | 'primary' : $color-primary, | 36 | 'primary' : $color-primary, |
37 | 'primary-light' : $color-primary-light, | ||
36 | 'contrary' : $color-contrary, | 38 | 'contrary' : $color-contrary, |
37 | 'secondary' : $color-secondary, | 39 | 'secondary' : $color-secondary, |
38 | 'secondary-light' : $color-secondary-light, | 40 | 'secondary-light' : $color-secondary-light, |
diff --git a/src/scss/settings/_spacing.scss b/src/scss/settings/_spacing.scss index bd14ac4..6628663 100644 --- a/src/scss/settings/_spacing.scss +++ b/src/scss/settings/_spacing.scss | |||
@@ -8,4 +8,10 @@ $spacing-extra: ( | |||
8 | -x5 : $baseline-x5, | 8 | -x5 : $baseline-x5, |
9 | -x6 : $baseline-x6, | 9 | -x6 : $baseline-x6, |
10 | -x7 : $baseline-x7, | 10 | -x7 : $baseline-x7, |
11 | -x8 : $baseline-x8, | ||
12 | -x9 : $baseline-x9, | ||
13 | -x10 : $baseline-x10, | ||
14 | -x11 : $baseline-x11, | ||
15 | -x12 : $baseline-x12, | ||
16 | -x13 : $baseline-x13 | ||
11 | ); | 17 | ); |
diff --git a/src/scss/settings/_type.scss b/src/scss/settings/_type.scss index c7ad0af..a1ec8b0 100644 --- a/src/scss/settings/_type.scss +++ b/src/scss/settings/_type.scss | |||
@@ -58,15 +58,9 @@ $type-80: ( | |||
58 | sm: ( 80px, $baseline-x13 ) | 58 | sm: ( 80px, $baseline-x13 ) |
59 | ); | 59 | ); |
60 | 60 | ||
61 | 61 | $type-50: ( | |
62 | $type-20: ( | 62 | null: ( 40px, $baseline-x10 ), |
63 | null: ( 18px, $baseline-x3 ), | 63 | sm: ( 50px, $baseline-x10 ) |
64 | sm: ( 20px, $baseline-x4 ) | ||
65 | ); | ||
66 | |||
67 | $type-28: ( | ||
68 | null: ( 20px, $baseline-x4 ), | ||
69 | sm: ( 28px, $baseline-x5 ) | ||
70 | ); | 64 | ); |
71 | 65 | ||
72 | $type-35: ( | 66 | $type-35: ( |
diff --git a/src/scss/utilities/_align.scss b/src/scss/utilities/_align.scss index 631e839..483d184 100644 --- a/src/scss/utilities/_align.scss +++ b/src/scss/utilities/_align.scss | |||
@@ -4,7 +4,7 @@ | |||
4 | * Type: Boolean | 4 | * Type: Boolean |
5 | */ | 5 | */ |
6 | 6 | ||
7 | $iota-utils-align-res: false; | 7 | $iota-utils-align-res: true; |
8 | 8 | ||
9 | 9 | ||
10 | /** | 10 | /** |