Skip to content

N
nexpie-grafana-theme
Commit 36e8af05 by Torkel Ödegaard
Options

ux(more style updates)

parent 2bfded3c
Showing with 22 additions and 15 deletions
public/app/features/profile/partials/password.html
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
<div class="page-container"> <div class="page-container">
<div class="page"> <div class="page">
<h2>Change password</h2> <h1>Change password</h1>
<form name="userForm"> <form name="userForm">
<div> <div>
<div class="tight-form"> <div class="tight-form">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px"> <li class="tight-form-item" style="width: 100px">
<strong>Old Password</strong> Old Password
</li> </li>
<li> <li>
<input type="password" required ng-model="command.oldPassword" class="input-xxlarge tight-form-input last" > <input type="password" required ng-model="command.oldPassword" class="input-xxlarge tight-form-input last" >
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="tight-form" style="margin-top: 5px"> <div class="tight-form">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px"> <li class="tight-form-item" style="width: 100px">
<strong>New Password</strong> New Password
</li> </li>
<li> <li>
<input type="password" required ng-model="command.newPassword" ng-minlength="4" class="input-xxlarge tight-form-input last" > <input type="password" required ng-model="command.newPassword" ng-minlength="4" class="input-xxlarge tight-form-input last" >
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="tight-form" style="margin-top: 5px"> <div class="tight-form">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px"> <li class="tight-form-item" style="width: 100px">
<strong>Confirm New</strong> Confirm New
</li> </li>
<li> <li>
<input type="password" required ng-model="command.confirmNew" ng-minlength="4" class="input-xxlarge tight-form-input last" > <input type="password" required ng-model="command.confirmNew" ng-minlength="4" class="input-xxlarge tight-form-input last" >
......
public/app/features/profile/partials/profile.html
<topnav title="{{contextSrv.user.name}}" section="Profile" icon="fa fa-fw fa-user" subnav="true"> <topnav title="Account" title-url="profile" icon="fa fa-fw fa-user">
<ul class="nav">
<li class="active"><a href="profile">Overview</a></li>
<li><a href="profile/password">Change password</a></li>
</ul>
</topnav> </topnav>
<div class="page-container" style="background: transparent; border: 0;"> <div class="page-container" style="background: transparent; border: 0;">
<div class="page-wide"> <div class="page-wide">
<h2>Profile</h2> <h1>Account & Preferences</h1>
<section class="simple-box">
<h3 class="simple-box-header">Preferences</h3>
</section>
<form name="userForm"> <form name="userForm">
<div class="tight-form"> <div class="tight-form">
<ul class="tight-form-list"> <ul class="tight-form-list">
...@@ -58,10 +57,18 @@ ...@@ -58,10 +57,18 @@
</div> </div>
<br> <br>
<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button> <button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button>
<div class="clearfix"></div>
</form> </form>
<h3>Organizations</h3> <section class="simple-box">
<a class="btn btn-inverse btn-small pull-right" href="profile/password" style="margin: 7px 10px 0 0">Change Password</a>
<h3 class="simple-box-header">
Password
</h3>
</section>
<section class="simple-box">
<h3 class="simple-box-header">Organizations</h3>
<table class="filter-table form-inline"> <table class="filter-table form-inline">
<thead> <thead>
<tr> <tr>
...@@ -85,7 +92,7 @@ ...@@ -85,7 +92,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </section>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment