From 9fb5931fe6529f8858a8a6e7be18daea58ce1620 Mon Sep 17 00:00:00 2001 From: Joseph Cohen Date: Sun, 28 Dec 2014 19:45:43 -0600 Subject: [PATCH 1/5] Redesign login page --- app/assets/sass/main.scss | 6 ++++ app/assets/sass/modules/_forms.scss | 15 ++++++++++ app/assets/sass/pages/_login.scss | 14 +++++++++ app/assets/sass/partials/_base.scss | 1 - app/lang/en/cachet.php | 15 +++++----- app/views/auth/login.blade.php | 14 +++++---- app/views/layout/_head.blade.php | 13 +++++++++ app/views/layout/clean.blade.php | 12 ++++++++ app/views/layout/dashboard.blade.php | 13 +-------- .../{all-50d597de.css => all-5187e091.css} | 27 +++++++++++++++++- public/build/css/all.css | 27 +++++++++++++++++- .../js/{all-d8f5640f.js => all-5a1e1732.js} | 8 +++--- public/build/js/all.js | 8 +++--- public/build/rev-manifest.json | 4 +-- public/img/cachet-icon.png | Bin 0 -> 14725 bytes public/img/cachet-logo.png | Bin 0 -> 9583 bytes public/img/cachet-logo.svg | 16 +++++++++++ 17 files changed, 155 insertions(+), 38 deletions(-) create mode 100644 app/assets/sass/modules/_forms.scss create mode 100644 app/assets/sass/pages/_login.scss create mode 100644 app/views/layout/_head.blade.php create mode 100644 app/views/layout/clean.blade.php rename public/build/css/{all-50d597de.css => all-5187e091.css} (99%) rename public/build/js/{all-d8f5640f.js => all-5a1e1732.js} (61%) create mode 100644 public/img/cachet-icon.png create mode 100644 public/img/cachet-logo.png create mode 100644 public/img/cachet-logo.svg diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index cae804db..326d8854 100644 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -6,13 +6,19 @@ html, body { height: 100%; } +// Module overrides @import "modules/tabs"; +@import "modules/forms"; +// Styles for partials @import "partials/base"; @import "partials/wrapper"; @import "partials/navbar"; @import "partials/sidebar"; @import "partials/content"; +// Styles for specific page +@import "pages/login"; + // Status Page will need to override certain styles. @import "status-page"; diff --git a/app/assets/sass/modules/_forms.scss b/app/assets/sass/modules/_forms.scss new file mode 100644 index 00000000..643da5dd --- /dev/null +++ b/app/assets/sass/modules/_forms.scss @@ -0,0 +1,15 @@ +.form-control { + @include box-shadow(none); +} + +input.form-control { + padding: 2px 8px; + height: 40px; +} + +.form-control:focus { + padding: 2px 8px; + border: 1px solid #999; + outline: 0; + @include box-shadow(none); +} diff --git a/app/assets/sass/pages/_login.scss b/app/assets/sass/pages/_login.scss new file mode 100644 index 00000000..614e52cf --- /dev/null +++ b/app/assets/sass/pages/_login.scss @@ -0,0 +1,14 @@ +.login .logo { + display: block; + margin: 0 auto 30px; +} + +.login legend { + border: 0; + padding: 0; + width: 100%; + font-size: 24px; + font-weight: 500; + text-align: center; + margin: 0 0 30px 0; +} diff --git a/app/assets/sass/partials/_base.scss b/app/assets/sass/partials/_base.scss index 16d9e349..b9b88617 100644 --- a/app/assets/sass/partials/_base.scss +++ b/app/assets/sass/partials/_base.scss @@ -3,7 +3,6 @@ body.dashboard { font-weight: $base-font-weight; font-size: $base-font-size; letter-spacing: $base-letter-spacing; - background: $base-background-color; display: table; width: 100%; height: 100%; diff --git a/app/lang/en/cachet.php b/app/lang/en/cachet.php index dd24fbdf..866937a9 100644 --- a/app/lang/en/cachet.php +++ b/app/lang/en/cachet.php @@ -26,13 +26,14 @@ return [ 'bad' => 'Some systems are experiencing issues.', ], // Other - 'powered_by' => ':app Status Page is powered by Cachet.', - 'login' => 'Login', - 'logout' => 'Logout', - 'logged_in' => 'You\'re logged in.', - 'setup' => 'Setup Cachet', - 'no_incidents' => 'No incidents reported.', - 'dashboard' => [ + 'powered_by' => ':app Status Page is powered by Cachet.', + 'login_message' => 'Welcome Back!', + 'login' => 'Login', + 'logout' => 'Logout', + 'logged_in' => 'You\'re logged in.', + 'setup' => 'Setup Cachet', + 'no_incidents' => 'No incidents reported.', + 'dashboard' => [ 'dashboard' => 'Dashboard', 'components' => 'Components', 'component-add' => 'Add Component', diff --git a/app/views/auth/login.blade.php b/app/views/auth/login.blade.php index b1281106..3716b4d5 100644 --- a/app/views/auth/login.blade.php +++ b/app/views/auth/login.blade.php @@ -1,12 +1,14 @@ -@extends('layout.dashboard') +@extends('layout.clean') @section('content') - @include('partials.dashboard.nav') -
-
+