]> git.ipfire.org Git - thirdparty/bulma.git/commitdiff
Update variable JSONs
authorJeremy Thomas <bbxdesign@gmail.com>
Sun, 13 Oct 2019 15:31:23 +0000 (16:31 +0100)
committerJeremy Thomas <bbxdesign@gmail.com>
Fri, 18 Oct 2019 00:51:42 +0000 (20:51 -0400)
26 files changed:
docs/_data/variables/base/generic.json
docs/_data/variables/components/breadcrumb.json
docs/_data/variables/components/card.json
docs/_data/variables/components/dropdown.json
docs/_data/variables/components/media.json [new file with mode: 0644]
docs/_data/variables/components/message.json
docs/_data/variables/components/modal.json
docs/_data/variables/components/navbar.json
docs/_data/variables/components/pagination.json
docs/_data/variables/components/panel.json
docs/_data/variables/components/tabs.json
docs/_data/variables/elements/box.json
docs/_data/variables/elements/button.json
docs/_data/variables/elements/notification.json
docs/_data/variables/elements/progress.json
docs/_data/variables/elements/table.json
docs/_data/variables/elements/title.json
docs/_data/variables/form/file.json
docs/_data/variables/form/input-textarea.json [new file with mode: 0644]
docs/_data/variables/form/shared.json
docs/_data/variables/form/tools.json
docs/_data/variables/layout/footer.json
docs/_data/variables/utilities/controls.json
docs/_data/variables/utilities/derived-variables.json
docs/_data/variables/utilities/initial-variables.json
sass/utilities/functions.sass

