瀏覽代碼

ux: color tweaks

Torkel Ödegaard 8 年之前
父節點
當前提交
9b7d346d3f

+ 1 - 1
public/app/features/plugins/partials/ds_list.html

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

+ 2 - 2
public/app/partials/confirm_modal.html

@@ -27,9 +27,9 @@
 		</div>
 		</div>
 
 
 		<div class="confirm-modal-buttons">
 		<div class="confirm-modal-buttons">
-			<button type="button" class="btn btn-inverse" ng-click="dismiss()">{{noText}}</button>
-			<button type="button" class="btn btn-danger" ng-click="onConfirm();dismiss();" ng-disabled="!confirmTextValid" give-focus="true">{{yesText}}</button>
 			<button ng-show="onAltAction" type="button" class="btn btn-success" ng-click="dismiss();onAltAction();">{{altActionText}}</button>
 			<button ng-show="onAltAction" type="button" class="btn btn-success" ng-click="dismiss();onAltAction();">{{altActionText}}</button>
+			<button type="button" class="btn btn-danger" ng-click="onConfirm();dismiss();" ng-disabled="!confirmTextValid" give-focus="true">{{yesText}}</button>
+			<button type="button" class="btn btn-inverse" ng-click="dismiss()">{{noText}}</button>
 		</div>
 		</div>
 	</div>
 	</div>
 
 

+ 4 - 4
public/sass/_variables.dark.scss

@@ -27,8 +27,8 @@ $white:            #fff;
 // -------------------------
 // -------------------------
 $blue:                  #33B5E5;
 $blue:                  #33B5E5;
 $blue-dark:             #005f81;
 $blue-dark:             #005f81;
-$green:                 #3aa655;
-$red:                   #d44939;
+$green:                 #299c46;
+$red:                   #d44a3a;
 $yellow:                #ECBB13;
 $yellow:                #ECBB13;
 $pink:                  #FF4444;
 $pink:                  #FF4444;
 $purple:                #9933CC;
 $purple:                #9933CC;
@@ -140,13 +140,13 @@ $btn-secondary-bg:            $blue-dark;
 $btn-secondary-bg-hl:     		lighten($blue-dark, 5%);
 $btn-secondary-bg-hl:     		lighten($blue-dark, 5%);
 
 
 $btn-success-bg:              $green;
 $btn-success-bg:              $green;
-$btn-success-bg-hl:     	    darken($green, 3%);
+$btn-success-bg-hl:     	    darken($green, 6%);
 
 
 $btn-warning-bg:              $brand-warning;
 $btn-warning-bg:              $brand-warning;
 $btn-warning-bg-hl:     	    lighten($brand-warning, 8%);
 $btn-warning-bg-hl:     	    lighten($brand-warning, 8%);
 
 
 $btn-danger-bg:               $red;
 $btn-danger-bg:               $red;
-$btn-danger-bg-hl:            lighten($red, 5%);
+$btn-danger-bg-hl:            darken($red, 8%);
 
 
 $btn-inverse-bg:              $dark-3;
 $btn-inverse-bg:              $dark-3;
 $btn-inverse-bg-hl:     	    lighten($dark-3, 4%);
 $btn-inverse-bg-hl:     	    lighten($dark-3, 4%);