BUG: Border at top of tabs when no subtabs #925
Merged
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
This bug reappeared when branches were merged because the 3.0 version of _style.scss had tabsets defined in different places. This scss was inserted, but there was no idication that it was new to master (except in the resulting css file). As these styles are declared differently elsewhere in _style.scss, I think this declaration must have been refactored in an earlier commit in master.
|
Probably my fault, its hard to merge SCSS without actually tracking down the original commits changing it. In other news, I've consolidated the dozen tab SCSS definitions and overrides a bit during the hackfest, should be able to send a pull request tomorrow. |
chillu
added a commit
that referenced
this pull request
Nov 4, 2012
BUG: Border at top of tabs when no subtabs
|
Understand. The very idea of having to merge two diverged branches of SCSS/CSS based changes gives me nightmares. ;) That'll be nice to see! |
|
Arg. Deleted too much of that tab styling. Was only meaning to remove the bottom part. New commit coming. |
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 bug reappeared when branches were merged because the 3.0 version of _style.scss had tabsets defined in different places.
This scss was inserted, but there was no idication that it was new to master (except in the resulting css file). As these styles are declared differently elsewhere in _style.scss, I think this declaration must have been refactored in an earlier commit in master.