Merge branches 'develop' and 'manual_scan' of https://github.com/RuudBurger/CouchPotatoServer into manual_scan

Conflicts:
	couchpotato/core/plugins/renamer/main.py
This commit is contained in:
Joel Kåberg
2013-12-16 07:29:31 +01:00
225 changed files with 22249 additions and 10130 deletions
+67 -6
View File
@@ -130,7 +130,7 @@
.page .ctrlHolder.focused:first-child, .page .ctrlHolder:first-child{ background-color: transparent; }
.page .ctrlHolder .formHint {
width: 47%;
width: 46%;
margin: -18px 0;
color: #fff !important;
display: inline-block;
@@ -547,12 +547,31 @@
.page .combined_table .head abbr:first-child {
display: none;
}
.page .combined_table .head abbr.host {
margin-right: 190px;
.page .combined_table .head abbr.host { margin-right: 120px; }
.page .combined_table input.host { width: 140px; }
.page .section_newznab .combined_table .head abbr.host { margin-right: 200px; }
.page .section_newznab .combined_table input.host { width: 220px; }
.page .combined_table .head abbr.name { margin-right: 57px; }
.page .combined_table input.name { width: 120px; }
.page .combined_table .head abbr.api_key { margin-right: 75px; }
.page .combined_table .head abbr.pass_key { margin-right: 71px; }
.page .combined_table input.pass_key { width: 113px; }
.page .section_newznab .combined_table .head abbr.api_key { margin-right: 185px; }
.page .section_newznab .combined_table input.api_key { width: 223px; }
.page .combined_table .seed_ratio,
.page .combined_table .seed_time {
width: 70px;
text-align: center;
margin-left: 10px;
}
.page .combined_table .head abbr.api_key {
margin-right: 171px;
.page .combined_table .seed_time {
margin-right: 10px;
}
.page .combined_table .head .extra_score,
.page .combined_table .extra_score {
width: 70px;
@@ -701,4 +720,46 @@
.active .group_imdb_automation:not(.disabled) {
background: url('../images/imdb_watchlist.png') no-repeat right 50px;
min-height: 210px;
}
}
.tooltip {
position: absolute;
right: 0px;
width: 30px;
height: 30px;
}
.tooltip > a {
opacity: .3;
font-size: 11px;
cursor: pointer;
}
.tooltip:hover > a {
opacity: 1;
}
.tooltip div {
background: #FFF;
color: #000;
padding: 10px;
width: 380px;
z-index: 200;
position: absolute;
transition: all .4s cubic-bezier(0.9,0,0.1,1);
margin-top: 40px;
right: 0;
opacity: 0;
visibility: hidden;
}
.tooltip.shown div {
margin-top: 10px;
opacity: 1;
visibility: visible;
}
.tooltip div a {
color: #5b9bd1;
}