Skip to content

Commit b1c201c

Browse files
committed
minor updates
2 parents a18819c + 8cdbe19 commit b1c201c

File tree

11 files changed

+142
-71
lines changed

11 files changed

+142
-71
lines changed

lib/form/button.css

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,32 @@
99
--button-background-hover: var(--primary-hover);
1010
--button-background-focus: var(--primary-focus);
1111

12+
/* shadows */
13+
--button-box-shadow: var(--field-box-shadow);
14+
1215
/* borders */
13-
--button-border-width: 1px;
14-
--button-border-style: solid;
16+
--button-border-width: var(--field-border-width);
17+
--button-border-style: var(--field-border-style);
1518
--button-border-color: var(--primary);
1619
--button-border-color-hover: var(--primary-hover);
1720
--button-border-color-focus: var(--primary-focus);
1821

19-
--button-border-radius: 0;
22+
--button-border-radius: var(--field-border-radius);
23+
24+
/* font styles */
25+
--button-font-weight: var(--field-font-weight);
26+
--button-text-transform: var(--field-text-transform);
27+
--button-text-align: center;
28+
29+
/* transitions */
30+
--button-transition: var(--field-transition);
31+
--button-transition-property: var(--field-transition-property);
2032
}
2133

22-
.button {
23-
font-weight: var(--field-font-weight);
24-
text-transform: var(--field-text-transform);
34+
.ui.form.button {
35+
font-weight: var(--button-font-weight);
36+
text-transform: var(--button-text-transform);
37+
text-align: var(--button-text-align);
2538

2639
color: var(--button-color);
2740
background: var(--button-background);
@@ -31,18 +44,8 @@
3144
border-color: var(--button-border-color);
3245
border-radius: var(--button-border-radius);
3346

34-
transition: 0.3s ease;
35-
transition-property: border, color, background;
36-
37-
&:hover {
38-
color: var(--button-color-hover);
39-
background: var(--button-background-hover);
40-
border-color: var(--button-border-color-hover);
41-
}
47+
box-shadow: var(--button-box-shadow);
4248

43-
&:focus {
44-
color: var(--button-color-focus);
45-
background: var(--button-background-focus);
46-
border-color: var(--button-border-color-focus);
47-
}
49+
transition: var(--button-transition);
50+
transition-property: var(--button-transition-property);
4851
}

lib/form/checkbox.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
--checkbox-label-gutter: var(--gutter-small);
1414
}
1515

16-
.checkbox {
16+
.ui.form.checkbox {
1717
line-height: 1;
1818

1919
> input {
@@ -66,7 +66,7 @@
6666
}
6767

6868
/* sizes */
69-
.checkbox {
69+
.ui.form.checkbox {
7070
&.tiny > span {
7171
&::before,
7272
&::after {

lib/form/config.css

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
/* sequence */
33
--field-height-unit: var(--font-unit);
44
--field-height-sequence: var(--minor-third);
5-
--field-height: 2.4rem;
5+
--field-height-base: 2.4;
6+
--field-height: var(--field-height-base)var(--font-unit);
67

7-
/* sizes */
8+
/* heighs */
89
--field-height-tiny: calc(var(--field-height-small) /
910
var(--field-height-sequence));
1011
--field-height-small: calc(var(--field-height) /
@@ -14,15 +15,24 @@
1415
--field-height-large: calc(var(--field-height-big) *
1516
var(--field-height-sequence));
1617

17-
/* sizes */
18-
--field-font-size-tiny: var(--h9);
19-
--field-font-size-small: var(--h8);
20-
--field-font-size: var(--h7);
21-
--field-font-size-big: var(--h6);
22-
--field-font-size-large: var(--h5);
18+
/* line height */
19+
--field-line-height-sequence: var(--minor-second);
20+
21+
/* widths */
22+
--field-min-width: 0;
23+
--field-max-width: none;
2324

2425
/* text options */
2526
--field-font-size: var(--h8);
26-
--field-text-transform: uppercase;
27-
--field-font-weight: var(--font-regular);
27+
--field-font-size-sequence: var(--font-sequence);
28+
29+
/* font sizes */
30+
--field-font-size-tiny: calc(var(--field-font-size-small) /
31+
var(--field-font-size-sequence));
32+
--field-font-size-small: calc(var(--field-font-size) /
33+
var(--field-font-size-sequence));
34+
--field-font-size-big: calc(var(--field-font-size) *
35+
var(--field-font-size-sequence));
36+
--field-font-size-large: calc(var(--field-font-size-big) *
37+
var(--field-font-size-sequence));
2838
}

lib/form/field.css

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,56 @@
99
--field-background-hover: var(--primary-contrast-hover);
1010
--field-background-focus: var(--primary-contrast-focus);
1111

12+
/* shadows */
13+
--field-box-shadow: none;
14+
15+
/* font styles */
16+
--field-text-transform: uppercase;
17+
--field-font-weight: var(--font-regular);
18+
--field-text-align: left;
19+
1220
/* borders */
1321
--field-border-width: 1px;
1422
--field-border-style: solid;
1523
--field-border-color: var(--primary);
1624
--field-border-color-hover: var(--primary-hover);
1725
--field-border-color-focus: var(--primary-focus);
26+
27+
--field-border-radius: 0;
28+
29+
/* transitions */
30+
--field-transition: var(--transition-duration) ease;
31+
--field-transition-property: border, color, background;
32+
33+
/* placeholder */
34+
--field-placeholder-color: var(--lightgray);
35+
--field-placeholder-opacity: .1;
1836
}
1937

20-
.field {
38+
.ui.form.field {
2139
font-weight: var(--field-font-weight);
2240
text-transform: var(--field-text-transform);
41+
text-align: var(--field-text-align);
2342

2443
color: var(--field-color);
2544
background: var(--field-background);
2645

2746
border-style: var(--field-border-style);
2847
border-width: var(--field-border-width);
2948
border-color: var(--field-border-color);
30-
border-radius: 0;
49+
border-radius: var(--field-border-radius);
50+
51+
box-shadow: var(--field-box-shadow);
3152

32-
transition: 0.3s ease;
33-
transition-property: border, color, background;
53+
transition: var(--field-transition);
54+
transition-property: var(--field-transition-property);
55+
56+
&::placeholder {
57+
color: color(
58+
var(--field-placeholder-color)
59+
alpha(var(--field-placeholder-opacity))
60+
)
61+
}
3462

3563
&:hover {
3664
color: var(--field-color-hover);

lib/form/select.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.select.field {
1+
.ui.form.select {
22
display: flex;
33
align-items: center;
44

lib/form/sizes.css

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,73 @@
11
/* button sizes */
2-
.field,
3-
.button {
2+
.ui.form.field,
3+
.ui.form.button {
44
display: inline-block;
55

6-
font-size: 1em;
7-
8-
margin-top: var(--gutter-tiny);
9-
margin-bottom: var(--gutter-tiny);
6+
font-size: var(--field-font-size);
107

118
padding-left: var(--gutter-small);
129
padding-right: var(--gutter-small);
1310
box-sizing: border-box;
1411

1512
height: var(--field-height);
16-
line-height: var(--field-height);
13+
line-height: calc(
14+
var(--field-height) *
15+
var(--field-line-height-sequence)
16+
);
1717

18-
&.tiny {
19-
/* font-size: var(--field-font-size-tiny); */
18+
min-width: var(--field-min-width);
19+
max-width: var(--field-max-width);
2020

21-
margin-top: var(--gutter-tiny);
22-
margin-bottom: var(--gutter-tiny);
21+
&.tiny {
22+
font-size: var(--field-font-size-tiny);
2323

2424
padding-left: var(--gutter-tiny);
2525
padding-right: var(--gutter-tiny);
2626

2727
height: var(--field-height-tiny);
28-
line-height: var(--field-height-tiny);
28+
line-height: calc(
29+
var(--field-height-tiny) *
30+
var(--field-line-height-sequence)
31+
);
2932
}
3033

3134
&.small {
32-
/* font-size: var(--field-font-size-small); */
33-
34-
margin-top: var(--gutter-small);
35-
margin-bottom: var(--gutter-small);
35+
font-size: var(--field-font-size-small);
3636

3737
padding-left: var(--gutter-small);
3838
padding-right: var(--gutter-small);
3939

4040
height: var(--field-height-small);
41-
line-height: var(--field-height-small);
41+
line-height: calc(
42+
var(--field-height-small) *
43+
var(--field-line-height-sequence)
44+
);
4245
}
4346

4447
&.big {
45-
/* font-size: var(--field-font-size-big); */
46-
47-
margin-top: var(--gutter-small);
48-
margin-bottom: var(--gutter-small);
48+
font-size: var(--field-font-size-big);
4949

5050
padding-left: var(--gutter);
5151
padding-right: var(--gutter);
5252

5353
height: var(--field-height-big);
54-
line-height: var(--field-height-big);
54+
line-height: calc(
55+
var(--field-height-big) *
56+
var(--field-line-height-sequence)
57+
);
5558
}
5659

5760
&.large {
58-
/* font-size: var(--field-font-size-large); */
59-
60-
margin-top: var(--gutter);
61-
margin-bottom: var(--gutter);
61+
font-size: var(--field-font-size-large);
6262

6363
padding-left: var(--gutter-big);
6464
padding-right: var(--gutter-big);
6565

6666
height: var(--field-height-large);
67-
line-height: var(--field-height-large);
67+
line-height: calc(
68+
var(--field-height-large) *
69+
var(--field-line-height-sequence)
70+
);
6871
}
6972

7073
&.wide {

lib/form/states.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
.field:focus:invalid {
1+
.ui.form.field:focus:invalid {
22
border-color: var(--error);
33
}

lib/form/textarea.css

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
.flexible.field {
1+
:root {
2+
--textarea-min-height: 18rem;
3+
--textarea-min-width: 56rem;
4+
}
5+
6+
.ui.flexible.form.field {
27
height: auto;
3-
line-height: normal;
8+
line-height: var(--document-line-height);
49

510
padding: var(--gutter-small);
611

@@ -17,7 +22,8 @@
1722
}
1823
}
1924

20-
textarea.flexible.field {
21-
min-height: 18rem;
22-
line-height: normal;
25+
textarea.ui.flexible.form.field {
26+
min-height: var(--textarea-min-height);
27+
min-width: var(--textarea-min-width);
28+
line-height: var(--document-line-height);
2329
}

lib/index.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
/* form */
2-
@import "./form/index.css";
2+
@import "./form/index.css";
3+
4+
/* label */
5+
@import "./label.css";

lib/label.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
:root {
2+
--label-color: var(--midgray);
3+
--label-background: var(--whitegray);
4+
--label-border-radius: 3px;
5+
--label-padding: .35em;
6+
}
7+
8+
.form.label {
9+
display: inline-block;
10+
color: var(--label-color);
11+
background: var(--label-background);
12+
border-radius: var(--label-border-radius);
13+
vertical-align: 0;
14+
font-size: .9em;
15+
margin: 0 .15em;
16+
padding: var(--label-padding);
17+
line-height: 1;
18+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nikoloza/scratch-ui",
3-
"version": "0.4.0",
3+
"version": "0.4.3",
44
"description": "",
55
"main": "lib/index.css",
66
"scripts": {

0 commit comments

Comments
 (0)