Skip to content
This repository was archived by the owner on Apr 14, 2023. It is now read-only.

Commit d9b1b98

Browse files
fix - Update variables, golden ratio and improve the grid rows
1 parent cfdd1e3 commit d9b1b98

File tree

4 files changed

+70
-59
lines changed

4 files changed

+70
-59
lines changed

src/components/button.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ button, .button, [type=submit]
8282
text-decoration: none
8383
transition: all 150ms linear
8484
&.error
85-
background: var(--color-error)
85+
background: var(--color-danger)
8686
color: var(--button-color)
8787
cursor: pointer
8888
transition: all 150ms linear

src/components/card.styl

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.card
33
background transparent
44
background: 0 0;
5-
margin-bottom golden-ratio rem
5+
margin-bottom (golden-ratio)rem
66
position relative
77
border 1px solid var(--border-color-300)
88
a
@@ -11,14 +11,14 @@
1111
&:hover
1212
text-decoration none
1313
.card-content
14-
padding 0.01em golden-ratio rem
14+
padding (golden-ratio - 1)rem (golden-ratio)rem (golden-ratio - 1)rem (golden-ratio)rem
1515
.card-body
1616
flex 1 1 auto
17-
padding golden-ratio rem golden-ratio rem
17+
padding (golden-ratio)rem (golden-ratio)rem
1818
.card-title
19-
margin-bottom golden-ratio rem
19+
margin-bottom (golden-ratio)rem
2020
.card-subtitle
21-
margin-top -(1-golden-ratio) rem
21+
margin-top -(1-golden-ratio)rem
2222
margin-bottom 0
2323
.cards
2424
display flex
@@ -29,25 +29,32 @@
2929
.card
3030
box-shadow 0 3px 9px 0 var(--background-color-200)
3131
transition .30s
32-
border-radius 1rem
33-
img
34-
margin-bottom 0
32+
border-radius (golden-ratio)rem
33+
.card img
34+
margin-bottom 0
35+
border-radius (golden-ratio)rem
3536
.card.primary
3637
background var(--color-bg-primary)
3738
border .0625rem solid var(--color-primary)
39+
color var(--color-primary)
3840
.card.secondary
3941
background var(--color-bg-secondary)
4042
border .0625rem solid var(--color-secondary)
43+
color var(--color-secondary)
4144
.card.success
4245
background var(--color-bg-success)
4346
border .0625rem solid var(--color-success)
47+
color var(--color-success)
4448
.card.info
4549
background var(--color-bg-info)
4650
border .0625rem solid var(--color-info)
51+
color var(--color-info)
4752
.card.warning
4853
background var(--color-bg-warning)
4954
border .0625rem solid var(--color-warning)
55+
color var(--color-warning)
5056
.card.error
51-
background var(--color-bg-error)
52-
border .0625rem solid var(--color-error)
57+
background var(--color-bg-danger)
58+
border .0625rem solid var(--color-danger)
59+
color var(--color-danger)
5360
/* @end */

src/components/code.styl

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ code,
1414
kbd,
1515
pre,
1616
samp
17-
background var(--background-color-100)
18-
color var(--color)
1917
font-family "Consolas", "Monaco", "Menlo", monospace
2018
font-size golden-font-size-base rem
21-
margin (golden-ratio)rem 0
19+
margin (golden-ratio)rem
2220
padding (golden-ratio)rem
2321

2422
pre
@@ -34,67 +32,67 @@ pre, code
3432
word-wrap break-word
3533

