Skip to content

Commit

Permalink
Fix paired collection creator for BS4 branch.
Browse files Browse the repository at this point in the history
This is ugly to say the least, but the upstream flex styles (like .flex-row) are marking their directions as important so we need to mark these as important for the embedded flex stuff to work I think.
  • Loading branch information
jmchilton committed Apr 3, 2018
1 parent 679edd1 commit fafcd6e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
11 changes: 8 additions & 3 deletions client/galaxy/style/scss/ui/paired-collection-creator.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,16 @@
}

// a series of vertical elements that will expand to fill available space
// Tried to drop the important here but we have divs with classes of the form:
// flex-column-container scroll-container flex-row
// and flex-row specifies a row direction with important. I was unable to separate
// this into two separate divs and get the styling right but that'd probably be a
// better way to go longer term.
&.flex-row-container,
.flex-row-container {
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-webkit-flex-direction: column !important;
-ms-flex-direction: column !important;
flex-direction: column !important;
}
.flex-row {
-webkit-flex: 1 auto;
Expand Down
6 changes: 3 additions & 3 deletions static/style/blue/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -14363,9 +14363,9 @@ pre.peek {
align-content: stretch; }
.collection-creator.flex-row-container,
.collection-creator .flex-row-container {
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column; }
-webkit-flex-direction: column !important;
-ms-flex-direction: column !important;
flex-direction: column !important; }
.collection-creator .flex-row {
-webkit-flex: 1 auto;
-ms-flex: 1 auto;
Expand Down

0 comments on commit fafcd6e

Please sign in to comment.