-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Admin Sass Organization #2133
Merged
Merged
Admin Sass Organization #2133
+76
−1,098
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
graygilmore
force-pushed
the
sass-organization
branch
from
August 9, 2017 18:04
ce4c000
to
2e43e5d
Compare
We don't need to have these variables defined twice in two separate locations. This file is specifically for values that differ from Bootstrap defaults.
These are Bootstrap variables so they should reside in our `bootstrap_custom` override file.
These color values can be applied directly to our Boostrap override.
These are no longer necessary and can be set directly in our Bootstrap override.
These should be set directly in our Bootstrap override. This will also allow us to more easily change this in the near future.
Bootstrap already provides a variable for us to override so we should use that instead.
Now that we have the Pill component there should be no area in the system that uses the old state component. As a fallback we can `@extend` the new Pill component in an effort to help out some stores that may have some customizations.
These aren't being used anywhere in the admin so we should remove them.
Instead of referring to generic `$color-1` variables we should be using explicitly named Sass variables.
graygilmore
force-pushed
the
sass-organization
branch
from
August 9, 2017 18:05
2e43e5d
to
546825a
Compare
tvdeyen
approved these changes
Aug 9, 2017
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All these changes make sense.
jhawthorn
approved these changes
Aug 15, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is just some basic cleanup of the admin Sass. There is more that can be done but that will come as we slowly move over to using Bootstrap's components (e.g., replacing our flashes with Bootstrap's alerts).
The biggest part of this is deprecating the
.state
component. Fortunately we can just use@extend
to have it hook directly into our new.pill
component. This will allow any extensions that are currently using.state
classes to still function properly and get the new styling.Blocked