Merge the two different versions of _view_lineup.scss #403
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
There is an alternative version of this file in the develop branch (with commit b9d40d0) that contains already some fixes. We copied it here now. We do not understand yet how we got an alternative history for this file in the first place.
oltionchampari
commented
Jul 29, 2020
| line-height: 1; | ||
| } | ||
|
|
||
| // Select only first div containing the `lineup-engine`. | ||
| // Do not select the `div.lu-backdrop` element, | ||
| // which is moved one level up in the DOM tree in ARankingView.ts | ||
| > div:first-of-type { |
There was a problem hiding this comment.
Took the most recent solution from @puehringer
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.
Apparently the file
_view_lineup.scssexists with two different histories. The current develop branch is missing the changes made to the file the past year, that are present in the file with alternative history.develop branch: https://github.com/datavisyn/tdp_core/commits/develop/src/styles/_view_lineup.scss
alternative history: https://github.com/datavisyn/tdp_core/commits/b9d40d04c23ef53fd2693ec8d3f93da1068a7f2d/src/styles/_view_lineup.scss
last common commit is 768cf0c from Aug 28, 2019.
This PR adds the changes missing from the current
_view_lineup.scssof the develop branch.Tested branch in ordino and everything looks as it should