Merged
Conversation
- Move to SCSS so we use theming color values - Apply tab style from files sidebar to ui-tabs (e.g. in user_ldap) - Move select style to the jquery-ui-fixes file and make those only apply to ui-autocomplete elements Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
@juliushaertl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @skjnldsv, @jancborchardt and @DeepDiver1975 to be potential reviewers. |
MorrisJobke
previously requested changes
Sep 3, 2017
core/css/jquery-ui-fixes.scss
Outdated
| @@ -8,29 +8,29 @@ | |||
| font-family: "Lucida Grande", Arial, Verdana, sans-serif; | |||
Member
There was a problem hiding this comment.
Drop it, because it is overwritten and outdated anyways. (same with the statement above)
core/css/server.scss
Outdated
| @import 'multiselect.scss'; | ||
| @import 'mobile.scss'; | ||
| @import 'tooltip.scss'; | ||
| @import 'tooltip.scss'; No newline at end of file |
7b06dff to
145f421
Compare
Codecov Report
@@ Coverage Diff @@
## master #6341 +/- ##
===========================================
- Coverage 53.31% 53.3% -0.01%
Complexity 22497 22497
===========================================
Files 1403 1403
Lines 87079 87079
Branches 1327 1327
===========================================
- Hits 46422 46421 -1
- Misses 40657 40658 +1
|
Signed-off-by: Julius Härtl <jus@bitgrid.net>
145f421 to
99404fe
Compare
MorrisJobke
reviewed
Sep 3, 2017
core/css/jquery-ui-fixes.scss
Outdated
| .ui-state-active { | ||
| border: none; | ||
| border-bottom: 1px solid $color-main-text; | ||
| color: $color-primary-text; |
Member
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Member
|
I fixed the font colouring: @juliushaertl Please have a look if this is okay with you. Thanks |
MorrisJobke
approved these changes
Sep 3, 2017
Member
Author
|
@MorrisJobke Makes sense 👍 Thanks for fixing. |
This was referenced Sep 3, 2017
Contributor
|
Nice work, @juliushaertl We should also move this stuff over to core/css/jquery-ui-fixes.scss : Lines 990 to 1072 in ad5a298 |
Member
|
Good stuff @juliushaertl! Thanks a lot :) |
This file contains hidden or 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
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 PR contains several improvements for our jquery-ui-fixes:
Fixes #1090 #5348 #6178