merge branch master into remove-prefixes
This commit is contained in:
@@ -84,7 +84,7 @@
|
||||
|
||||
.pageTitle {
|
||||
display: inline-flex;
|
||||
margin: 0 0 0 .5em;
|
||||
margin: .3em 0 0 .5em;
|
||||
height: 1.7em;
|
||||
align-items: center;
|
||||
flex-shrink: 1
|
||||
@@ -405,10 +405,12 @@
|
||||
}
|
||||
|
||||
.detailImageContainer {
|
||||
margin-right: 2em;
|
||||
width: 280px;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
margin-right: 2em;
|
||||
>>>>>>> master
|
||||
flex-shrink: 0;
|
||||
margin-left: .6em
|
||||
}
|
||||
|
||||
.detailPagePrimaryContent {
|
||||
@@ -810,12 +812,15 @@
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
/* these next two rules are for the scroller element headers */
|
||||
.sectionTitleContainer-cards {
|
||||
margin-bottom: 0;
|
||||
margin: 0;
|
||||
padding-top: 1.25em;
|
||||
}
|
||||
|
||||
.sectionTitle-cards {
|
||||
margin-bottom: 0;
|
||||
div:not(.sectionTitleContainer-cards) > .sectionTitle-cards {
|
||||
margin: 0;
|
||||
padding-top: 1.25em;
|
||||
}
|
||||
|
||||
.sectionTitleButton {
|
||||
|
||||
Reference in New Issue
Block a user