lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Redesign login page

Browse Source
This commit is contained in:
Joseph Cohen
2014-12-28 19:45:43 -06:00
parent 032f6891e6
commit 9fb5931fe6
17 changed files with 155 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/sass/main.scss
+6
View File
@@ -6,13 +6,19 @@ html, body {
height: 100%; height: 100%;
} }
// Module overrides
@import "modules/tabs"; @import "modules/tabs";
@import "modules/forms";
// Styles for partials
@import "partials/base"; @import "partials/base";
@import "partials/wrapper"; @import "partials/wrapper";
@import "partials/navbar"; @import "partials/navbar";
@import "partials/sidebar"; @import "partials/sidebar";
@import "partials/content"; @import "partials/content";
// Styles for specific page
@import "pages/login";
// Status Page will need to override certain styles. // Status Page will need to override certain styles.
@import "status-page"; @import "status-page";
app/assets/sass/modules/_forms.scss
+15
View File
@@ -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);
}
app/assets/sass/pages/_login.scss
+14
View File
@@ -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;
}
app/assets/sass/partials/_base.scss
-1
View File
@@ -3,7 +3,6 @@ body.dashboard {
font-weight: $base-font-weight; font-weight: $base-font-weight;
font-size: $base-font-size; font-size: $base-font-size;
letter-spacing: $base-letter-spacing; letter-spacing: $base-letter-spacing;
background: $base-background-color;
display: table; display: table;
width: 100%; width: 100%;
height: 100%; height: 100%;
app/lang/en/cachet.php
+8 -7
View File
@@ -26,13 +26,14 @@ return [
'bad' => 'Some systems are experiencing issues.', 'bad' => 'Some systems are experiencing issues.',
], ],
// Other // Other
'powered_by' => ':app Status Page is powered by <a href="https://cachethq.github.io">Cachet</a>.', 'powered_by' => ':app Status Page is powered by <a href="https://cachethq.github.io">Cachet</a>.',
'login' => 'Login', 'login_message' => 'Welcome Back!',
'logout' => 'Logout', 'login' => 'Login',
'logged_in' => 'You\'re logged in.', 'logout' => 'Logout',
'setup' => 'Setup Cachet', 'logged_in' => 'You\'re logged in.',
'no_incidents' => 'No incidents reported.', 'setup' => 'Setup Cachet',
'dashboard' => [ 'no_incidents' => 'No incidents reported.',
'dashboard' => [
'dashboard' => 'Dashboard', 'dashboard' => 'Dashboard',
'components' => 'Components', 'components' => 'Components',
'component-add' => 'Add Component', 'component-add' => 'Add Component',
app/views/auth/login.blade.php
+8 -6
View File
@@ -1,12 +1,14 @@
@extends('layout.dashboard') @extends('layout.clean')
@section('content') @section('content')
@include('partials.dashboard.nav') <div class='login row'>
<div class='row'> <div class='col-xs-12 col-xs-offset-0 col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4 text-center'>
<div class='col-md-6 col-md-offset-3'> <div class="welcome-logo">
<img class="logo" height="50" src="{{ url('img/cachet-logo.svg') }}" alt="Cachet"/>
</div>
{{ Form::open() }} {{ Form::open() }}
<fieldset> <fieldset>
<legend>{{ Lang::get('cachet.login') }}</legend> <legend>{{ Lang::get('cachet.login_message') }}</legend>
@if(Session::has('error')) @if(Session::has('error'))
<span class='text-danger'>{{ Session::get('error') }}</span> <span class='text-danger'>{{ Session::get('error') }}</span>
@@ -26,7 +28,7 @@
</div> </div>
<hr /> <hr />
<div class='form-group'> <div class='form-group'>
<button type='submit' class='btn btn-default'>{{ Lang::get('cachet.login') }}</button> <button type='submit' class='btn btn-lg btn-block btn-success'>{{ Lang::get('cachet.login') }}</button>
</div> </div>
</fieldset> </fieldset>
{{ Form::close() }} {{ Form::close() }}
app/views/layout/_head.blade.php
+13
View File
@@ -0,0 +1,13 @@
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="http://james-brooks.uk">
<meta name="apple-mobile-web-app-capable" content="yes">
<title>{{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet</title>
<link href='//fonts.googleapis.com/css?family=Lato:300,400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="{{ elixir('css/all.css') }}">
<script src="{{ elixir('js/all.js') }}"></script>
</head>
app/views/layout/clean.blade.php
+12
View File
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
@include('layout._head')
<body class="dashboard">
<div class="wrapper">
<div class="content">
@yield('content')
</div>
</div>
</body>
</html>
app/views/layout/dashboard.blade.php
+1 -12
View File
@@ -1,17 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> @include('layout._head')
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="http://james-brooks.uk">
<meta name="apple-mobile-web-app-capable" content="yes">
<title>{{ isset($pageTitle) ? $pageTitle : Setting::get('app_name') }} | Cachet</title>
<link rel="stylesheet" href="{{ elixir('css/all.css') }}">
<script src="{{ elixir('js/all.js') }}"></script>
</head>
<body class="dashboard"> <body class="dashboard">
@include('partials.dashboard.nav') @include('partials.dashboard.nav')
public/build/css/all-50d597de.css → public/build/css/all-5187e091.css
+26 -1
View File
@@ -4254,12 +4254,24 @@ div[role=tabpanel] .tab-content {
div[role=tabpanel] .tab-content .tab-pane { div[role=tabpanel] .tab-content .tab-pane {
padding: 10px; } padding: 10px; }
.form-control {
box-shadow: none; }
input.form-control {
padding: 2px 8px;
height: 40px; }
.form-control:focus {
padding: 2px 8px;
border: 1px solid #999;
outline: 0;
box-shadow: none; }
body.dashboard { body.dashboard {
font-family: "Lato", "Helvetica Neue", "Helvetica", "Arial", sans-serif; font-family: "Lato", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-weight: 300; font-weight: 300;
font-size: 16px; font-size: 16px;
letter-spacing: 0.08em; letter-spacing: 0.08em;
background: #f1f1f1;
display: table; display: table;
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -4377,6 +4389,19 @@ body.dashboard .content {
body.dashboard .content h3 { body.dashboard .content h3 {
margin-top: 0; } margin-top: 0; }
.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; }
body.status-page { body.status-page {
font-family: 'Lato', 'Helevetic Neue', Arial, sans-serif; font-family: 'Lato', 'Helevetic Neue', Arial, sans-serif;
background-color: #F0F3F4; background-color: #F0F3F4;
public/build/css/all.css
+26 -1
View File
@@ -4254,12 +4254,24 @@ div[role=tabpanel] .tab-content {
div[role=tabpanel] .tab-content .tab-pane { div[role=tabpanel] .tab-content .tab-pane {
padding: 10px; } padding: 10px; }
.form-control {
box-shadow: none; }
input.form-control {
padding: 2px 8px;
height: 40px; }
.form-control:focus {
padding: 2px 8px;
border: 1px solid #999;
outline: 0;
box-shadow: none; }
body.dashboard { body.dashboard {
font-family: "Lato", "Helvetica Neue", "Helvetica", "Arial", sans-serif; font-family: "Lato", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-weight: 300; font-weight: 300;
font-size: 16px; font-size: 16px;
letter-spacing: 0.08em; letter-spacing: 0.08em;
background: #f1f1f1;
display: table; display: table;
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -4377,6 +4389,19 @@ body.dashboard .content {
body.dashboard .content h3 { body.dashboard .content h3 {
margin-top: 0; } margin-top: 0; }
.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; }
body.status-page { body.status-page {
font-family: 'Lato', 'Helevetic Neue', Arial, sans-serif; font-family: 'Lato', 'Helevetic Neue', Arial, sans-serif;
background-color: #F0F3F4; background-color: #F0F3F4;
public/build/js/all-d8f5640f.js → public/build/js/all-5a1e1732.js
+4 -4
View File
File diff suppressed because one or more lines are too long
public/build/js/all.js
+4 -4
View File
File diff suppressed because one or more lines are too long
public/build/rev-manifest.json
+2 -2
View File
@@ -1,4 +1,4 @@
{ {
"css/all.css": "css/all-50d597de.css", "css/all.css": "css/all-5187e091.css",
"js/all.js": "js/all-d8f5640f.js" "js/all.js": "js/all-5a1e1732.js"
} }
public/img/cachet-icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

public/img/cachet-logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

public/img/cachet-logo.svg
+16
View File
File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB