Merge branch 'refs/heads/develop' into redesign

couchpotato/static/style/main.css

@@ -8,6 +8,7 @@ body, html {
 	padding: 0;
 	background: #4e5969;
 	-webkit-font-smoothing: subpixel-antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 	body { overflow-y: scroll; }
 	body.noscroll { overflow: hidden; }
@@ -52,6 +53,30 @@ input:-moz-placeholder {
 	font-style: italic;
 }
 
+.tiny_scroll {
+    overflow: hidden;
+}
+
+    .tiny_scroll:hover {
+        overflow-y: auto;
+    }
+
+    .tiny_scroll::-webkit-scrollbar {
+        width: 5px;
+    }
+
+    .tiny_scroll::-webkit-scrollbar-track {
+        -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.4);
+        -webkit-border-radius: 5px;
+        border-radius: 5px;
+    }
+
+    .tiny_scroll::-webkit-scrollbar-thumb {
+        -webkit-border-radius: 5px;
+        border-radius: 5px;
+        background: rgba(255,255,255,0.3);
+    }
+
 a img {
 	border:none;
 }
@@ -166,6 +191,7 @@ body > .spinner, .mask{
 	text-transform: none;
 	line-height: 1;
 	-webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 	font-size: 15px;
 	color: #FFF;
 }

couchpotato/static/style/settings.css

@@ -75,6 +75,8 @@
 			color: #edc07f;
 		}
 		.page.show_advanced .advanced { display: block; }
+		.page.show_advanced span.advanced,
+		.page.show_advanced input.advanced { display: inline; }
 
 		.page.settings .tab_content {
 			display: none;
@@ -92,6 +94,22 @@
 				border-bottom: 1px solid #333;
 				box-shadow: 0 1px 0 rgba(255,255,255, 0.15);
 			}
+
+			.page fieldset h2 .icon {
+				vertical-align: bottom;
+				position: absolute;
+				left: -25px;
+				top: 3px;
+				background: #FFF;
+				border-radius: 2.5px;
+				line-height: 0;
+				overflow: hidden;
+			}
+
+				.page fieldset.enabler:hover h2 .icon {
+					display: none;
+				}
+
 			.page fieldset h2 .hint {
 				font-size: 12px;
 				margin-left: 10px;
@@ -160,7 +178,7 @@
 			padding: 6px 0 0;
 		}
 
-		.page .xsmall { width: 20px !important; text-align: center; }
+		.page .xsmall { width: 25px !important; text-align: center; }
 
 	.page .enabler {
 		display: block;
@@ -200,17 +218,23 @@
 
 	.page .option_list .enabler.disabled {
 		display: inline-block;
-		margin: 3px 3px 3px 20px;
-		padding: 4px 0;
-		width: 173px;
+		padding: 4px 0 5px;
+		width: 24%;
 		vertical-align: top;
 	}
+		.page .option_list .enabler:not(.disabled) .icon {
+			display: none;
+		}
 
 		.page .option_list .enabler.disabled h2 {
+			cursor: pointer;
 			border: none;
 			box-shadow: none;
-			padding: 0 10px 0 25px;
+			padding: 0 10px 0 0;
 			font-size: 16px;
+			position: relative;
+			left: 25px;
+			margin-right: 25px;
 		}
 
 			.page .option_list .enabler:not(.disabled) h2 {