index c05cce27950776c573fc5217c7124f3a4b04a277..49c0681b89a705519a4a5051b97bc880740ca9b8 100644 (file)
@@ -2,7 +2,7 @@
   "by_name": {
     "$body-background-color": {
       "name": "$body-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
index b16393ccc1c58ff2316cedbba2b520e968d01bd3..c9d0bed305556f36096aa7cae9803d6773df7b75 100644 (file)
@@ -33,7 +33,7 @@
     },
     "$breadcrumb-item-separator-color": {
       "name": "$breadcrumb-item-separator-color",
-      "value": "$grey-light",
+      "value": "$border-hover",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 71%)"
index bbba3a37998bcc6caf476d6e847095e9ad071e79..a075938732f6fb1b51ff0936d62dec6674f7e82a 100644 (file)
@@ -9,14 +9,14 @@
     },
     "$card-background-color": {
       "name": "$card-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
     },
     "$card-shadow": {
       "name": "$card-shadow",
-      "value": "0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1)",
+      "value": "0 0.5em 1em -0.125em rgba($scheme-invert, 0.1), 0 0px 0 1px rgba($scheme-invert, 0.02)",
       "type": "size"
     },
     "$card-header-background-color": {
     },
     "$card-header-padding": {
       "name": "$card-header-padding",
-      "value": "0.75rem",
+      "value": "0.75rem 1rem",
       "type": "size"
     },
     "$card-header-shadow": {
       "name": "$card-header-shadow",
-      "value": "0 1px 2px rgba($black, 0.1)",
+      "value": "0 0.125em 0.25em rgba($scheme-invert, 0.1)",
       "type": "size"
     },
     "$card-header-weight": {
@@ -65,7 +65,7 @@
     },
     "$card-footer-border-top": {
       "name": "$card-footer-border-top",
-      "value": "1px solid $border",
+      "value": "1px solid $border-light",
       "type": "size"
     },
     "$card-footer-padding": {
index 455b47196ebee72bb4efa05e5fd36dbfc8150239..c35c60ae3b633292a720ea5602dd7f4b8576194a 100644 (file)
@@ -7,7 +7,7 @@
     },
     "$dropdown-content-background-color": {
       "name": "$dropdown-content-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
@@ -43,7 +43,7 @@
     },
     "$dropdown-content-shadow": {
       "name": "$dropdown-content-shadow",
-      "value": "0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1)",
+      "value": "0 0.5em 1em -0.125em rgba($scheme-invert, 0.1), 0 0px 0 1px rgba($scheme-invert, 0.02)",
       "type": "size"
     },
     "$dropdown-content-z": {
     },
     "$dropdown-item-color": {
       "name": "$dropdown-item-color",
-      "value": "$grey-dark",
+      "value": "$text",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 29%)"
     },
     "$dropdown-item-hover-color": {
       "name": "$dropdown-item-hover-color",
-      "value": "$black",
+      "value": "$scheme-invert",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 4%)"
     },
     "$dropdown-divider-background-color": {
       "name": "$dropdown-divider-background-color",
-      "value": "$border",
+      "value": "$border-light",
       "type": "variable",
       "computed_type": "color",
-      "computed_value": "hsl(0, 0%, 86%)"
+      "computed_value": "hsl(0, 0%, 93%)"
     }
   },
   "list": [
diff --git a/docs/_data/variables/components/media.json b/docs/_data/variables/components/media.json
new file mode 100644 (file)
index 0000000..b7ea1b5
--- /dev/null
@@ -0,0 +1,13 @@
+{
+  "by_name": {
+    "$media-border-color": {
+      "name": "$media-border-color",
+      "value": "rgba($border, 0.5)",
+      "type": "color"
+    }
+  },
+  "list": [
+    "$media-border-color"
+  ],
+  "file_path": "components/media.sass"
+}
\ No newline at end of file
index 33bcf249d70decd358c727bf929255f1185f918a..3343adc443b5583ac82bd90b8eeae98efc5ea36d 100644 (file)
@@ -80,7 +80,7 @@
     },
     "$message-body-pre-background-color": {
       "name": "$message-body-pre-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
       "value": "$colors",
       "type": "variable",
       "computed_type": "function",
-      "computed_value": "mergeColorMaps((\"white\": ($white, $black), \"black\": ($black, $white), \"light\": ($light, $light-invert), \"dark\": ($dark, $dark-invert), \"primary\": ($primary, $primary-invert), \"link\": ($link, $link-invert), \"info\": ($info, $info-invert), \"success\": ($success, $success-invert), \"warning\": ($warning, $warning-invert), \"danger\": ($danger, $danger-invert)), $custom-colors)"
+      "computed_value": "mergeColorMaps((\"white\": ($white, $black), \"black\": ($black, $white), \"light\": ($light, $light-invert), \"dark\": ($dark, $dark-invert), \"primary\": ($primary, $primary-invert, $primary-light, $primary-dark), \"link\": ($link, $link-invert, $link-light, $link-dark), \"info\": ($info, $info-invert, $info-light, $info-dark), \"success\": ($success, $success-invert, $success-light, $success-dark), \"warning\": ($warning, $warning-invert, $warning-light, $warning-dark), \"danger\": ($danger, $danger-invert, $danger-light, $danger-dark)), $custom-colors)"
     }
   },
   "list": [
index dfd0b3364ef41ec76b0e6d7350e6aa66569ca844..a2123e68d17664dd5969ede726ade9f33c222441 100644 (file)
@@ -7,7 +7,7 @@
     },
     "$modal-background-background-color": {
       "name": "$modal-background-background-color",
-      "value": "rgba($black, 0.86)",
+      "value": "rgba($scheme-invert, 0.86)",
       "type": "color"
     },
     "$modal-content-width": {
     },
     "$modal-card-body-background-color": {
       "name": "$modal-card-body-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
index a997d180a25bc36f98705bbf195641a076ee4701..61c9fa3e16a7d613df907d68c9897ea89089b18a 100644 (file)
@@ -2,7 +2,7 @@
   "by_name": {
     "$navbar-background-color": {
       "name": "$navbar-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
@@ -46,7 +46,7 @@
     },
     "$navbar-item-color": {
       "name": "$navbar-item-color",
-      "value": "$grey-dark",
+      "value": "$text",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 29%)"
     },
     "$navbar-item-hover-background-color": {
       "name": "$navbar-item-hover-background-color",
-      "value": "$white-bis",
+      "value": "$scheme-main-bis",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 98%)"
     },
     "$navbar-item-active-color": {
       "name": "$navbar-item-active-color",
-      "value": "$black",
+      "value": "$scheme-invert",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 4%)"
     },
     "$navbar-dropdown-background-color": {
       "name": "$navbar-dropdown-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
     },
     "$navbar-dropdown-boxed-shadow": {
       "name": "$navbar-dropdown-boxed-shadow",
-      "value": "0 8px 8px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1)",
+      "value": "0 8px 8px rgba($scheme-invert, 0.1), 0 0 0 1px rgba($scheme-invert, 0.1)",
       "type": "size"
     },
     "$navbar-dropdown-item-hover-color": {
       "name": "$navbar-dropdown-item-hover-color",
-      "value": "$black",
+      "value": "$scheme-invert",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 4%)"
index 9544186301628f86ed1f7b2e2241efa27a382b5d..3319568f36781f0dbca5508c59d0a0a3e1dfda10 100644 (file)
@@ -2,14 +2,14 @@
   "by_name": {
     "$pagination-color": {
       "name": "$pagination-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
     },
     "$pagination-border-color": {
       "name": "$pagination-border-color",
-      "value": "$grey-lighter",
+      "value": "$border",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 86%)"
     },
     "$pagination-disabled-color": {
       "name": "$pagination-disabled-color",
-      "value": "$grey",
+      "value": "$text-light",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 48%)"
     },
     "$pagination-disabled-background-color": {
       "name": "$pagination-disabled-background-color",
-      "value": "$grey-lighter",
+      "value": "$border",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 86%)"
     },
     "$pagination-disabled-border-color": {
       "name": "$pagination-disabled-border-color",
-      "value": "$grey-lighter",
+      "value": "$border",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 86%)"
index bb7d830ded4677c0bd6d45032ab3b784830c2660..e11ce06ec9775056d12ec39ef9bda18ca46b3df8 100644 (file)
@@ -9,7 +9,19 @@
     },
     "$panel-item-border": {
       "name": "$panel-item-border",
-      "value": "1px solid $border",
+      "value": "1px solid $border-light",
+      "type": "size"
+    },
+    "$panel-radius": {
+      "name": "$panel-radius",
+      "value": "$radius-large",
+      "type": "variable",
+      "computed_type": "size",
+      "computed_value": "6px"
+    },
+    "$panel-shadow": {
+      "name": "$panel-shadow",
+      "value": "0 0.5em 1em -0.125em rgba($scheme-invert, 0.1), 0 0px 0 1px rgba($scheme-invert, 0.02)",
       "type": "size"
     },
     "$panel-heading-background-color": {
@@ -33,7 +45,7 @@
     },
     "$panel-heading-padding": {
       "name": "$panel-heading-padding",
-      "value": "0.5em 0.75em",
+      "value": "0.75em 1em",
       "type": "size"
     },
     "$panel-heading-radius": {
     },
     "$panel-heading-weight": {
       "name": "$panel-heading-weight",
-      "value": "$weight-light",
+      "value": "$weight-bold",
       "type": "variable",
       "computed_type": "font-weight",
-      "computed_value": "300"
+      "computed_value": "700"
     },
     "$panel-tabs-font-size": {
       "name": "$panel-tabs-font-size",
   "list": [
     "$panel-margin",
     "$panel-item-border",
+    "$panel-radius",
+    "$panel-shadow",
     "$panel-heading-background-color",
     "$panel-heading-color",
     "$panel-heading-line-height",
index 89c409924ff4aa7ac87c60a574bcce12d38e45f1..4d731283277ccd4456d9872b48e31ac8a5b6039e 100644 (file)
@@ -80,7 +80,7 @@
     },
     "$tabs-boxed-link-active-background-color": {
       "name": "$tabs-boxed-link-active-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
index 72a617bace729aee5a8d764ab21dfa0b42b72720..534e4986c09296afc0647bc7cc44a59dc10549c3 100644 (file)
@@ -9,7 +9,7 @@
     },
     "$box-background-color": {
       "name": "$box-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
@@ -23,7 +23,7 @@
     },
     "$box-shadow": {
       "name": "$box-shadow",
-      "value": "0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1)",
+      "value": "0 0.5em 1em -0.125em rgba($scheme-invert, 0.1), 0 0px 0 1px rgba($scheme-invert, 0.02)",
       "type": "size"
     },
     "$box-padding": {
     },
     "$box-link-hover-shadow": {
       "name": "$box-link-hover-shadow",
-      "value": "0 2px 3px rgba($black, 0.1), 0 0 0 1px $link",
+      "value": "0 0.5em 1em -0.125em rgba($scheme-invert, 0.1), 0 0 0 1px $link",
       "type": "size"
     },
     "$box-link-active-shadow": {
       "name": "$box-link-active-shadow",
-      "value": "inset 0 1px 2px rgba($black, 0.2), 0 0 0 1px $link",
+      "value": "inset 0 1px 2px rgba($scheme-invert, 0.2), 0 0 0 1px $link",
       "type": "size"
     }
   },
index 38af6ef9f957d1d1d3f61ef971f5b48817d9e546..4114538ec42fe44a618e9a56fc1216edd423f77e 100644 (file)
@@ -2,14 +2,14 @@
   "by_name": {
     "$button-color": {
       "name": "$button-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
     },
     "$button-background-color": {
       "name": "$button-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
@@ -21,7 +21,7 @@
     },
     "$button-border-color": {
       "name": "$button-border-color",
-      "value": "$grey-lighter",
+      "value": "$border",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 86%)"
     },
     "$button-padding-vertical": {
       "name": "$button-padding-vertical",
-      "value": "calc(0.375em - #{$button-border-width})",
+      "value": "calc(0.5em - #{$button-border-width})",
       "type": "size"
     },
     "$button-padding-horizontal": {
       "name": "$button-padding-horizontal",
-      "value": "0.75em",
+      "value": "1em",
       "type": "size"
     },
     "$button-hover-color": {
     },
     "$button-disabled-background-color": {
       "name": "$button-disabled-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
     },
     "$button-disabled-border-color": {
       "name": "$button-disabled-border-color",
-      "value": "$grey-lighter",
+      "value": "$border",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 86%)"
     },
     "$button-static-color": {
       "name": "$button-static-color",
-      "value": "$grey",
+      "value": "$text-light",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 48%)"
     },
     "$button-static-background-color": {
       "name": "$button-static-background-color",
-      "value": "$white-ter",
+      "value": "$scheme-main-ter",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 96%)"
     },
     "$button-static-border-color": {
       "name": "$button-static-border-color",
-      "value": "$grey-lighter",
+      "value": "$border",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 86%)"
index c58f09ab125c5c6fe68b7ed5e5b3d748994eaadc..0b439435845fc4d700f0db9c57cecf08c40ba24a 100644 (file)
@@ -7,6 +7,13 @@
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 96%)"
     },
