Fix merge conflicts

This commit is contained in:
Jonathan Wong 2015-09-27 11:59:20 -07:00
commit 82b567f15f
50 changed files with 9327 additions and 277 deletions

View file

@ -33,6 +33,33 @@ select.input-sm {
color: #999;
outline: none;
}
select[multiple] {
height: 125px;
margin: 5px 0 5px 0;
color: #fff;
border: 0px solid #444;
background: #555;
padding: 2px 2px;
background-color: #555;
border-radius: 3px;
transition: background-color .3s;
}
select[multiple]:focus {
outline: 0;
outline: thin dotted \9;
color: #555;
background-color: #fff;
transition: background-color .3s;
}
select[multiple]:focus::-webkit-scrollbar-thumb {
background-color: rgba(0,0,0,.15);
}
select[multiple] option {
padding: 6px 10px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
img {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
@ -1074,7 +1101,7 @@ a:hover .dashboard-recent-media-cover {
display: block;
width: 100%;
height: 100%;
background-image: url(../images/plex-logo-light.svg);
background-image: url(../images/plex-logo-light-small.png);
background-size: 100px;
background-repeat: no-repeat;
background-position: center;