diff --git a/chrome/app.css b/chrome/app.css index cfc0331..fb76d27 100644 --- a/chrome/app.css +++ b/chrome/app.css @@ -193,10 +193,13 @@ div.big-icon > img { max-height: 500px; overflow: auto; background-color: white; + border: 1px solid #ccc; + border-top: none; } #textareaElement { - flex;flex-direction: column; + display: flex; + flex-direction: column; min-height: 250px; text-align: left; border: none; @@ -223,3 +226,7 @@ div.big-icon > img { padding: 0; float: right; } + +body.onboard { + background-color: #eeeeee; +} diff --git a/chrome/app.js b/chrome/app.js index ff48386..5ef1b84 100644 --- a/chrome/app.js +++ b/chrome/app.js @@ -66,7 +66,8 @@ e2email.application.routeProvider = function($routeProvider) { pageTitle: 'E2EMail - Setup', templateUrl: 'pages/setup/setup.html', controller: 'SetupCtrl', - controllerAs: 'setupCtrl' + controllerAs: 'setupCtrl', + bodyClass: 'onboard' }).when(e2email.constants.Location.SETTINGS, { pageTitle: 'E2EMail - Account', templateUrl: 'pages/settings/settings.html', @@ -76,22 +77,26 @@ e2email.application.routeProvider = function($routeProvider) { pageTitle: 'E2EMail - Welcome', templateUrl: 'pages/welcome/welcome.html', controller: 'WelcomeCtrl', - controllerAs: 'welcomeCtrl' + controllerAs: 'welcomeCtrl', + bodyClass: 'onboard' }).when(e2email.constants.Location.AUTHORIZATION, { pageTitle: 'E2EMail - Authorization', templateUrl: 'pages/authorization/authorization.html', controller: 'AuthorizationCtrl', - controllerAs: 'authorizationCtrl' + controllerAs: 'authorizationCtrl', + bodyClass: 'onboard' }).when(e2email.constants.Location.RESET, { pageTitle: 'E2EMail - Reset', templateUrl: 'pages/reset/reset.html', controller: 'ResetCtrl', - controllerAs: 'resetCtrl' + controllerAs: 'resetCtrl', + bodyClass: 'onboard' }).when(e2email.constants.Location.RECOVER, { pageTitle: 'E2EMail - Recover', templateUrl: 'pages/recover/recover.html', controller: 'RecoverCtrl', - controllerAs: 'recoverCtrl' + controllerAs: 'recoverCtrl', + bodyClass: 'onboard' }).when(e2email.constants.Location.SHOWSECRET, { pageTitle: 'E2EMail - Recovery code', templateUrl: 'pages/showsecret/showsecret.html', @@ -101,12 +106,14 @@ e2email.application.routeProvider = function($routeProvider) { pageTitle: 'E2EMail - Introduction', templateUrl: 'pages/introduction/introduction.html', controller: 'IntroductionCtrl', - controllerAs: 'introductionCtrl' + controllerAs: 'introductionCtrl', + bodyClass: 'onboard' }).when(e2email.constants.Location.GETSTARTED, { pageTitle: 'E2EMail - Get Started', templateUrl: 'pages/getstarted/getstarted.html', controller: 'GetStartedCtrl', - controllerAs: 'getStartedCtrl' + controllerAs: 'getStartedCtrl', + bodyClass: 'onboard' }).when(e2email.constants.Location.THREADS, { pageTitle: 'E2EMail', templateUrl: 'pages/threads/threads.html', @@ -187,5 +194,10 @@ e2email.application.module.run( if (goog.isDefAndNotNull($route.current.pageTitle)) { document.title = $route.current.pageTitle; } + if (goog.isDefAndNotNull($route.current.bodyClass)) { + $rootScope.bodyClass = $route.current.bodyClass; + } else { + $rootScope.bodyClass = ''; + } }); }]); diff --git a/chrome/assets/css/bootstrap.css b/chrome/assets/css/bootstrap.css index 408b36c..0d9de62 100644 --- a/chrome/assets/css/bootstrap.css +++ b/chrome/assets/css/bootstrap.css @@ -309,7 +309,7 @@ body { font-size: 14px; line-height: 1.428571429; color: #333333; - background-color: #EEEEEE; + background-color: #ffffff; } input, diff --git a/chrome/index.html b/chrome/index.html index 1fa5e6b..0f8985e 100644 --- a/chrome/index.html +++ b/chrome/index.html @@ -6,8 +6,8 @@ - -
+ +
diff --git a/chrome/pages/threads/threads.html b/chrome/pages/threads/threads.html index c48cd83..6fd154c 100644 --- a/chrome/pages/threads/threads.html +++ b/chrome/pages/threads/threads.html @@ -57,14 +57,16 @@
-
-
-
-
{{ x.filename | limitTo: 20 }}{{x.filename.length > 20 ? '...' : ''}} {{'(' + x.size + ')'}} -
-
+
+ +
+
{{ x.filename | limitTo: 20 }}{{x.filename.length > 20 ? '...' : ''}} {{'(' + x.size + ')'}} + +
+
+