moparisthebest
/
SickRage
mirror of https://github.com/moparisthebest/SickRage
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
echel0n 2014-12-10 05:11:19 -08:00
parent 7213fbac11 7fc891009a
commit 4cb4d1496e
3 changed files with 49 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
gui/slick/css/lib/bootstrap.css vendored
View File

@ -1108,7 +1108,7 @@ p {
font-weight: 300;
line-height: 1.4;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.lead {
font-size: 21px;
}
@ -1257,7 +1257,7 @@ dt {
dd {
margin-left: 0;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.dl-horizontal dt {
float: left;
width: 160px;
@ -1396,12 +1396,12 @@ pre code {
margin-right: auto;
margin-left: auto;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.container {
width: 750px;
}
}
@media (min-width: 992px) {
@media (min-width: 1011px) {
.container {
width: 970px;
}
@ -1583,7 +1583,7 @@ pre code {
.col-xs-offset-0 {
margin-left: 0;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
float: left;
}
@ -1741,7 +1741,7 @@ pre code {
margin-left: 0;
}
}
@media (min-width: 992px) {
@media (min-width: 1011px) {
.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
float: left;
}
@ -2636,7 +2636,7 @@ select[multiple].input-lg {
margin-bottom: 10px;
color: #737373;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.form-inline .form-group {
display: inline-block;
margin-bottom: 0;
@ -2699,7 +2699,7 @@ select[multiple].input-lg {
margin-right: -15px;
margin-left: -15px;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.form-horizontal .control-label {
padding-top: 7px;
margin-bottom: 0;
@ -2710,12 +2710,12 @@ select[multiple].input-lg {
top: 0;
right: 15px;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.form-horizontal .form-group-lg .control-label {
padding-top: 14.3px;
}
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.form-horizontal .form-group-sm .control-label {
padding-top: 6px;
}
@ -3239,7 +3239,7 @@ tbody.collapse.in {
bottom: 100%;
margin-bottom: 1px;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-right .dropdown-menu {
right: 0;
left: auto;
@ -3658,7 +3658,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
top: auto;
left: auto;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.nav-tabs.nav-justified > li {
display: table-cell;
width: 1%;
@ -3676,7 +3676,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs.nav-justified > .active > a:focus {
border: 1px solid #ddd;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.nav-tabs.nav-justified > li > a {
border-bottom: 1px solid #ddd;
border-radius: 4px 4px 0 0;
@ -3723,7 +3723,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
top: auto;
left: auto;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.nav-justified > li {
display: table-cell;
width: 1%;
@ -3744,7 +3744,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs-justified > .active > a:focus {
border: 1px solid #ddd;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.nav-tabs-justified > li > a {
border-bottom: 1px solid #ddd;
border-radius: 4px 4px 0 0;
@ -3772,12 +3772,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-bottom: 20px;
border: 1px solid transparent;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar {
border-radius: 4px;
}
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-header {
float: left;
}
@ -3794,7 +3794,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-collapse.in {
overflow-y: auto;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-collapse {
width: auto;
border-top: 0;
@ -3834,7 +3834,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-right: -15px;
margin-left: -15px;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.container > .navbar-header,
.container-fluid > .navbar-header,
.container > .navbar-collapse,
@ -3847,7 +3847,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
z-index: 1000;
border-width: 0 0 1px;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-static-top {
border-radius: 0;
}
@ -3859,7 +3859,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
left: 0;
z-index: 1030;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-fixed-top,
.navbar-fixed-bottom {
border-radius: 0;
@ -3885,7 +3885,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-brand:focus {
text-decoration: none;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {
margin-left: -15px;
@ -3915,7 +3915,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-toggle .icon-bar + .icon-bar {
margin-top: 4px;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-toggle {
display: none;
}
@ -3951,7 +3951,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
background-image: none;
}
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-nav {
float: left;
margin: 0;
@ -3967,7 +3967,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-right: -15px;
}
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-left {
float: left !important;
}
@ -3986,7 +3986,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-form .form-group {
display: inline-block;
margin-bottom: 0;
@ -4038,7 +4038,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-bottom: 5px;
}
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-form {
width: auto;
padding-top: 0;
@ -4078,7 +4078,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
margin-top: 15px;
margin-bottom: 15px;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.navbar-text {
float: left;
margin-right: 15px;
@ -4565,7 +4565,7 @@ a.list-group-item.active > .badge,
.jumbotron .container {
max-width: 100%;
}
@media screen and (min-width: 768px) {
@media screen and (min-width: 1010px) {
.jumbotron {
padding-top: 48px;
padding-bottom: 48px;
@ -5473,7 +5473,7 @@ button.close {
height: 50px;
overflow: scroll;
}
@media (min-width: 768px) {
@media (min-width: 1010px) {
.modal-dialog {
width: 600px;
margin: 30px auto;
@ -5486,7 +5486,7 @@ button.close {
width: 300px;
}
}
@media (min-width: 992px) {
@media (min-width: 1011px) {
.modal-lg {
width: 900px;
}
@ -5873,7 +5873,7 @@ button.close {
.carousel-caption .btn {
text-shadow: none;
}
@media screen and (min-width: 768px) {
@media screen and (min-width: 1010px) {
.carousel-control .glyphicon-chevron-left,
.carousel-control .glyphicon-chevron-right,
.carousel-control .icon-prev,
@ -6040,7 +6040,7 @@ button.close {
display: inline-block !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 1010px) and (max-width: 1012px) {
.visible-sm {
display: block !important;
}
@ -6055,22 +6055,22 @@ button.close {
display: table-cell !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 1010px) and (max-width: 1012px) {
.visible-sm-block {
display: block !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 1010px) and (max-width: 1012px) {
.visible-sm-inline {
display: inline !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 1010px) and (max-width: 1012px) {
.visible-sm-inline-block {
display: inline-block !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 1011px) and (max-width: 1199px) {
.visible-md {
display: block !important;
}
@ -6085,17 +6085,17 @@ button.close {
display: table-cell !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 1011px) and (max-width: 1199px) {
.visible-md-block {
display: block !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 1011px) and (max-width: 1199px) {
.visible-md-inline {
display: inline !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 1011px) and (max-width: 1199px) {
.visible-md-inline-block {
display: inline-block !important;
}
@ -6135,12 +6135,12 @@ button.close {
display: none !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
@media (min-width: 1010px) and (max-width: 1012px) {
.hidden-sm {
display: none !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
@media (min-width: 1011px) and (max-width: 1199px) {
.hidden-md {
display: none !important;
}

6
gui/slick/interfaces/default/config_providers.tmpl
View File

@ -75,9 +75,9 @@ var show_nzb_providers = #if $sickbeard.USE_NZBS then "true" else "false"#;
#end if
<div>
<h4 class="note">*</h4><p class="note">Provider does not support backlog searches at this time.</p>
<h4 class="note">**</h4><p class="note">Provider supports <b>limited</b> backlog searches, all episodes/qualities may not be available.</p>
<h4 class="note">!</h4><p class="note">Provider is <b>NOT WORKING</b>.</p>
<p class="note">* Provider does not support backlog searches at this time.</p>
<p class="note">** Provider supports <b>limited</b> backlog searches, all episodes/qualities may not be available.</p>
<p class="note">! Provider is <b>NOT WORKING</b>.</p>
</div>
</div>

10
gui/slick/interfaces/default/home.tmpl
View File

@ -214,6 +214,10 @@
<option value="$sbRoot/setHomeLayout/?layout=banner" #if $sickbeard.HOME_LAYOUT == "banner" then "selected=\"selected\"" else ""#>Banner</option>
<option value="$sbRoot/setHomeLayout/?layout=simple" #if $sickbeard.HOME_LAYOUT == "simple" then "selected=\"selected\"" else ""#>Simple</option>
</select>
#if $layout != 'poster':
Search:
<input class="search form-control form-control-inline input-sm input200" type="search" data-column="1" placeholder="Search Show Name"> <button type="button" class="resetshows resetanime btn btn-inline">Reset Search</button>
#end if
</span>
#if $layout == 'poster':
@ -238,12 +242,6 @@
#end if
</div>
#if $layout != 'poster':
<div class="pull-right">
<input class="search form-control form-control-inline input-sm input200" type="search" data-column="1" placeholder="Search Show Name"> <button type="button" class="resetshows resetanime btn btn-inline">Reset Search</button>
</div>
#end if
#for $curShowlist in $showlists:
#set $curListType = $curShowlist[0]
#set $myShowList = $list($curShowlist[1])