diff --git a/superset/assets/src/components/RefreshLabel.less b/superset/assets/src/components/RefreshLabel.less
index 3bf895b1cf..a1b055f6fa 100644
--- a/superset/assets/src/components/RefreshLabel.less
+++ b/superset/assets/src/components/RefreshLabel.less
@@ -23,5 +23,5 @@
}
.RefreshLabel {
- color: @gray-light;
+ color: @bs-gray-light;
}
diff --git a/superset/assets/stylesheets/less/cosmo/variables.less b/superset/assets/stylesheets/less/cosmo/variables.less
index 7b979c2245..0b136b9c82 100644
--- a/superset/assets/stylesheets/less/cosmo/variables.less
+++ b/superset/assets/stylesheets/less/cosmo/variables.less
@@ -21,15 +21,15 @@
// --------------------------------------------------
-//== Colors
+// == Colors
//
-//## Gray and brand colors for use across Bootstrap.
+// ## Gray and brand colors for use across Bootstrap.
@gray-base: #000;
@gray-darker: lighten(@gray-base, 13.5%);
@gray-dark: lighten(@gray-base, 20%);
-@gray: lighten(@gray-base, 33.5%);
-@gray-light: lighten(@gray-base, 70%);
+@bs-gray: lighten(@gray-base, 33.5%);
+@bs-gray-light: lighten(@gray-base, 70%);
@gray-lighter: lighten(@gray-base, 95%);
@brand-primary: #00A699;
@@ -38,31 +38,31 @@
@brand-warning: #FED766;
@brand-danger: #FE4A49;
-//== Scaffolding
+// == Scaffolding
//
-//## Settings for some of the most global styles.
+// ## Settings for some of the most global styles.
-//** Background color for `
`.
+// ** Background color for ``.
@body-bg: #f5f5f5;
-//** Global text color on ``.
+// ** Global text color on ``.
@text-color: @gray-dark;
-//** Global textual link color.
-@link-color: @brand-primary;
-//** Link hover color set via `darken()` function.
+// ** Global textual link color.
+@link-color: @brand-primary;
+// ** Link hover color set via `darken()` function.
@link-hover-color: darken(@link-color, 15%);
-//** Link hover decoration.
+// ** Link hover decoration.
@link-hover-decoration: underline;
-//== Typography
+// == Typography
//
-//## Font, line-height, and color for body text, headings, and more.
+// ## Font, line-height, and color for body text, headings, and more.
@font-family-sans-serif: Helvetica, Arial;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
-//** Default monospace fonts for ``, ``, and `
`.
+// ** Default monospace fonts for ``, ``, and `
`.
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@@ -77,33 +77,33 @@
@font-size-h5: @font-size-base;
@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
-//** Unit-less `line-height` for use in components like buttons.
+// ** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.428571429; // 20/14
-//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+// ** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
-//** By default, this inherits from the ``.
+// ** By default, this inherits from the ``.
@headings-font-family: @font-family-base;
@headings-font-weight: 300;
@headings-line-height: 1.1;
@headings-color: inherit;
-//== Iconography
+// == Iconography
//
-//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+// ## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
-//** Load fonts from this directory.
+// ** Load fonts from this directory.
@icon-font-path: "../fonts/";
-//** File name for all font files.
+// ** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular";
-//** Element ID within SVG icon file.
+// ** Element ID within SVG icon file.
@icon-font-svg-id: "glyphicons_halflingsregular";
-//== Components
+// == Components
//
-//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+// ## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 10px;
@padding-base-horizontal: 18px;
@@ -124,41 +124,41 @@
@border-radius-large: 2px;
@border-radius-small: 2px;
-//** Global color for active items (e.g., navs or dropdowns).
+// ** Global color for active items (e.g., navs or dropdowns).
@component-active-color: #fff;
-//** Global background color for active items (e.g., navs or dropdowns).
+// ** Global background color for active items (e.g., navs or dropdowns).
@component-active-bg: @brand-primary;
-//** Width of the `border` for generating carets that indicate dropdowns.
+// ** Width of the `border` for generating carets that indicate dropdowns.
@caret-width-base: 4px;
-//** Carets increase slightly in size for larger components.
+// ** Carets increase slightly in size for larger components.
@caret-width-large: 5px;
-//== Tables
+// == Tables
//
-//## Customizes the `.table` component with basic values, each used across all table variations.
+// ## Customizes the `.table` component with basic values, each used across all table variations.
-//** Padding for `
`s and `
`s.
+// ** Padding for `
`s and `
`s.
@table-cell-padding: 8px;
-//** Padding for cells in `.table-condensed`.
+// ** Padding for cells in `.table-condensed`.
@table-condensed-cell-padding: 5px;
-//** Default background color used for all tables.
+// ** Default background color used for all tables.
@table-bg: transparent;
-//** Background color used for `.table-striped`.
+// ** Background color used for `.table-striped`.
@table-bg-accent: #f9f9f9;
-//** Background color used for `.table-hover`.
+// ** Background color used for `.table-hover`.
@table-bg-hover: #f5f5f5;
@table-bg-active: @table-bg-hover;
-//** Border color for table and cell borders.
+// ** Border color for table and cell borders.
@table-border-color: #ddd;
-//== Buttons
+// == Buttons
//
-//## For each of Bootstrap's buttons, define text, background and border color.
+// ## For each of Bootstrap's buttons, define text, background and border color.
@btn-font-weight: normal;
@@ -166,9 +166,9 @@
@btn-primary-bg: @brand-primary;
@btn-primary-border: @brand-primary;
-@btn-default-color: @gray;
+@btn-default-color: @bs-gray;
@btn-default-bg: #fff;
-@btn-default-border: @gray-light;
+@btn-default-border: @bs-gray-light;
@btn-success-color: @btn-primary-color;
@btn-success-bg: @brand-success;
@@ -186,7 +186,7 @@
@btn-danger-bg: @brand-danger;
@btn-danger-border: @btn-danger-bg;
-@btn-link-disabled-color: @gray-light;
+@btn-link-disabled-color: @bs-gray-light;
// Allows for customizing button radius independently from global border radius
@btn-border-radius-base: @border-radius-base;
@@ -194,89 +194,89 @@
@btn-border-radius-small: @border-radius-small;
-//== Forms
+// == Forms
//
-//##
+// ##
-//** `` background color
+// ** `` background color
@input-bg: #fff;
-//** `` background color
+// ** `` background color
@input-bg-disabled: @gray-lighter;
-//** Text color for ``s
+// ** Text color for ``s
@input-color: @text-color;
-//** `` border color
+// ** `` border color
@input-border: #ccc;
// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
-//** Default `.form-control` border radius
+// ** Default `.form-control` border radius
// This has no effect on `