Merge branch 'master' into new-docs

This commit is contained in:
Jeremy Thomas
2018-04-13 16:15:13 +01:00
7 changed files with 720 additions and 164 deletions

View File

@@ -21,21 +21,6 @@
"name": "$button-border-color",
"value": "$grey-lighter"
},
"button-border-width": {
"id": "button-border-width",
"name": "$button-border-width",
"value": "$control-border-width"
},
"button-padding-vertical": {
"id": "button-padding-vertical",
"name": "$button-padding-vertical",
"value": "calc(0.375em - #{$button-border-width})"
},
"button-padding-horizontal": {
"id": "button-padding-horizontal",
"name": "$button-padding-horizontal",
"value": "0.75em"
},
"button-hover-color": {
"id": "button-hover-color",
"name": "$button-hover-color",

View File

@@ -16,20 +16,15 @@
"name": "$control-radius-small",
"value": "$radius-small"
},
"control-border-width": {
"id": "control-border-width",
"name": "$control-border-width",
"value": "1px"
},
"control-padding-vertical": {
"id": "control-padding-vertical",
"name": "$control-padding-vertical",
"value": "calc(0.375em - #{$control-border-width})"
"value": "calc(0.375em - 1px)"
},
"control-padding-horizontal": {
"id": "control-padding-horizontal",
"name": "$control-padding-horizontal",
"value": "calc(0.625em - #{$control-border-width})"
"value": "calc(0.625em - 1px)"
}
}
}