From: Jeremy Thomas Date: Tue, 19 Jun 2018 12:33:54 +0000 (+0100) Subject: Fix variables component X-Git-Tag: 0.7.2~96 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9f0b19e4633a03e51316fa601f9c2adfbdf9f06;p=thirdparty%2Fbulma.git Fix variables component --- diff --git a/docs/_data/variables/base/_all.json b/docs/_data/variables/base/_all.json deleted file mode 100644 index a720f04a0..000000000 --- a/docs/_data/variables/base/_all.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "base/_all.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/base/helpers.json b/docs/_data/variables/base/helpers.json deleted file mode 100644 index d8572ab99..000000000 --- a/docs/_data/variables/base/helpers.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "base/helpers.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/base/minireset.json b/docs/_data/variables/base/minireset.json deleted file mode 100644 index 44f47d161..000000000 --- a/docs/_data/variables/base/minireset.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "base/minireset.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/components/_all.json b/docs/_data/variables/components/_all.json deleted file mode 100644 index 55def69d6..000000000 --- a/docs/_data/variables/components/_all.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "components/_all.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/components/level.json b/docs/_data/variables/components/level.json deleted file mode 100644 index 115fee8b2..000000000 --- a/docs/_data/variables/components/level.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "components/level.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/components/media.json b/docs/_data/variables/components/media.json deleted file mode 100644 index 2e3ea7556..000000000 --- a/docs/_data/variables/components/media.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "components/media.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/elements/_all.json b/docs/_data/variables/elements/_all.json deleted file mode 100644 index 9633bb22a..000000000 --- a/docs/_data/variables/elements/_all.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "elements/_all.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/elements/container.json b/docs/_data/variables/elements/container.json deleted file mode 100644 index 463d2a486..000000000 --- a/docs/_data/variables/elements/container.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "elements/container.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/elements/other.json b/docs/_data/variables/elements/other.json deleted file mode 100644 index 8eca59321..000000000 --- a/docs/_data/variables/elements/other.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "elements/other.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/grid/_all.json b/docs/_data/variables/grid/_all.json deleted file mode 100644 index 28f15a86c..000000000 --- a/docs/_data/variables/grid/_all.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "grid/_all.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/grid/tiles.json b/docs/_data/variables/grid/tiles.json deleted file mode 100644 index a429a62d9..000000000 --- a/docs/_data/variables/grid/tiles.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "grid/tiles.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/layout/_all.json b/docs/_data/variables/layout/_all.json deleted file mode 100644 index 35f974b85..000000000 --- a/docs/_data/variables/layout/_all.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "layout/_all.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/layout/hero.json b/docs/_data/variables/layout/hero.json deleted file mode 100644 index 07c8acb09..000000000 --- a/docs/_data/variables/layout/hero.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "by_name": {}, - "list": [], - "file_path": "layout/hero.sass" -} \ No newline at end of file diff --git a/docs/_data/variables/utilities/controls.json b/docs/_data/variables/utilities/controls.json new file mode 100644 index 000000000..f29b2b86e --- /dev/null +++ b/docs/_data/variables/utilities/controls.json @@ -0,0 +1,41 @@ +{ + "by_name": { + "$control-radius": { + "name": "$control-radius", + "value": "$radius", + "type": "variable", + "computed_type": "size", + "computed_value": "4px" + }, + "$control-radius-small": { + "name": "$control-radius-small", + "value": "$radius-small", + "type": "variable", + "computed_type": "size", + "computed_value": "2px" + }, + "$control-border-width": { + "name": "$control-border-width", + "value": "1px", + "type": "size" + }, + "$control-padding-vertical": { + "name": "$control-padding-vertical", + "value": "calc(0.375em - #{$control-border-width})", + "type": "size" + }, + "$control-padding-horizontal": { + "name": "$control-padding-horizontal", + "value": "calc(0.625em - #{$control-border-width})", + "type": "size" + } + }, + "list": [ + "$control-radius", + "$control-radius-small", + "$control-border-width", + "$control-padding-vertical", + "$control-padding-horizontal" + ], + "file_path": "utilities/controls.sass" +} \ No newline at end of file diff --git a/docs/_includes/elements/variables.html b/docs/_includes/elements/variables.html index b3448eefd..9a46dd931 100644 --- a/docs/_includes/elements/variables.html +++ b/docs/_includes/elements/variables.html @@ -28,11 +28,15 @@ {% endcapture %} -{% include elements/anchor.html name=anchor_name %} +{% unless include.hide_anchor %} + {% include elements/anchor.html name=anchor_name %} +{% endunless %} -
-

{{ content | strip }}

-
+{% unless include.hide_content %} +
+

{{ content | strip }}

