ux: changed cta button style

pkg/api/index.go

@@ -265,8 +265,8 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 				Icon: "fa fa-fw fa-shield",
 				Url:  setting.AppSubUrl + "/admin",
 				Children: []*dtos.NavLink{
-					{Text: "Global Users", Id: "global-users", Url: setting.AppSubUrl + "/admin/users"},
-					{Text: "Global Orgs", Id: "global-orgs", Url: setting.AppSubUrl + "/admin/orgs"},
+					{Text: "Users", Id: "global-users", Url: setting.AppSubUrl + "/admin/users"},
+					{Text: "Orgs", Id: "global-orgs", Url: setting.AppSubUrl + "/admin/orgs"},
 					{Text: "Server Settings", Id: "server-settings", Url: setting.AppSubUrl + "/admin/settings"},
 					{Text: "Server Stats", Id: "server-stats", Url: setting.AppSubUrl + "/admin/stats"},
 					{Text: "Style Guide", Id: "styleguide", Url: setting.AppSubUrl + "/admin/styleguide"},

public/app/features/alerting/partials/notifications_list.html

@@ -4,7 +4,7 @@
 	<div class="page-header">
     <page-h1 model="ctrl.navModel"></page-h1>
 
-    <a href="alerting/notification/new" class="btn btn-success pull-right">
+    <a href="alerting/notification/new" class="btn btn-primary pull-right">
       <i class="fa fa-plus"></i>
       New Channel
     </a>

public/app/features/org/org_users_ctrl.ts

@@ -44,11 +44,9 @@ export class OrgUsersCtrl {
   getAddUserBtnName(): string {
     if (this.externalUserMngLinkName) {
       return this.externalUserMngLinkName;
-    } else if (config.disableLoginForm) {
-      return "Add Users";
-    } else {
-      return "Add";
     }
+
+    return "Add Members";
   }
 
   get() {

public/app/features/org/partials/orgDetails.html

@@ -12,55 +12,15 @@
 				<span class="gf-form-label">Organization name</span>
 				<input class="gf-form-input" type="text" required ng-model="org.name">
 			</div>
-			<div class="gf-form">
-				<button type="submit" class="btn gf-form-btn btn-success" ng-click="update()">Update</button>
-			</div>
 		</div>
+
+    <div class="gf-form-button-row">
+      <button type="submit" class="btn btn-success" ng-click="update()">Save</button>
+    </div>
 	</form>
 
 	<prefs-control mode="org"></prefs-control>
 
-	<h3 class="page-heading">Address</h3>
-
-	<form name="addressForm" class="gf-form-group">
-		<div class="gf-form-inline">
-			<div class="gf-form max-width-28">
-				<span class="gf-form-label width-7">Address1</span>
-				<input class="gf-form-input" type="text" ng-model="address.address1">
-			</div>
-			<div class="gf-form max-width-28">
-				<span class="gf-form-label width-7">Address2</span>
-				<input class="gf-form-input" type="text" ng-model="address.address2">
-			</div>
-		</div>
-
-		<div class="gf-form-inline">
-			<div class="gf-form max-width-28">
-				<span class="gf-form-label width-7">City</span>
-				<input class="gf-form-input" type="text" ng-model="address.city">
-			</div>
-			<div class="gf-form max-width-28">
-				<span class="gf-form-label width-7">Postal code</span>
-				<input class="gf-form-input" type="text" ng-model="address.zipCode">
-			</div>
-		</div>
-
-		<div class="gf-form-inline">
-			<div class="gf-form max-width-28">
-				<span class="gf-form-label width-7">State</span>
-				<input class="gf-form-input" type="text" ng-model="address.state">
-			</div>
-			<div class="gf-form max-width-28">
-				<span class="gf-form-label width-7">Country</span>
-				<input class="gf-form-input" type="text" ng-model="address.country">
-			</div>
-		</div>
-
-		<div class="gf-form-button-row">
-			<button type="submit" class="btn btn-success" ng-click="updateAddress()">Update</button>
-		</div>
-	</form>
-
 </div>
 
 

public/app/features/org/partials/orgUsers.html

@@ -4,7 +4,7 @@
 	<div class="page-header">
 		<page-h1 model="ctrl.navModel"></page-h1>
 
-		<button class="btn btn-success" ng-click="ctrl.openAddUsersView()" ng-hide="ctrl.externalUserMngLinkUrl">
+		<button class="btn btn-primary" ng-click="ctrl.openAddUsersView()" ng-hide="ctrl.externalUserMngLinkUrl">
 			<i class="fa fa-plus"></i>
 			<span>{{ctrl.addUsersBtnName}}</span>
 		</button>
@@ -22,9 +22,9 @@
 						Users ({{ctrl.users.length}})
 					</a>
 				</li>
-				<li class="gf-tabs-item" ng-show="ctrl.pendingInvites.length">
+				<li class="gf-tabs-item">
 					<a class="gf-tabs-link" ng-click="ctrl.editor.index = 1" ng-class="{active: ctrl.editor.index === 1}">
-						Pending Invitations ({{ctrl.pendingInvites.length}})
+						Pending Invites ({{ctrl.pendingInvites.length}})
 					</a>
 				</li>
 			</ul>

public/app/features/org/partials/profile.html

@@ -23,7 +23,7 @@
       <i ng-if="ctrl.readonlyLoginFields" class="fa fa-lock gf-form-icon--right-absolute" bs-tooltip="'Login Details Locked - managed in another system.'"></i>
     </div>
 		<div class="gf-form-button-row">
-			<button type="submit" class="btn btn-success" ng-click="ctrl.update()">Update</button>
+			<button type="submit" class="btn btn-success" ng-click="ctrl.update()">Save</button>
 		</div>
 	</form>
 

public/app/features/org/prefs_control.ts

@@ -74,7 +74,7 @@ var template = `
   </div>
 
   <div class="gf-form-button-row">
-    <button type="submit" class="btn btn-success" ng-click="ctrl.updatePrefs()">Update</button>
+    <button type="submit" class="btn btn-success" ng-click="ctrl.updatePrefs()">Save</button>
   </div>
 </form>
 `;

public/app/features/plugins/partials/ds_edit.html

@@ -66,8 +66,7 @@
 					</div>
 
 					<div class="gf-form-button-row">
-						<button type="submit" class="btn btn-success" ng-show="ctrl.isNew" ng-click="ctrl.saveChanges()">Add</button>
-						<button type="submit" class="btn btn-success" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges()">Save &amp; Test</button>
+						<button type="submit" class="btn btn-success" ng-show="!ctrl.isNew" ng-click="ctrl.saveChanges()">Save</button>
 						<button type="submit" class="btn btn-danger" ng-show="!ctrl.isNew" ng-click="ctrl.delete()">
 							Delete
 						</button>

public/app/features/plugins/partials/ds_list.html

@@ -5,7 +5,7 @@
       <div class="page-header">
         <page-h1 model="ctrl.navModel"></page-h1>
 
-        <a class="page-header__cta btn btn-success" href="datasources/new">
+        <a class="page-header__cta btn btn-primary" href="datasources/new">
           <i class="fa fa-plus"></i>
           Add data source
         </a>

public/sass/_variables.dark.scss

@@ -133,8 +133,8 @@ $table-border:                $dark-3; // table and cell border
 // Buttons
 // -------------------------
 
-$btn-primary-bg:              $brand-primary;
-$btn-primary-bg-hl:           lighten($brand-primary, 8%);
+$btn-primary-bg:              #ff6600;
+$btn-primary-bg-hl:           #bc3e06;
 
 $btn-secondary-bg:            $blue-dark;
 $btn-secondary-bg-hl:     		lighten($blue-dark, 5%);

public/sass/_variables.scss

@@ -208,7 +208,7 @@ $zindex-modal:             1050;
 $btn-padding-x:                  1rem !default;
 $btn-padding-y:                  .6rem !default;
 $btn-line-height:                1.25 !default;
-$btn-font-weight:                normal !default;
+$btn-font-weight:                500 !default;
 
 $btn-padding-x-sm:               .5rem !default;
 $btn-padding-y-sm:               .25rem !default;
@@ -216,7 +216,7 @@ $btn-padding-y-sm:               .25rem !default;
 $btn-padding-x-lg:               1.5rem !default;
 $btn-padding-y-lg:               .75rem !default;
 
-$btn-border-radius:              2px;
+$btn-border-radius:              3px;
 
 // sidemenu
 $side-menu-width:  60px;

public/sass/components/_buttons.scss

@@ -14,7 +14,7 @@
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-  border: $input-btn-border-width solid transparent;
+  border: none;
 
   @include button-size($btn-padding-y, $btn-padding-x, $font-size-base, $btn-border-radius);
 

public/sass/components/_gf-form.scss

@@ -239,8 +239,6 @@ $gf-form-margin: 1px;
   line-height: $input-line-height;
   font-size: $font-size-sm;
   box-shadow: none;
-  border: $input-btn-border-width solid transparent;
-  @include border-radius($label-border-radius-sm);
 
   flex-shrink: 0;
   flex-grow: 0;

public/sass/layout/_page.scss

@@ -74,9 +74,17 @@
   a, button {
     float: right;
     margin-left: $spacer;
+
+    // better align icons
+    .fa {
+      position: relative;
+      top: 1px;
+    }
   }
 }
 
+
+
 .page-heading {
   font-size: 1.25rem;
   margin-top: 0;

public/sass/mixins/_buttons.scss

@@ -1,7 +1,7 @@
 
 // Button backgrounds
 // ------------------
-@mixin buttonBackground($startColor, $endColor, $text-color: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
+@mixin buttonBackground($startColor, $endColor, $text-color: #fff, $textShadow: 0px 1px 0 rgba(0,0,0,.5)) {
   // gradientBar will set the background to a pleasing blend of these, to support IE<=9
   @include gradientBar($startColor, $endColor, $text-color, $textShadow);