3634
code
37-
border-bottom 0.01rem solid var(--border-color-300)
38-
border-left 0.3rem solid var(--border-color-300)
39-
border-right 0.01rem solid var(--border-color-300)
40-
border-top 0.01rem solid var(--border-color-300)
35+
border-bottom 0.1rem solid var(--border-color)
36+
border-left: 0.9rem solid var(--border-color)
37+
border-right 0.1rem solid var(--border-color)
38+
border-top 0.1rem solid var(--border-color)
4139
box-shadow 0 12px 30px -9px var(--background-color-200)
4240
&.primary
4341
background var(--color-bg-primary)
44-
border-bottom 0.01rem solid var(--color-primary)
45-
border-left 0.3rem solid var(--color-primary)
46-
border-right 0.01rem solid var(--color-primary)
47-
border-top 0.01rem solid var(--color-primary)
42+
border-bottom 0.1rem solid var(--color-primary)
43+
border-left 0.9rem solid var(--color-primary)
44+
border-right 0.1rem solid var(--color-primary)
45+
border-top 0.1rem solid var(--color-primary)
4846
box-shadow 0 12px 30px -9px var(--background-color-200)
4947
color var(--color-primary)
5048
&.secondary
5149
background var(--color-bg-secondary)
52-
border-bottom 0.01rem solid var(--color-secondary)
53-
border-left 0.3rem solid var(--color-secondary)
54-
border-right 0.01rem solid var(--color-secondary)
55-
border-top 0.01rem solid var(--color-secondary)
50+
border-bottom 0.1rem solid var(--color-secondary)
51+
border-left 0.9rem solid var(--color-secondary)
52+
border-right 0.1rem solid var(--color-secondary)
53+
border-top 0.1rem solid var(--color-secondary)
5654
box-shadow 0 12px 30px -9px var(--background-color-200)
5755
color var(--color-secondary)
5856
&.tertiary
5957
background var(--color-bg-tertiary)
60-
border-bottom 0.01rem solid var(--color-tertiary)
61-
border-left 0.3rem solid var(--color-tertiary)
62-
border-right 0.01rem solid var(--color-tertiary)
63-
border-top 0.01rem solid var(--color-tertiary)
58+
border-bottom 0.1rem solid var(--color-tertiary)
59+
border-left 0.9rem solid var(--color-tertiary)
60+
border-right 0.1rem solid var(--color-tertiary)
61+
border-top 0.1rem solid var(--color-tertiary)
6462
box-shadow 0 12px 30px -9px var(--background-color-200)
6563
color var(--color-tertiary)
6664
&.success
6765
background var(--color-bg-success)
68-
border-bottom 0.01rem solid var(--color-success)
66+
border-bottom 0.1rem solid var(--color-success)
6967
border-color var(--color-success)
70-
border-left 0.3rem solid var(--color-success)
71-
border-right 0.01rem solid var(--color-success)
72-
border-top 0.01rem solid var(--color-success)
68+
border-left 0.9rem solid var(--color-success)
69+
border-right 0.1rem solid var(--color-success)
70+
border-top 0.1rem solid var(--color-success)
7371
box-shadow 0 12px 30px -9px var(--background-color-200)
7472
color var(--color-success)
7573
&.info
7674
background var(--color-bg-info)
77-
border-bottom 0.01rem solid var(--color-info)
78-
border-left 0.3rem solid var(--color-info)
79-
border-right 0.01rem solid var(--color-info)
80-
border-top 0.01rem solid var(--color-info)
75+
border-bottom 0.1rem solid var(--color-info)
76+
border-left 0.9rem solid var(--color-info)
77+
border-right 0.1rem solid var(--color-info)
78+
border-top 0.1rem solid var(--color-info)
8179
box-shadow 0 12px 30px -9px var(--background-color-200)
8280
color var(--color-info)
8381
&.warning
8482
background var(--color-bg-warning)
85-
border-bottom 0.01rem solid var(--color-warning)
86-
border-left 0.3rem solid var(--color-warning)
87-
border-right 0.01rem solid var(--color-warning)
88-
border-top 0.01rem solid var(--color-warning)
83+
border-bottom 0.1rem solid var(--color-warning)
84+
border-left 0.9rem solid var(--color-warning)
85+
border-right 0.1rem solid var(--color-warning)
86+
border-top 0.1rem solid var(--color-warning)
8987
box-shadow 0 12px 30px -9px var(--background-color-200)
9088
color var(--color-warning)
9189
&.error
9290
background var(--color-bg-danger)
93-
border-bottom 0.01rem solid var(--color-danger)
94-
border-left 0.3rem solid var(--color-danger)
95-
border-right 0.01rem solid var(--color-danger)
96-
border-top 0.01rem solid var(--color-danger)
91+
border-bottom 0.1rem solid var(--color-danger)
92+
border-left 0.9rem solid var(--color-danger)
93+
border-right 0.1rem solid var(--color-danger)
94+
border-top 0.1rem solid var(--color-danger)
9795
box-shadow 0 12px 30px -9px var(--background-color-200)
98-
color var(--color-error)
96+
color var(--color-danger)
9997

10098
/* @end */

src/core/grid.styl

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
/* @group Grid */
2-
.container
3-
-moz-box-sizing: border-box
4-
-webkit-box-sizing: border-box
5-
box-sizing: border-box
6-
margin: 0 auto
7-
padding: 0 (15 * golden-ratio) rem
8-
position: relative
9-
width: 96%
10-
112
.grid-flex
123
display: -webkit-box
13-
align-items: top
144
display: flex
155
flex-wrap: wrap
16-
-ms-flex-wrap: wrap
176

18-
.row:after
7+
.row
8+
position relative
9+
width 100%
10+
$:after
1911
clear: both
2012
content: ''
2113
display: table
14+
&-wrap
15+
padding 0
16+
&-top
17+
align-items flex-start
18+
&-bottom
19+
align-items flex-end
20+
&-center
21+
align-items center
22+
&-stretch
23+
align-items stretch
24+
&-baseline
25+
align-items baseline
26+
&-no-padding
27+
padding 0
2228

2329
for i in (1..12)
2430
.flex-{i}

0 commit comments

Comments
 (0)