forked from getredash/redash
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
redesign of all pages that are rendered by backend code
- Loading branch information
1 parent
d6cc748
commit f1aad25
Showing
11 changed files
with
281 additions
and
200 deletions.
There are no files selected for viewing
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /** LESS Plugins **/ | ||
| @import 'inc/less-plugins/for'; | ||
|
|
||
| /** Load Main Bootstrap LESS files **/ | ||
| @import '~bootstrap/less/bootstrap'; | ||
| @import '~material-design-iconic-font/dist/css/material-design-iconic-font.css'; | ||
|
|
||
| @import 'inc/variables'; | ||
| @import 'inc/mixins'; | ||
| @import 'inc/font'; | ||
| @import 'inc/print'; | ||
|
|
||
| @import 'inc/bootstrap-overrides'; | ||
| @import 'inc/base'; | ||
| @import 'inc/generics'; | ||
| @import 'inc/form'; | ||
| @import 'inc/button'; | ||
| @import 'inc/404'; | ||
| @import 'inc/ie-warning'; | ||
| @import 'inc/flex'; | ||
|
|
||
| @import 'redash/redash-newstyle'; | ||
|
|
||
| @default-spacing: 26px; | ||
|
|
||
| html, body { | ||
| height: 100%; | ||
| margin: 0; | ||
| padding: 0; | ||
| background: #F6F8F9; | ||
| } | ||
|
|
||
| .m-t-default { | ||
| margin-top: @default-spacing !important; | ||
| } | ||
| .m-b-default { | ||
| margin-bottom: @default-spacing !important; | ||
| } | ||
| .m-l-default { | ||
| margin-left: @default-spacing !important; | ||
| } | ||
| .m-r-default { | ||
| margin-right: @default-spacing !important; | ||
| } | ||
|
|
||
| hr { | ||
| border-top-width: 2px; | ||
| margin: @default-spacing 0; | ||
| } | ||
|
|
||
| .tiled { | ||
| padding: @default-spacing; | ||
| } | ||
|
|
||
| .header { | ||
| margin-top: -100px; | ||
|
|
||
| img { | ||
| height: 40px; | ||
| } | ||
| } | ||
|
|
||
| .fixed-width-page { | ||
| width: 500px; | ||
| } | ||
|
|
||
| .login-button { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| margin: 20px 0; | ||
|
|
||
| &:first-of-type { | ||
| margin-top: 0; | ||
| } | ||
| &:last-of-type { | ||
| margin-bottom: 0; | ||
| } | ||
|
|
||
| img { | ||
| height: 25px; | ||
| margin-right: 5px; | ||
| } | ||
|
|
||
| &:before { | ||
| content: ""; | ||
| display: inline-block; | ||
| height: 25px; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,16 @@ | ||
| {% extends "layouts/signed_out.html" %} | ||
|
|
||
| {% block title %}Error :-({% endblock %} | ||
|
|
||
| {% block content %} | ||
| <h2>Error :-(</h2> | ||
| <p class="lead"> | ||
| {{ error_message }} | ||
| </p> | ||
| <div class="fixed-width-page"> | ||
| <div class="bg-white tiled error-state m-t-0"> | ||
| <div class="error-state__icon"> | ||
| <i class="zmdi zmdi-alert-circle-o"></i> | ||
| </div> | ||
| <div class="error-state__details"> | ||
| <h4>{{ error_message }}</h4> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| {% extends "layouts/signed_out.html" %} | ||
| {% block title %}Password Reset{% endblock %} | ||
| {% block content %} | ||
| {% if submitted %} | ||
| <h2>Password Reset</h2> | ||
| <hr> | ||
| <p class="lead"> | ||
| If we found an account associated with that email address, you will find an email from us in your inbox shortly. | ||
| </p> | ||
| {% else %} | ||
| <h2>Password Reset</h2> | ||
| <hr> | ||
| <form role="form" method="post"> | ||
| <div class="form-group "> | ||
| <label for="email">Enter the email address you used for this account:</label> | ||
| <input type="email" class="form-control" name="email" value="{{email}}"> | ||
| </div> | ||
| <button type="submit" class="btn btn-primary">Reset my password</button> | ||
| </form> | ||
| {% endif %} | ||
| <div class="fixed-width-page"> | ||
| <div class="bg-white tiled"> | ||
| {% if submitted %} | ||
| <div> | ||
| If we found an account associated with that email address, you will find an email from us in your inbox shortly. | ||
| </div> | ||
| {% else %} | ||
| <form role="form" method="post"> | ||
| <div class="form-group"> | ||
| <label for="email">Enter the email address you used for this account:</label> | ||
| <input type="email" class="form-control" name="email" value="{{email}}"> | ||
| </div> | ||
| <button type="submit" class="btn btn-primary btn-block m-t-default">Reset my password</button> | ||
| </form> | ||
| {% endif %} | ||
| </div> | ||
| </div> | ||
| {% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,39 @@ | ||
| {% extends "layouts/signed_out.html" %} | ||
|
|
||
| {% block title %}Welcome to Redash!{% endblock %} | ||
|
|
||
| {% block content %} | ||
| <div class="fixed-width-page"> | ||
| <div class="bg-white tiled"> | ||
| <div class="m-b-default"> | ||
| {% if google_auth_url %} | ||
| To create your account, please choose a password or login with your Google account ({{ user.email }}). | ||
| {% else %} | ||
| To create your account, please choose a password. | ||
| {% endif %} | ||
| </div> | ||
| {% with messages = get_flashed_messages() %} | ||
| {% if messages %} | ||
| {% for message in messages %} | ||
| <div class="alert alert-danger" role="alert">{{ message }}</div> | ||
| {% endfor %} | ||
| {% endif %} | ||
| {% endwith %} | ||
|
|
||
| <h2>Welcome to Redash!</h2> | ||
| <p class="lead"> | ||
| {% if google_auth_url %} | ||
| To create your account, please choose a password or login with your Google account ({{ user.email }}). | ||
| {% else %} | ||
| To create your account, please choose a password. | ||
| <a href="{{ google_auth_url }}" class="login-button btn btn-default btn-block"> | ||
| <img src="/static/images/google_logo.svg"> | ||
| Login with Google | ||
| </a> | ||
| <hr> | ||
| {% endif %} | ||
| </p> | ||
| {% with messages = get_flashed_messages() %} | ||
| {% if messages %} | ||
| {% for message in messages %} | ||
| <div class="alert alert-danger" role="alert">{{ message }}</div> | ||
| {% endfor %} | ||
| {% endif %} | ||
| {% endwith %} | ||
| {% if google_auth_url %} | ||
| <div class="row"> | ||
| <a href="{{ google_auth_url }}"><img src="/static/images/google_login.png" class="login-button"/></a> | ||
| </div> | ||
| <div class="login-or"> | ||
| <hr class="hr-or"> | ||
| <span class="span-or">or</span> | ||
| </div> | ||
| {% endif %} | ||
| <form role="form" method="post" name="invite"> | ||
| <div class="form-group"> | ||
| <form role="form" method="post" name="invite"> | ||
| <div class="form-group"> | ||
| <label for="password">Password</label> | ||
| <input type="password" class="form-control" id="password" name="password"> | ||
| </div> | ||
| <button type="submit" class="btn btn btn-primary">Set Password</button> | ||
| </form> | ||
| </div> | ||
| <button type="submit" class="btn btn-primary btn-block m-t-default">Set Password</button> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| {% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.