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

badge nav table

This commit is contained in:
lvuch 2017-04-26 16:37:58 -07:00
parent 31a4dc38cf
commit a91f7dda06
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin-tab/machine/template.hbs
View File

@ -27,7 +27,7 @@
{{#if driver.state}} {{#if driver.state}}
{{badge-state model=driver class="pull-left"}} {{badge-state model=driver class="pull-left"}}
{{else}} {{else}}
<span class="state badge text-danger bg-error pull-left"> <span class="state badge-state text-danger bg-error pull-left">
<i class="icon icon-circle"></i> {{t 'machinePage.inactive'}} <i class="icon icon-circle"></i> {{t 'machinePage.inactive'}}
</span> </span>
{{/if}} {{/if}}

1
app/styles/components/_nav.scss
View File

@ -25,6 +25,7 @@ nav {
> a { > a {
color: $info; color: $info;
border-bottom: solid $nav-spacing mix($user-btn, black, 50%); border-bottom: solid $nav-spacing mix($user-btn, black, 50%);
text-decoration: none;
} }
} }

11
app/styles/components/_tables.scss
View File

@ -15,6 +15,8 @@ $group-row-height: 40px;
//table mixins //table mixins
@mixin bordered { @mixin bordered {
border-bottom: $table-border-color solid 2px; border-bottom: $table-border-color solid 2px;
border-collapse: collapse;
> TBODY { > TBODY {
&:not(:last-of-type):after { &:not(:last-of-type):after {
@ -90,6 +92,7 @@ TABLE {
> TBODY > TR > TD { > TBODY > TR > TD {
padding: 0; padding: 0;
height: 50px; height: 50px;
transition: ease-in-out all 200ms;
} }
&.no-lines { &.no-lines {
* { * {
@ -136,13 +139,15 @@ TABLE {
margin: 0 3px; margin: 0 3px;
} }
&.has-sub-rows { &.has-sub-rows {
tr.row-selected TABLE > TBODY > TR > TD {
background: $body-bg;
}
TABLE { TABLE {
> TBODY { > TBODY {
@include striped; @include striped;
> .row-selected {
background-color: $table-bg-selected;
}
TR:last-child{ TR:last-child{
background: transparent; background: transparent;
&:after { &:after {