Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions app/assets/stylesheets/spotlight/_multi_up_item_grid.scss
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
.item-grid-admin {
.field {
input[type='text'] {
input[type="text"] {
width: 89%;
}

.twitter-typeahead {
margin-bottom: 2*$spacer;
.twitter-typeahead {
margin-bottom: 2 * $spacer;
}
}
.field-select {
margin-top: 2*$spacer;
margin-top: 2 * $spacer;
select {
display: inline;
width: auto;
}
}
.dd3-item {
margin-bottom: 2*$spacer;
margin-bottom: 2 * $spacer;
}
}
// Hide the secondary caption field
// for the Features block so we can
// re-use the rest from the generic
// multi-up item grid.
[data-type='item-features'] {
[data-type="item-features"] {
.secondary-caption {
display: none;
}
}
.spotlight-flexbox {
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
flex-flow: row wrap;

Expand All @@ -43,7 +39,7 @@

@media (max-width: breakpoint-max("sm")) {
min-width: 200px;
-webkit-flex: 1 1 200px;
flex: 1 1 200px;
}

.caption {
Expand All @@ -53,11 +49,6 @@
img {
max-width: 100%;
}
-webkit-box-flex: 1;
-moz-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
flex: 1;
flex: 1 1 125px;

Do we need to persist the values from the removed -webkit-flex: 1 1 125px; from the line below? On my end it seems to make a difference. It looks like the entire .item-grid-admin class is unused, added in https://github.com/projectblacklight/spotlight/pull/281/files and since deleted. I'll do a follow up if you don't want to deal with that here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be great.

-webkit-flex: 1 1 125px;
}
}
6 changes: 3 additions & 3 deletions app/assets/stylesheets/spotlight/_pages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -237,14 +237,14 @@

.box {
min-width: 150px;
-webkit-flex: 1 1 150px;
flex: 1 1 150px;
}

/* two items */
.box:first-child:nth-last-child(2),
.box:first-child:nth-last-child(2) ~ .box {
min-width: 250px;
-webkit-flex: 1 1 250px;
flex: 1 1 250px;
}

/* only images, no text */
Expand All @@ -260,7 +260,7 @@
}

@media (max-width: breakpoint-max("md")) {
-webkit-flex: 1 1 175px;
flex: 1 1 175px;
}
}
}
Expand Down