Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New styling #425

Merged
merged 4 commits into from May 7, 2022
Merged

New styling #425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
319c5ca
new styling
nhoening Apr 27, 2022
5f6c626
add changelog entry
nhoening May 1, 2022
59b83aa
define colors as vars; style login user(s) and new asset pages
nhoening May 2, 2022
23bf091
bring order to flexmeaures.css
nhoening May 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
496 changes: 397 additions & 99 deletions flexmeasures/ui/static/css/flexmeasures.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion flexmeasures/ui/templates/admin/forgot_password.html
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@

<div class="container-fluid">
<div class="row">
<div class="col-sm-12">
<div class="forgot-pwd-form col-sm-12">
{% include "security/_messages.html" %}

<h1>{{ _('Send password reset instructions') }}</h1>
Expand Down
11 changes: 6 additions & 5 deletions flexmeasures/ui/templates/admin/logged_in_user.html
View file
Open in desktop
Expand Up @@ -7,29 +7,30 @@
{% block divs %}


<h2> Overview for logged-in user: {{ logged_in_user.username }} </h2>
<h2 class="user-overview"> Overview for logged-in user: {{ logged_in_user.username }} </h2>

<div class="container-fluid">
<div class="row">
<div class="col-sm-1">
<div class="user-action-button col-sm-1">
<form action="/logout" method="get">
<button class="btn btn-sm btn-responsive btn-info" type="submit">Log out</button>
</form>
</div>
<div class="col-sm-2">
<div class="user-action-button col-sm-2">
<form action="/users/reset_password_for/{{ logged_in_user.id }}" method="get">
<button class="btn btn-sm btn-responsive btn-info" type="submit">Send password reset instructions</button>
</form>
</div>
<div class="col-sm-9">
<div class="user-action-button col-sm-9">
{% if user_is_admin %}
<form action="/users" method="get">
<button class="btn btn-sm btn-responsive btn-info" type="submit">List active users</button>
</form>
{% endif %}
</div>
<div class="clearfix"></div>

<div class="row" style="margin-top: 4em;">
<div class="user-data-table row" style="margin-top: 4em;">
<div class="col-sm-12">
<table class="table">
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion flexmeasures/ui/templates/admin/login_user.html
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
<div class="col-sm-12">
{% include "security/_messages.html" %}
</div>
<div class="col-sm-4">
<div class="login-form col-sm-4">
<h1>{{ _('Login') }}</h1>
<form action="{{ url_for_security('login') }}" method="POST" name="login_user_form">
{{ login_user_form.hidden_tag() }}
Expand Down
2 changes: 1 addition & 1 deletion flexmeasures/ui/templates/admin/reset_password.html
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@

<div class="container-fluid">
<div class="row">
<div class="col-sm-12">
<div class="forgot-pwd-form col-sm-12">
{% include "security/_messages.html" %}

<h1>{{ _('Reset password') }}</h1>
Expand Down
2 changes: 1 addition & 1 deletion flexmeasures/ui/templates/crud/asset.html
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@
{{ asset_form.hidden_tag() }}
<fieldset>
<div class="row">
<div class="col-sm-4">
<div class="asset-form col-sm-4">

<h3>Edit asset {{ asset.name }}</h3>

Expand Down
2 changes: 1 addition & 1 deletion flexmeasures/ui/templates/crud/asset_new.html
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
<div class="col-sm-10">
</div>
</div>
<form class="form-horizontal" method="POST" action="/assets/create/">
<form class="new-asset-form form-horizontal" method="POST" action="/assets/create/">
{{ asset_form.csrf_token }}
{{ asset_form.hidden_tag() }}
<fieldset>
Expand Down
2 changes: 1 addition & 1 deletion flexmeasures/ui/templates/views/sensors.html
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
<div class="row"><div class="alert alert-info" id="tzwarn" style="display:none;"></div></div>
<div class="row"><div id="datepicker"></div></div>
<div class="row">
<div class="col-sm-12">
<div class="sensor-chart-main col-sm-12">
<div id="sensorchart" style="width: 100%;"></div>
</div>
</div>
Expand Down