Skip to content

Commit 639e09e

Browse files
committed
Increase controls size, Update base colors
1 parent 4a84aa1 commit 639e09e

File tree

5 files changed

+21
-17
lines changed

5 files changed

+21
-17
lines changed

sass/elements/button.sass

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ $button-family: false !default
55
$button-border-color: $grey-lighter !default
66
$button-border-width: $control-border-width !default
77

8-
$button-padding-vertical: calc(0.375em - #{$button-border-width}) !default
9-
$button-padding-horizontal: 0.75em !default
8+
$button-padding-vertical: calc(0.5em - #{$button-border-width}) !default
9+
$button-padding-horizontal: 1em !default
1010

1111
$button-hover-color: $link-hover !default
1212
$button-hover-border-color: $link-hover-border !default
@@ -240,8 +240,8 @@ $button-static-border-color: $grey-lighter !default
240240
pointer-events: none
241241
&.is-rounded
242242
border-radius: $radius-rounded
243-
padding-left: 1em
244-
padding-right: 1em
243+
padding-left: calc(#{$button-padding-horizontal} + 0.25em)
244+
padding-right: calc(#{$button-padding-horizontal} + 0.25em)
245245

246246
.buttons
247247
align-items: center

sass/form/input-textarea.sass

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
$textarea-padding: $control-padding-horizontal !default
2+
$textarea-max-height: 40em !default
3+
$textarea-min-height: 8em !default
4+
15
%input-textarea
26
@extend %input
37
box-shadow: $input-shadow
@@ -34,8 +38,8 @@
3438
@extend %input-textarea
3539
&.is-rounded
3640
border-radius: $radius-rounded
37-
padding-left: 1em
38-
padding-right: 1em
41+
padding-left: calc(#{$control-padding-horizontal} + 0.375em)
42+
padding-right: calc(#{$control-padding-horizontal} + 0.375em)
3943
&.is-static
4044
background-color: transparent
4145
border-color: transparent
@@ -48,11 +52,11 @@
4852
display: block
4953
max-width: 100%
5054
min-width: 100%
51-
padding: 0.625em
55+
padding: $textarea-padding
5256
resize: vertical
5357
&:not([rows])
54-
max-height: 600px
55-
min-height: 120px
58+
max-height: $textarea-max-height
59+
min-height: $textarea-min-height
5660
&[rows]
5761
height: initial
5862
// Modifiers

sass/form/shared.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $input-color: $grey-darker !default
22
$input-background-color: $white !default
33
$input-border-color: $grey-lighter !default
44
$input-height: $control-height !default
5-
$input-shadow: inset 0 1px 2px rgba($black, 0.05) !default
5+
$input-shadow: inset 0 0.0625em 0.125em rgba($black, 0.05) !default
66
$input-placeholder-color: rgba($input-color, 0.3) !default
77

88
$input-hover-color: $grey-darker !default

sass/utilities/controls.sass

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ $control-radius-small: $radius-small !default
33

44
$control-border-width: 1px !default
55

6-
$control-height: 2.25em !default
6+
$control-height: 2.5em !default
77
$control-line-height: 1.5 !default
88

9-
$control-padding-vertical: calc(0.375em - #{$control-border-width}) !default
10-
$control-padding-horizontal: calc(0.625em - #{$control-border-width}) !default
9+
$control-padding-vertical: calc(0.5em - #{$control-border-width}) !default
10+
$control-padding-horizontal: calc(0.75em - #{$control-border-width}) !default
1111

1212
=control
1313
-moz-appearance: none

sass/utilities/initial-variables.sass

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ $white-bis: hsl(0, 0%, 98%) !default
1616
$white: hsl(0, 0%, 100%) !default
1717

1818
$orange: hsl(14, 100%, 53%) !default
19-
$yellow: hsl(48, 100%, 67%) !default
20-
$green: hsl(141, 71%, 48%) !default
19+
$yellow: hsl(48, 100%, 53%) !default
20+
$green: hsl(141, 53%, 53%) !default
2121
$turquoise: hsl(171, 100%, 41%) !default
22-
$cyan: hsl(204, 86%, 53%) !default
22+
$cyan: hsl(204, 71%, 53%) !default
2323
$blue: hsl(217, 71%, 53%) !default
2424
$purple: hsl(271, 100%, 71%) !default
25-
$red: hsl(348, 100%, 61%) !default
25+
$red: hsl(348, 86%, 61%) !default
2626

2727
// Typography
2828

0 commit comments

Comments
 (0)