+    "$notification-code-background-color": {
+      "name": "$notification-code-background-color",
+      "value": "$scheme-main",
+      "type": "variable",
+      "computed_type": "color",
+      "computed_value": "hsl(0, 0%, 100%)"
+    },
     "$notification-radius": {
       "name": "$notification-radius",
       "value": "$radius",
@@ -22,6 +29,7 @@
   },
   "list": [
     "$notification-background-color",
+    "$notification-code-background-color",
     "$notification-radius",
     "$notification-padding"
   ],
index 0b68206ffdc7ff09db4cd1e0324a303be899c180..5a06898261f8e8b9a2a749203c9c92c26fbe6c6e 100644 (file)
@@ -2,10 +2,10 @@
   "by_name": {
     "$progress-bar-background-color": {
       "name": "$progress-bar-background-color",
-      "value": "$border",
+      "value": "$border-light",
       "type": "variable",
       "computed_type": "color",
-      "computed_value": "hsl(0, 0%, 86%)"
+      "computed_value": "hsl(0, 0%, 93%)"
     },
     "$progress-value-background-color": {
       "name": "$progress-value-background-color",
index ce1fa9944dbab48503011c3995c7a1bbb9708e68..903beb16acbeb41935e69a0011c1773cc15713b6 100644 (file)
@@ -2,21 +2,21 @@
   "by_name": {
     "$table-color": {
       "name": "$table-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
     },
     "$table-background-color": {
       "name": "$table-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
     },
     "$table-cell-border": {
       "name": "$table-cell-border",
-      "value": "1px solid $grey-lighter",
+      "value": "1px solid $border",
       "type": "size"
     },
     "$table-cell-border-width": {
@@ -77,7 +77,7 @@
     },
     "$table-row-hover-background-color": {
       "name": "$table-row-hover-background-color",
-      "value": "$white-bis",
+      "value": "$scheme-main-bis",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 98%)"
     },
     "$table-striped-row-even-background-color": {
       "name": "$table-striped-row-even-background-color",
-      "value": "$white-bis",
+      "value": "$scheme-main-bis",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 98%)"
     },
     "$table-striped-row-even-hover-background-color": {
       "name": "$table-striped-row-even-hover-background-color",
-      "value": "$white-ter",
+      "value": "$scheme-main-ter",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 96%)"
index 18cba2b12847bf730e86ee019c8ce0f0b563fe1f..4fd08a5843d9c9d4426a3c7d7610e8747acf564b 100644 (file)
@@ -2,7 +2,7 @@
   "by_name": {
     "$title-color": {
       "name": "$title-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
@@ -53,7 +53,7 @@
     },
     "$subtitle-color": {
       "name": "$subtitle-color",
-      "value": "$grey-dark",
+      "value": "$text",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 29%)"
@@ -84,7 +84,7 @@
     },
     "$subtitle-strong-color": {
       "name": "$subtitle-strong-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
index 37afc19735e9257c54c57071d58fb530780abaad..844039727687c308c6c4fe31a05cc7715b0d3855 100644 (file)
     },
     "$file-cta-background-color": {
       "name": "$file-cta-background-color",
-      "value": "$white-ter",
+      "value": "$scheme-main-ter",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 96%)"
     },
     "$file-cta-color": {
       "name": "$file-cta-color",
-      "value": "$grey-dark",
+      "value": "$text",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 29%)"
     },
     "$file-cta-hover-color": {
       "name": "$file-cta-hover-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
     },
     "$file-cta-active-color": {
       "name": "$file-cta-active-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
diff --git a/docs/_data/variables/form/input-textarea.json b/docs/_data/variables/form/input-textarea.json
new file mode 100644 (file)
index 0000000..c82afc3
--- /dev/null
@@ -0,0 +1,25 @@
+{
+  "by_name": {
+    "$textarea-padding": {
+      "name": "$textarea-padding",
+      "value": "$control-padding-horizontal",
+      "type": "variable"
+    },
+    "$textarea-max-height": {
+      "name": "$textarea-max-height",
+      "value": "40em",
+      "type": "size"
+    },
+    "$textarea-min-height": {
+      "name": "$textarea-min-height",
+      "value": "8em",
+      "type": "size"
+    }
+  },
+  "list": [
+    "$textarea-padding",
+    "$textarea-max-height",
+    "$textarea-min-height"
+  ],
+  "file_path": "form/input-textarea.sass"
+}
\ No newline at end of file
index 11acc6b98318f4714678f3d0210852760c030280..a0f449fb87f12036623f87f2c5e28be4bac914e3 100644 (file)
@@ -2,21 +2,21 @@
   "by_name": {
     "$input-color": {
       "name": "$input-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
     },
     "$input-background-color": {
       "name": "$input-background-color",
-      "value": "$white",
+      "value": "$scheme-main",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 100%)"
     },
     "$input-border-color": {
       "name": "$input-border-color",
-      "value": "$grey-lighter",
+      "value": "$border",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 86%)"
@@ -28,7 +28,7 @@
     },
     "$input-shadow": {
       "name": "$input-shadow",
-      "value": "inset 0 1px 2px rgba($black, 0.1)",
+      "value": "inset 0 0.0625em 0.125em rgba($scheme-invert, 0.05)",
       "type": "size"
     },
     "$input-placeholder-color": {
     },
     "$input-hover-color": {
       "name": "$input-hover-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
     },
     "$input-hover-border-color": {
       "name": "$input-hover-border-color",
-      "value": "$grey-light",
+      "value": "$border-hover",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 71%)"
     },
     "$input-focus-color": {
       "name": "$input-focus-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
     },
     "$input-icon-color": {
       "name": "$input-icon-color",
-      "value": "$grey-lighter",
+      "value": "$border",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 86%)"
     },
     "$input-icon-active-color": {
       "name": "$input-icon-active-color",
-      "value": "$grey",
+      "value": "$text",
       "type": "variable",
       "computed_type": "color",
-      "computed_value": "hsl(0, 0%, 48%)"
+      "computed_value": "hsl(0, 0%, 29%)"
     },
     "$input-radius": {
       "name": "$input-radius",
index 7a5f313c05e75bb273ef511a8518e7fe990d307b..08ee165138b8eec50bfb1dbf286332c3b3777c89 100644 (file)
@@ -2,7 +2,7 @@
   "by_name": {
     "$label-color": {
       "name": "$label-color",
-      "value": "$grey-darker",
+      "value": "$text-strong",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 21%)"
index 22beb7cb295de3ebdce9b9c39950874a5c58670b..27435a3ac5db92fb890ee24be6a159ea6a752a42 100644 (file)
@@ -2,7 +2,7 @@
   "by_name": {
     "$footer-background-color": {
       "name": "$footer-background-color",
-      "value": "$white-bis",
+      "value": "$scheme-main-bis",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 98%)"
index 89b2f93c26bb0a98660eafeb8b7b0824dba1b67a..4ac898044c4ba4263a490e5e7ab163247bc76b4d 100644 (file)
@@ -21,7 +21,7 @@
     },
     "$control-height": {
       "name": "$control-height",
-      "value": "2.25em",
+      "value": "2.5em",
       "type": "size"
     },
     "$control-line-height": {
     },
     "$control-padding-vertical": {
       "name": "$control-padding-vertical",
-      "value": "calc(0.375em - #{$control-border-width})",
+      "value": "calc(0.5em - #{$control-border-width})",
       "type": "size"
     },
     "$control-padding-horizontal": {
       "name": "$control-padding-horizontal",
-      "value": "calc(0.625em - #{$control-border-width})",
+      "value": "calc(0.75em - #{$control-border-width})",
       "type": "size"
     }
   },
index 668d32e6b43b2b4ab849480f442c4fbf7d1e61df..f73f76e200c1e23d79c4bb033cfa5b9ea56e32e6 100644 (file)
       "value": "$cyan",
       "type": "variable",
       "computed_type": "color",
-      "computed_value": "hsl(204, 86%,  53%)"
+      "computed_value": "hsl(204, 71%,  53%)"
     },
     "$success": {
       "name": "$success",
       "value": "$green",
       "type": "variable",
       "computed_type": "color",
-      "computed_value": "hsl(141, 71%,  48%)"
+      "computed_value": "hsl(141, 53%,  53%)"
     },
     "$warning": {
       "name": "$warning",
@@ -33,7 +33,7 @@
       "value": "$red",
       "type": "variable",
       "computed_type": "color",
-      "computed_value": "hsl(348, 100%, 61%)"
+      "computed_value": "hsl(348, 86%, 61%)"
     },
     "$light": {
       "name": "$light",
     "$primary-invert": {
       "name": "$primary-invert",
       "value": "findColorInvert($primary)",
-      "type": "variable",
+      "type": "function",
       "computed_type": "color",
       "computed_value": "#fff"
     },
+    "$primary-light": {
+      "name": "$primary-light",
+      "value": "findLightColor($primary)",
+      "type": "compound"
+    },
+    "$primary-dark": {
+      "name": "$primary-dark",
+      "value": "findDarkColor($primary)",
+      "type": "compound"
+    },
     "$info-invert": {
       "name": "$info-invert",
       "value": "findColorInvert($info)",
-      "type": "variable",
+      "type": "function",
       "computed_type": "color",
       "computed_value": "#fff"
     },
+    "$info-light": {
+      "name": "$info-light",
+      "value": "findLightColor($info)",
+      "type": "compound"
+    },
+    "$info-dark": {
+      "name": "$info-dark",
+      "value": "findDarkColor($info)",
+      "type": "compound"
+    },
     "$success-invert": {
       "name": "$success-invert",
       "value": "findColorInvert($success)",
-      "type": "variable",
+      "type": "function",
       "computed_type": "color",
       "computed_value": "#fff"
     },
+    "$success-light": {
+      "name": "$success-light",
+      "value": "findLightColor($success)",
+      "type": "compound"
+    },
+    "$success-dark": {
+      "name": "$success-dark",
+      "value": "findDarkColor($success)",
+      "type": "compound"
+    },
     "$warning-invert": {
       "name": "$warning-invert",
       "value": "findColorInvert($warning)",
-      "type": "variable",
+      "type": "function",
       "computed_type": "color",
-      "computed_value": "rgba(0, 0, 0, 0.7)"
+      "computed_value": "#fff"
+    },
+    "$warning-light": {
+      "name": "$warning-light",
+      "value": "findLightColor($warning)",
+      "type": "compound"
+    },
+    "$warning-dark": {
+      "name": "$warning-dark",
+      "value": "findDarkColor($warning)",
+      "type": "compound"
     },
     "$danger-invert": {
       "name": "$danger-invert",
       "value": "findColorInvert($danger)",
-      "type": "variable",
+      "type": "function",
       "computed_type": "color",
       "computed_value": "#fff"
     },
+    "$danger-light": {
+      "name": "$danger-light",
+      "value": "findLightColor($danger)",
+      "type": "compound"
+    },
+    "$danger-dark": {
+      "name": "$danger-dark",
+      "value": "findDarkColor($danger)",
+      "type": "compound"
+    },
     "$light-invert": {
       "name": "$light-invert",
       "value": "findColorInvert($light)",
-      "type": "variable",
+      "type": "function",
       "computed_type": "color",
-      "computed_value": "hsl(0, 0%, 21%)"
+      "computed_value": "#fff"
     },
     "$dark-invert": {
       "name": "$dark-invert",
       "value": "findColorInvert($dark)",
+      "type": "function",
+      "computed_type": "color",
+      "computed_value": "#fff"
+    },
+    "$scheme-main": {
+      "name": "$scheme-main",
+      "value": "$white",
+      "type": "variable",
+      "computed_type": "color",
+      "computed_value": "hsl(0, 0%, 100%)"
+    },
+    "$scheme-main-bis": {
+      "name": "$scheme-main-bis",
+      "value": "$white-bis",
+      "type": "variable",
+      "computed_type": "color",
+      "computed_value": "hsl(0, 0%, 98%)"
+    },
+    "$scheme-main-ter": {
+      "name": "$scheme-main-ter",
+      "value": "$white-ter",
       "type": "variable",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 96%)"
     },
