Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Tim Hobbs
commit
37fb510a2d
71 changed files with 1041 additions and 619 deletions
105
dashboard-ui/css/contextmenu.css
Normal file
105
dashboard-ui/css/contextmenu.css
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
.itemContextMenu {
|
||||
position: absolute;
|
||||
background: #fff;
|
||||
border: 1px solid #ddd;
|
||||
color: #000;
|
||||
font-size: 14px;
|
||||
z-index: 10000;
|
||||
background-color: #ffffff;
|
||||
border: 1px solid #ccc;
|
||||
border: 1px solid rgba(0, 0, 0, 0.2);
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 14px;
|
||||
*border-right-width: 2px;
|
||||
*border-bottom-width: 2px;
|
||||
-webkit-border-radius: 6px;
|
||||
-moz-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
|
||||
-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
|
||||
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
|
||||
-webkit-background-clip: padding-box;
|
||||
-moz-background-clip: padding;
|
||||
background-clip: padding-box;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.contextMenuInner {
|
||||
padding: .5em 0;
|
||||
width: 160px;
|
||||
}
|
||||
|
||||
.contextMenuOption {
|
||||
display: block;
|
||||
color: #000;
|
||||
text-decoration: none;
|
||||
font-weight: normal;
|
||||
padding: .35em 1em;
|
||||
}
|
||||
|
||||
.contextMenuOption:hover {
|
||||
color: #ffffff;
|
||||
text-decoration: none;
|
||||
background-color: #0088cc;
|
||||
background-color: #0081c2;
|
||||
background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
|
||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
|
||||
background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
|
||||
background-image: -o-linear-gradient(top, #0088cc, #0077b3);
|
||||
background-image: linear-gradient(to bottom, #0088cc, #0077b3);
|
||||
background-repeat: repeat-x;
|
||||
}
|
||||
|
||||
.contextMenuHeader {
|
||||
font-weight: bold;
|
||||
margin: .5em 0;
|
||||
padding: 0 1em;
|
||||
color: #999;
|
||||
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.contextMenuDivider {
|
||||
margin: .75em 0;
|
||||
height: 1px;
|
||||
background: #e5e5e5;
|
||||
}
|
||||
|
||||
.itemContextMenu:before, .dropdown-context-up:before {
|
||||
position: absolute;
|
||||
top: -7px;
|
||||
left: 9px;
|
||||
display: inline-block;
|
||||
border-right: 7px solid transparent;
|
||||
border-bottom: 7px solid #ccc;
|
||||
border-left: 7px solid transparent;
|
||||
border-bottom-color: rgba(0, 0, 0, 0.2);
|
||||
content: '';
|
||||
}
|
||||
.dropdown-context:after, .dropdown-context-up:after {
|
||||
position: absolute;
|
||||
top: -6px;
|
||||
left: 10px;
|
||||
display: inline-block;
|
||||
border-right: 6px solid transparent;
|
||||
border-bottom: 6px solid #ffffff;
|
||||
border-left: 6px solid transparent;
|
||||
content: '';
|
||||
}
|
||||
.dropdown-context-up:before, .dropdown-context-up:after {
|
||||
top: auto;
|
||||
bottom: -7px;
|
||||
z-index: 9999;
|
||||
}
|
||||
.dropdown-context-up:before {
|
||||
border-right: 7px solid transparent;
|
||||
border-top: 7px solid #ccc;
|
||||
border-bottom: none;
|
||||
border-left: 7px solid transparent;
|
||||
}
|
||||
.dropdown-context-up:after {
|
||||
border-right: 6px solid transparent;
|
||||
border-top: 6px solid #ffffff;
|
||||
border-left: 6px solid transparent;
|
||||
border-bottom: none;
|
||||
}
|
||||
|
|
@ -212,6 +212,10 @@
|
|||
margin: .5em 0 .25em;
|
||||
}
|
||||
|
||||
.viewControls + .listTopPaging {
|
||||
margin-left: .5em!important;
|
||||
}
|
||||
|
||||
.labelPageSize {
|
||||
margin-left: 1em!important;
|
||||
display: inline !important;
|
||||
|
|
@ -912,6 +916,22 @@ a.itemTag:hover {
|
|||
background-color: transparent !important;
|
||||
}
|
||||
|
||||
.alternateVersionIndicator {
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 5px;
|
||||
left: 5px;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
width: 22px;
|
||||
height: 19px;
|
||||
padding-top: 3px;
|
||||
border-radius: 50%;
|
||||
color: #fff;
|
||||
background: rgb(51, 136, 204);
|
||||
background: rgba(51, 136, 204, .9);
|
||||
}
|
||||
|
||||
.unidentifiedIndicator {
|
||||
display: block;
|
||||
position: absolute;
|
||||
|
|
@ -1049,7 +1069,7 @@ a.itemTag:hover {
|
|||
.alphabetPicker {
|
||||
position: fixed;
|
||||
right: 2px;
|
||||
bottom: 30px;
|
||||
bottom: 10px;
|
||||
width: 27px;
|
||||
z-index: 1000;
|
||||
text-align: center;
|
||||
|
|
|
|||
|
|
@ -171,12 +171,12 @@
|
|||
margin: 5px;
|
||||
padding: 8px;
|
||||
border: 1px solid #444;
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from(#444),to(#2d2d2d));
|
||||
background-image: -webkit-linear-gradient(#444,#2d2d2d);
|
||||
background-image: -moz-linear-gradient(#444,#2d2d2d);
|
||||
background-image: -ms-linear-gradient(#444,#2d2d2d);
|
||||
background-image: -o-linear-gradient(#444,#2d2d2d);
|
||||
background-image: linear-gradient(#444,#2d2d2d);
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from(#333),to(#2d2d2d));
|
||||
background-image: -webkit-linear-gradient(#333,#2d2d2d);
|
||||
background-image: -moz-linear-gradient(#333,#2d2d2d);
|
||||
background-image: -ms-linear-gradient(#333,#2d2d2d);
|
||||
background-image: -o-linear-gradient(#333,#2d2d2d);
|
||||
background-image: linear-gradient(#333,#2d2d2d);
|
||||
}
|
||||
|
||||
.imageEditorTile {
|
||||
|
|
|
|||
|
|
@ -304,14 +304,6 @@
|
|||
|
||||
@media all and (min-width: 1440px) {
|
||||
|
||||
.squarePosterItem {
|
||||
width: 180px;
|
||||
}
|
||||
|
||||
.squarePosterItem .posterItemImage {
|
||||
height: 180px;
|
||||
}
|
||||
|
||||
.backdropPosterItem {
|
||||
width: 298px;
|
||||
}
|
||||
|
|
@ -320,17 +312,6 @@
|
|||
height: 167.625px;
|
||||
}
|
||||
}
|
||||
|
||||
@media all and (min-width: 1920px) {
|
||||
|
||||
.squarePosterItem {
|
||||
width: 190px;
|
||||
}
|
||||
|
||||
.squarePosterItem .posterItemImage {
|
||||
height: 190px;
|
||||
}
|
||||
}
|
||||
/********************/
|
||||
.ribbon-wrapper {
|
||||
width: 50px;
|
||||
|
|
@ -341,6 +322,7 @@
|
|||
left: 0px;
|
||||
z-index: 999;
|
||||
}
|
||||
|
||||
.ribbon {
|
||||
font: bold 11px Sans-Serif;
|
||||
color: #333;
|
||||
|
|
@ -360,6 +342,7 @@
|
|||
-moz-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.3);
|
||||
box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
.ribbon-3d {
|
||||
background-color: #3344ff;
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, from(#BFDC7A), to(#ff0033));
|
||||
|
|
@ -368,6 +351,7 @@
|
|||
background-image: -ms-linear-gradient(top, #3344ff, #ff0033);
|
||||
background-image: -o-linear-gradient(top, #3344ff, #ff0033);
|
||||
}
|
||||
|
||||
.ribbon-blue {
|
||||
background-color: #1199ff;
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, from(#1199ff), to(#3333ff));
|
||||
|
|
@ -376,6 +360,7 @@
|
|||
background-image: -ms-linear-gradient(top, #1199ff, #3333ff);
|
||||
background-image: -o-linear-gradient(top, #1199ff, #3333ff);
|
||||
}
|
||||
|
||||
.ribbon-red {
|
||||
background-color: #ff3333;
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, from(#ff3333), to(#992233));
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ h1 .imageLink {
|
|||
|
||||
/* Dashboard home */
|
||||
.tblConnections td {
|
||||
padding: 1em 0 1em 1.25em;
|
||||
padding: 1em 0 1em .75em;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
|
|
@ -666,12 +666,8 @@ h1 .imageLink {
|
|||
padding-left: 0;
|
||||
}
|
||||
|
||||
.tblConnections img {
|
||||
height: 48px;
|
||||
}
|
||||
|
||||
.nowPlayingText {
|
||||
padding-left: .5em!important;
|
||||
.tblConnections img:not(.clientNowPlayingImage) {
|
||||
height: 28px;
|
||||
}
|
||||
|
||||
.clientNowPlayingImage {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue