Merge branch 'master' into desktop

CouchPotato · Aug 31, 2015 · 350999e · 350999e
2 parents 9b21ca9 + ef08e3f
commit 350999e
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 55 deletions.
diff --git a/couchpotato/core/media/movie/_base/static/movie.scss b/couchpotato/core/media/movie/_base/static/movie.scss
@@ -468,6 +468,7 @@ $mass_edit_height: 44px;
 			.title {
 				display: flex;
 				padding: 3px 0;
+				font-weight: 400;
 
 				span {
 					flex: 1 auto;
@@ -502,9 +503,9 @@ $mass_edit_height: 44px;
 		}
 
 		.actions {
-			background-image: linear-gradient(25deg, rgba(get-theme(primary),0) 0%, rgba(get-theme(primary),1) 80%);
+			background-image: linear-gradient(25deg, rgba(get-theme(primary),.3) 0%, rgba(get-theme(primary),1) 80%);
 			@include theme-dark {
-				background-image: linear-gradient(25deg, rgba(get-theme-dark(primary),0) 0%, rgba(get-theme-dark(primary),1) 80%);
+				background-image: linear-gradient(25deg, rgba(get-theme-dark(primary),.3) 0%, rgba(get-theme-dark(primary),1) 80%);
 			}
 
 			will-change: opacity, visibility;
@@ -536,13 +537,17 @@ $mass_edit_height: 44px;
 					display: block;
 					width: auto;
 					padding: $padding / 3;
-					@include theme(color, background);
+					color: #FFF;
 					border-radius: $border_radius - 1px;
 					font-weight: 400;
 
 					&:hover {
 						@include theme(background, background);
 						@include theme(color, primary);
+
+						@include theme-dark {
+							color: #FFF;
+						}
 					}
 				}
 			}
@@ -899,7 +904,7 @@ $mass_edit_height: 44px;
 				width: 200px;
 
 				.button {
-					background: #FFF;
+					@include theme(background, background);
 					flex: 1 auto;
 					display: block;
 					text-align: center;

diff --git a/couchpotato/core/media/movie/_base/static/wanted.js b/couchpotato/core/media/movie/_base/static/wanted.js
@@ -4,7 +4,7 @@ var MoviesWanted = new Class({
 
 	order: 10,
 	name: 'wanted',
-	title: 'Gimmy gimmy gimmy!',
+	title: 'Gimme gimme gimme!',
 	folder_browser: null,
 
 	indexAction: function(){

diff --git a/couchpotato/core/media/movie/providers/automation/trakt/__init__.py b/couchpotato/core/media/movie/providers/automation/trakt/__init__.py
@@ -28,7 +28,8 @@ def autoload():
                 {
                     'name': 'automation_oauth_refresh',
                     'label': 'Refresh Token',
-                    'description': 'Used to automatically refresh your oauth token every 3 months',
+                    'description': ('Used to automatically refresh your oauth token every 3 months',
+                                    'To get a refresh token, reconnect with trakt'),
                     'advanced': 1
                 },
             ],

diff --git a/couchpotato/static/scripts/combined.plugins.min.js b/couchpotato/static/scripts/combined.plugins.min.js
@@ -2219,7 +2219,7 @@ var MoviesWanted = new Class({
     Extends: PageBase,
     order: 10,
     name: "wanted",
-    title: "Gimmy gimmy gimmy!",
+    title: "Gimme gimme gimme!",
     folder_browser: null,
     indexAction: function() {
         var self = this;

diff --git a/couchpotato/static/style/_mixins.scss b/couchpotato/static/style/_mixins.scss
@@ -2,7 +2,7 @@ $menu_color: #111;
 
 $vars: 			'primary', 'background', 	'off', 					'text';
 $theme_light: 	#ac0000, 	#FFF, 			darken(#FFF, 8), 		#000;
-$theme_dark: 	#39c29f, 	#2d2d2d, 		lighten(#2d2d2d, 5), 	#FFF;
+$theme_dark: 	#0C9DF8, 	#2d2d2d, 		lighten(#2d2d2d, 5), 	#FFF;
 
 //$primary_color: nth($theme_light, 1);
 //$theme_off: nth($theme_light, 2);