+    "$scheme-invert": {
+      "name": "$scheme-invert",
+      "value": "$black",
+      "type": "variable",
+      "computed_type": "color",
+      "computed_value": "hsl(0, 0%, 4%)"
+    },
+    "$scheme-invert-bis": {
+      "name": "$scheme-invert-bis",
+      "value": "$black-bis",
+      "type": "variable",
+      "computed_type": "color",
+      "computed_value": "hsl(0, 0%, 7%)"
+    },
+    "$scheme-invert-ter": {
+      "name": "$scheme-invert-ter",
+      "value": "$black-ter",
+      "type": "variable",
+      "computed_type": "color",
+      "computed_value": "hsl(0, 0%, 14%)"
+    },
     "$background": {
       "name": "$background",
       "value": "$white-ter",
       "computed_type": "color",
       "computed_value": "hsl(0, 0%, 71%)"
     },
+    "$border-light": {
+      "name": "$border-light",
+      "value": "$grey-lightest",
+      "type": "variable",
+      "computed_type": "color",
+      "computed_value": "hsl(0, 0%, 93%)"
+    },
+    "$border-light-hover": {
+      "name": "$border-light-hover",
+      "value": "$grey-light",
+      "type": "variable",
+      "computed_type": "color",
+      "computed_value": "hsl(0, 0%, 71%)"
+    },
     "$text": {
       "name": "$text",
       "value": "$grey-dark",
       "value": "$red",
       "type": "variable",
       "computed_type": "color",
-      "computed_value": "hsl(348, 100%, 61%)"
+      "computed_value": "hsl(348, 86%, 61%)"
     },
     "$code-background": {
       "name": "$code-background",
     "$link-invert": {
       "name": "$link-invert",
       "value": "findColorInvert($link)",
-      "type": "variable",
+      "type": "function",
       "computed_type": "color",
       "computed_value": "#fff"
     },
+    "$link-light": {
+      "name": "$link-light",
+      "value": "findLightColor($link)",
+      "type": "compound"
+    },
+    "$link-dark": {
+      "name": "$link-dark",
+      "value": "findDarkColor($link)",
+      "type": "compound"
+    },
     "$link-visited": {
       "name": "$link-visited",
       "value": "$purple",
     },
     "$colors": {
       "name": "$colors",
-      "value": "mergeColorMaps((\"white\": ($white, $black), \"black\": ($black, $white), \"light\": ($light, $light-invert), \"dark\": ($dark, $dark-invert), \"primary\": ($primary, $primary-invert), \"link\": ($link, $link-invert), \"info\": ($info, $info-invert), \"success\": ($success, $success-invert), \"warning\": ($warning, $warning-invert), \"danger\": ($danger, $danger-invert)), $custom-colors)",
+      "value": "mergeColorMaps((\"white\": ($white, $black), \"black\": ($black, $white), \"light\": ($light, $light-invert), \"dark\": ($dark, $dark-invert), \"primary\": ($primary, $primary-invert, $primary-light, $primary-dark), \"link\": ($link, $link-invert, $link-light, $link-dark), \"info\": ($info, $info-invert, $info-light, $info-dark), \"success\": ($success, $success-invert, $success-light, $success-dark), \"warning\": ($warning, $warning-invert, $warning-light, $warning-dark), \"danger\": ($danger, $danger-invert, $danger-light, $danger-dark)), $custom-colors)",
       "type": "function"
     },
     "$shades": {
     "$purple-invert",
     "$red-invert",
     "$primary-invert",
+    "$primary-light",
+    "$primary-dark",
     "$info-invert",
+    "$info-light",
+    "$info-dark",
     "$success-invert",
+    "$success-light",
+    "$success-dark",
     "$warning-invert",
+    "$warning-light",
+    "$warning-dark",
     "$danger-invert",
+    "$danger-light",
+    "$danger-dark",
     "$light-invert",
     "$dark-invert",
+    "$scheme-main",
+    "$scheme-main-bis",
+    "$scheme-main-ter",
+    "$scheme-invert",
+    "$scheme-invert-bis",
+    "$scheme-invert-ter",
     "$background",
     "$border",
     "$border-hover",
+    "$border-light",
+    "$border-light-hover",
     "$text",
     "$text-invert",
     "$text-light",
     "$pre-background",
     "$link",
     "$link-invert",
+    "$link-light",
+    "$link-dark",
     "$link-visited",
     "$link-hover",
     "$link-hover-border",
index c602f5eb08aa75539bd8a1356278afd97076f106..c1c0b9c9d5f1b8043d0c8c3b31dcc004dd5348be 100644 (file)
       "value": "hsl(0, 0%, 86%)",
       "type": "color"
     },
+    "$grey-lightest": {
+      "name": "$grey-lightest",
+      "value": "hsl(0, 0%, 93%)",
+      "type": "color"
+    },
     "$white-ter": {
       "name": "$white-ter",
       "value": "hsl(0, 0%, 96%)",
@@ -67,7 +72,7 @@
     },
     "$green": {
       "name": "$green",
-      "value": "hsl(141, 71%,  48%)",
+      "value": "hsl(141, 53%,  53%)",
       "type": "color"
     },
     "$turquoise": {
@@ -77,7 +82,7 @@
     },
     "$cyan": {
       "name": "$cyan",
-      "value": "hsl(204, 86%,  53%)",
+      "value": "hsl(204, 71%,  53%)",
       "type": "color"
     },
     "$blue": {
@@ -92,7 +97,7 @@
     },
     "$red": {
       "name": "$red",
-      "value": "hsl(348, 100%, 61%)",
+      "value": "hsl(348, 86%, 61%)",
       "type": "color"
     },
     "$family-sans-serif": {
     "$grey",
     "$grey-light",
     "$grey-lighter",
+    "$grey-lightest",
     "$white-ter",
     "$white-bis",
     "$white",
index c46a0298a4410d4475f0a72f9a9b346c7937515f..481ab953b25ceaf5e1a97e46708a4913225c52ad 100644 (file)
             $color-invert: nth($components, 2)
             $color-light: nth($components, 3)
             $color-dark: nth($components, 4)
-          // If only Invert and Light are provided
+            // If only Invert and Light are provided
           @else if length($components) > 2
             $color-invert: nth($components, 2)
             $color-light: nth($components, 3)
             $color-dark: findDarkColor($color-base)
-          // If only Invert is provided
+            // If only Invert is provided
           @else
             $color-invert: nth($components, 2)
             $color-light: findLightColor($color-base)