Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Nov 27, 2019

Conversation

rusackas
Copy link
Member

@rusackas rusackas commented Nov 25, 2019

CATEGORY

Choose one

  • Bug Fix
  • Enhancement (new features, refinement)
  • Refactor
  • Add tests
  • Build / Development Environment
  • Documentation

SUMMARY

There were a couple variable collisions between Superset's variables.less file and the Bootswatch theme's variables.less, both of which had an @gray value and @gray-light. I renamed the one ones the Bootstrap/Bootswatch side to have a @bs-... prefix to namespace them for now. Hopefully all is looking more like it ought to now.

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

Before:
image

After:
image

REVIEWERS

@graceguo-supercat

@pull-request-size pull-request-size bot added size/L and removed size/M labels Nov 26, 2019
@rusackas rusackas changed the title Fixing @gray conflict between Superset and Bootswatch Fixing variable conflicts between Superset and Boot(swatch/strap) Nov 26, 2019
@rusackas rusackas marked this pull request as ready for review November 26, 2019 00:32
@rusackas rusackas mentioned this pull request Nov 26, 2019
3 tasks
@codecov-io
Copy link

codecov-io commented Nov 26, 2019

Codecov Report

Merging #8650 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #8650   +/-   ##
=======================================
  Coverage   65.76%   65.76%           
=======================================
  Files         482      482           
  Lines       23824    23824           
  Branches     2594     2594           
=======================================
  Hits        15667    15667           
  Misses       7984     7984           
  Partials      173      173

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update acf0753...c3d6d52. Read the comment docs.

Copy link

@graceguo-supercat graceguo-supercat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
Thanks for quick fix!

Copy link
Member

@dpgaspar dpgaspar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGMT, just left a small comment

@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%);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: tab miss aligned

Copy link
Member Author

@rusackas rusackas Nov 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, didn't worry about it since Prettier is about to wipe that out in @etr2460's next merge, and my next PR will rewrite or remove this file entirely ;)

@dpgaspar dpgaspar merged commit 0443487 into apache:master Nov 27, 2019
@dpgaspar dpgaspar deleted the Github-Issue-8635 branch November 27, 2019 17:53
@mistercrunch mistercrunch added 🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels 🚢 0.36.0 labels Feb 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels size/L 🚢 0.36.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants