pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing variable conflicts between Superset and Boot(swatch/strap) (#8650) 

* Fixing @gray conflict between Superset and Bootswatch

* removing duplicate import... whoops!

* making bootswatch bend it's namespace rather than superset/
This commit is contained in:
Evan Rusackas 2019-11-27 09:53:46 -08:00 committed by Daniel Vaz Gaspar
parent 75c1378d1f
commit 044348708e
3 changed files with 239 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
superset/assets/src/components/RefreshLabel.less
View File

@ -23,5 +23,5 @@
}
.RefreshLabel {
color: @gray-light;
color: @bs-gray-light;
}

42
superset/assets/stylesheets/less/cosmo/variables.less
View File

@ -28,8 +28,8 @@
@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;
@ -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;
@ -221,7 +221,7 @@
@input-border-focus: #66afe9;
// ** Placeholder text color
@input-color-placeholder: @gray-light;
@input-color-placeholder: @bs-gray-light;
// ** Default `.form-control` height
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@ -271,10 +271,10 @@
@dropdown-link-active-bg: @component-active-bg;
// ** Disabled dropdown menu item background color.
@dropdown-link-disabled-color: @gray-light;
@dropdown-link-disabled-color: @bs-gray-light;
// ** Text color for headers within dropdown menus.
@dropdown-header-color: @gray-light;
@dropdown-header-color: @bs-gray-light;
// ** Deprecated `@dropdown-caret-color` as of v3.1.0
@dropdown-caret-color: #000;
@ -440,8 +440,8 @@
@nav-link-padding: 10px 15px;
@nav-link-hover-bg: @gray-lighter;
@nav-disabled-link-color: @gray-light;
@nav-disabled-link-hover-color: @gray-light;
@nav-disabled-link-color: @bs-gray-light;
@nav-disabled-link-hover-color: @bs-gray-light;
// == Tabs
@nav-tabs-border-color: #bbb;
@ -449,7 +449,7 @@
@nav-tabs-link-hover-border-color: @gray-lighter;
@nav-tabs-active-link-hover-bg: @body-bg;
@nav-tabs-active-link-hover-color: @gray;
@nav-tabs-active-link-hover-color: @bs-gray;
@nav-tabs-active-link-hover-border-color: #bbb;
@nav-tabs-justified-link-border-color: #bbb;
@ -473,11 +473,11 @@
@pagination-hover-bg: @gray-lighter;
@pagination-hover-border: #ddd;
@pagination-active-color: @gray-light;
@pagination-active-color: @bs-gray-light;
@pagination-active-bg: #f5f5f5;
@pagination-active-border: #ddd;
@pagination-disabled-color: @gray-light;
@pagination-disabled-color: @bs-gray-light;
@pagination-disabled-bg: #fff;
@pagination-disabled-border: #ddd;
@ -495,7 +495,7 @@
@pager-active-bg: @pagination-active-bg;
@pager-active-color: @pagination-active-color;
@pager-disabled-color: @gray-light;
@pager-disabled-color: @bs-gray-light;
// == Jumbotron
@ -583,7 +583,7 @@
// ##
// ** Default label background color
@label-default-bg: @gray-light;
@label-default-bg: @bs-gray-light;
// ** Primary label background color
@label-primary-bg: @brand-primary;
// ** Success label background color
@ -705,7 +705,7 @@
@list-group-active-text-color: lighten(@list-group-active-bg, 40%);
// ** Text color of disabled list items
@list-group-disabled-color: @gray-light;
@list-group-disabled-color: @bs-gray-light;
// ** Background color of disabled list items
@list-group-disabled-bg: @gray-lighter;
// ** Text color for content within disabled list items
@ -812,7 +812,7 @@
// ** Breadcrumb text color
@breadcrumb-color: #ccc;
// ** Text color of current page in the breadcrumb
@breadcrumb-active-color: @gray-light;
@breadcrumb-active-color: @bs-gray-light;
// ** Textual separator for between breadcrumb elements
@breadcrumb-separator: "/";
@ -866,13 +866,13 @@
// ** Horizontal offset for forms and lists.
@component-offset-horizontal: 180px;
// ** Text muted color
@text-muted: @gray-light;
@text-muted: @bs-gray-light;
// ** Abbreviations and acronyms border color
@abbr-border-color: @gray-light;
@abbr-border-color: @bs-gray-light;
// ** Headings small color
@headings-small-color: @gray-light;
@headings-small-color: @bs-gray-light;
// ** Blockquote small color
@blockquote-small-color: @gray-light;
@blockquote-small-color: @bs-gray-light;
// ** Blockquote font size
@blockquote-font-size: (@font-size-base * 1.25);
// ** Blockquote border color

2
superset/assets/stylesheets/less/variables.less
View File

@ -28,8 +28,8 @@
@almost-black: #263238;
@gray-dark: #484848;
@gray: #879399;
@gray-light: #CFD8DC;
@gray: #879399;
@gray-bg: #f5f5f5;
@gray-heading: #A3A3A3;
@menu-hover: #F2F3F5;