public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

button size tweaks, user form tweaks

Browse Source
This commit is contained in:
Trent White
2016-02-11 14:41:21 -05:00
parent 6189208fa5
commit d8b43a3d76
5 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/org/partials/invite.html
+14 -14
View File
@@ -4,9 +4,9 @@
<i class="fa fa-remove"></i>
</a>
<h3>
<h1>
Invite Users
</h3>
</h1>
<div class="modal-tagline">
Send invite or add existing Grafana users to the organization
@@ -18,30 +18,30 @@
<form name="inviteForm">
<div style="display: inline-block">
<div class="tight-form-container">
<div class="tight-form" ng-repeat="invite in invites">
<ul class="tight-form-list">
<li class="tight-form-item">
<div class="norm-form-container">
<div class="norm-form" ng-repeat="invite in invites">
<ul class="norm-form-list">
<li class="norm-form-item">
Email or Username
</li>
<li>
<input type="text" ng-model="invite.loginOrEmail" required class="input-large tight-form-input" placeholder="email@test.com">
<input type="text" ng-model="invite.loginOrEmail" required class="input-large norm-form-input" placeholder="email@test.com">
</li>
<li class="tight-form-item">
<li class="norm-form-item">
Name
</li>
<li>
<input type="text" ng-model="invite.name" class="input-large tight-form-input" placeholder="name (optional)">
<input type="text" ng-model="invite.name" class="input-large norm-form-input" placeholder="name (optional)">
</li>
<li class="tight-form-item">
<li class="norm-form-item">
Role
</li>
<li>
<select ng-model="invite.role" class="input-small tight-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']">
<select ng-model="invite.role" class="input-small norm-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']">
</select>
</li>
<li class="tight-form-item last" ng-show="$index > 0">
<li class="norm-form-item last" ng-show="$index > 0">
<a class="pointer" tabindex="1" ng-click="removeInvite(invite)">
<i class="fa fa-remove"></i>
</a>
@@ -51,8 +51,8 @@
</div>
</div>
<div style="text-align: left; margin-top: 6px;">
<a ng-click="addInvite()">+ Invite another</a>
<div style="margin-top: 20px;">
<a class="btn btn-inverse" ng-click="addInvite()">+ Invite another</a>
<div class="form-inline" style="margin-top: 20px">
<editor-checkbox text="Skip sending invite email" model="options.skipEmails" change="targetBlur()"></editor-checkbox>
</div>
public/app/features/org/partials/orgApiKeys.html
+10 -10
View File
@@ -10,25 +10,25 @@
API Keys
</h1>
<form name="addTokenrForm" class="form-inline tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
<form name="addTokenrForm" class="form-inline norm-form last">
<ul class="norm-form-list">
<li class="norm-form-item" style="width: 100px">
Add a key
</li>
<li>
<input type="text" class="input-xlarge tight-form-input" ng-model='token.name' placeholder="Name"></input>
<input type="text" class="input-xlarge norm-form-input" ng-model='token.name' placeholder="Name"></input>
</li>
<li class="tight-form-item">
<li class="norm-form-item">
Role
</li>
<li>
<select class="input-small tight-form-input" ng-model="token.role" ng-options="r for r in roleTypes"></select>
</li>
<li style="float: right">
<button class="btn btn-success tight-form-btn" ng-click="addToken()">Add</button>
<select class="input-small norm-form-input" ng-model="token.role" ng-options="r for r in roleTypes"></select>
</li>
</ul>
<button class="btn btn-success" style="margin-left:15px; vertical-algin:middle;" ng-click="addToken()">Add</button>
<div class="clearfix"></div>
</ul>
</form>
<table class="filter-table">
public/less/bootswatch.dark.less
+1 -1
View File
@@ -355,7 +355,7 @@ div.subnav {
// BUTTONS
// -----------------------------------------------------
.btn {
padding: 6px 12px;
padding: 8px 12px;
margin-right:10px;
background-image: none;
// .box-shadow(0px 0px 8px @bodyBackground);
public/less/normform.less
+2 -2
View File
@@ -1,7 +1,7 @@
.norm-form {
border-top: 3px solid @pageBackground;
border-left: 3px solid @pageBackground;
border-right: 3px solid @pageBackground;
// border-left: 3px solid @pageBackground;
// border-right: 3px solid @pageBackground;
background: transparent;
&.last {
public/vendor/bootstrap/less/buttons.less
Vendored
+2 -1
View File
@@ -229,5 +229,6 @@ input[type="submit"].btn {
.btn-text {
color: @btnText;
margin: 0 10px;
margin: 0;
vertical-align: middle;
}