rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1156 from lvuch/lv-0426 

prefs
This commit is contained in:
Vincent Fiduccia 2017-04-28 21:01:18 -07:00 committed by GitHub
parent 9db31583ba bddc1cedf9
commit 5a5424f5e7
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/mark-favorite/template.hbs
View File

@ -1,3 +1,3 @@
<button class="mark-favorite btn bg-transparent" onclick={{perform markFavorite}}>
<i class="icon {{if markFavorite.isRunning 'icon-spin icon-spinner'}} {{if exists 'icon-star-fill exists' 'icon-star-line'}} {{iconSize}}"></i>
<i class="icon {{if exists 'icon-star-fill exists' 'icon-star-line'}} {{iconSize}}"></i>
</button>

4
app/components/settings/table-rows/template.hbs
View File

@ -1,9 +1,9 @@
<div class="row">
<div class="col span-6">
<h2 class="mt-0 mb-0">{{t 'tableCountSelect.header'}}</h2>
<h2 class="mt-0 mb-0 pt-20">{{t 'tableCountSelect.header'}}</h2>
</div>
{{new-select
classNames="col span-3 mt-0 form-control"
classNames="col span-3 mt-20 form-control"
optionValuePath="value"
optionLabelPath="value"
content=tableCounts

6
app/styles/components/_mark-favorite.scss
View File

@ -1,5 +1,11 @@
.mark-favorite {
transition: ease-in-out all 200ms;
.exists {
color: #F1C40F;
}
&:focus {
outline: none;
}
}

11
app/styles/themes/_light.scss
View File

@ -58,17 +58,6 @@ $border : $light-grey;
$shadow : rgba($mid-grey, 0.35);
// banners
$banner-default : lighten($light-grey, 3);
$banner-disabled : lighten($mid-grey, 35);
$banner-primary : lighten($primary, 63);
$banner-secondary : lighten($secondary, 65);
$banner-success : lighten($success, 50);
$banner-info : lighten($info, 30);
$banner-warning : lighten($warning, 45);
$banner-error : lighten($error, 30);
$banner-color : $secondary;
// Global color for active items (e.g., navs or dropdowns).
$component-active-color : white;