+
+{% endunless %}
@@ -55,13 +59,8 @@ {% if include.variables_keys %} {% for key in include.variables_keys %} - {% if include.responsiveness_variables %} - {% assign variable = site.data.variables.utilities.initial-variables.by_name[key] %} - {% include elements/variable-row.html variable=variable %} - {% else %} - {% assign variable = site.data.variables.elements.form.by_name[key] %} - {% include elements/variable-row.html variable=variable %} - {% endif %} + {% assign variable = site.data.variables[include.folder][include.file].by_name[key] %} + {% include elements/variable-row.html variable=variable %} {% endfor %} {% else %} {% for variable_name in variables %} diff --git a/docs/documentation/form/file.html b/docs/documentation/form/file.html index 7d1fdd08a..466594612 100644 --- a/docs/documentation/form/file.html +++ b/docs/documentation/form/file.html @@ -730,4 +730,9 @@ meta:

-{% include elements/variables.html type='element' variables_keys=page.variables_keys %} +{% include elements/variables.html + type='element' + variables_keys=page.variables_keys + folder='elements' + file='form' +%} diff --git a/docs/documentation/form/general.html b/docs/documentation/form/general.html index 0c68ba335..d107dacfb 100644 --- a/docs/documentation/form/general.html +++ b/docs/documentation/form/general.html @@ -8,15 +8,15 @@ breadcrumb: - documentation - form - form-general -variables_controls_keys: -- control-radius -- control-radius-small -- control-padding-vertical -- control-padding-horizontal -variables_form_keys: -- label-color -- label-weight -- help-size +variables_control_keys: +- $control-radius +- $control-radius-small +- $control-padding-vertical +- $control-padding-horizontal +variables_keys: +- $label-color +- $label-weight +- $help-size --- {% capture example %} @@ -1029,49 +1029,23 @@ variables_form_keys: {% include elements/snippet.html content=field_label_example horizontal=true more=true %} -{% include elements/anchor.html name="Variables" %} - -
-

- Form elements can be customized using the following generic variables. Simply set one or multiple of these variables before importing Bulma. Learn how. -

-
+{% capture custom_message %} + Form elements can be customized using the following generic variables. Simply set one or multiple of these variables before importing Bulma. Learn how. +{% endcapture %} -
- - - - - - - - - - - - - - {% for key in page.variables_controls_keys %} - {% assign variable = site.data.variables.utilities.controls.vars[key] %} - - - - - {% endfor %} - {% for key in page.variables_form_keys %} - {% assign variable = site.data.variables.elements.form.vars[key] %} - - - - - {% endfor %} - -
NameDefault value
NameDefault value
- {{ variable.name }} - - {{ variable.value }} -
- {{ variable.name }} - - {{ variable.value }} -
+{% include elements/variables.html + type='element' + variables_keys=page.variables_control_keys + custom_message=custom_message + folder='utilities' + file='controls' +%} + +{% include elements/variables.html + type='element' + variables_keys=page.variables_keys + folder='elements' + file='form' + hide_anchor=true + hide_content=true +%} diff --git a/docs/documentation/form/input.html b/docs/documentation/form/input.html index ccfe35f85..18d362da2 100644 --- a/docs/documentation/form/input.html +++ b/docs/documentation/form/input.html @@ -478,4 +478,8 @@ meta:
-{% include elements/variables.html type='element' variables_keys=page.variables_keys %} +{% include elements/variables.html type='element' + variables_keys=page.variables_keys + folder='elements' + file='form' +%} diff --git a/docs/documentation/overview/responsiveness.html b/docs/documentation/overview/responsiveness.html index be8c6ac1a..80b555c01 100644 --- a/docs/documentation/overview/responsiveness.html +++ b/docs/documentation/overview/responsiveness.html @@ -234,5 +234,6 @@ $fullhd-enabled: false type='element' variables_keys=page.variables_keys custom_message=custom_message - responsiveness_variables=true + folder='utilities' + file='initial-variables' %} diff --git a/docs/scripts/plugins/03-read-other-variables.js b/docs/scripts/plugins/03-read-other-variables.js index 2dde9e2c9..24c842099 100644 --- a/docs/scripts/plugins/03-read-other-variables.js +++ b/docs/scripts/plugins/03-read-other-variables.js @@ -11,9 +11,9 @@ function plugin() { setImmediate(done); Object.keys(files).forEach(file_path => { - if (file_path.startsWith('utilities')) { - return; - } + // if (file_path.startsWith('utilities')) { + // return; + // } const {file_name, lines} = utils.getLines(files, file_path); let variables = { @@ -38,7 +38,9 @@ function plugin() { } }); - utils.writeFile(file_path, variables); + if (variables.list.length > 0) { + utils.writeFile(file_path, variables); + } }); }; }