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

0718issues (#787) 

* rancher/rancher#5448

rancher/rancher#5447 access control

border on small modal

* fix on last commit

* rancher/rancher#5447
This commit is contained in:
lauren Vuchetich 2016-07-28 12:44:38 -07:00 committed by Vincent Fiduccia
parent 6c7d90c1ce
commit d7b127fa2d
6 changed files with 81 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/form-service-links/template.hbs
View File

@ -20,7 +20,7 @@
<th width="30">&nbsp;</th> <th width="30">&nbsp;</th>
</tr> </tr>
{{#each serviceLinksArray as |link|}} {{#each serviceLinksArray as |link|}}
<tr> <tr class="sm-noborder">
<td data-title="{{t 'formServiceLinks.service.label'}}"> <td data-title="{{t 'formServiceLinks.service.label'}}">
{{new-select {{new-select
classNames="form-control service-link input-sm" classNames="form-control service-link input-sm"

6
app/components/storagepool-section/template.hbs
View File

@ -45,7 +45,7 @@
{{sortable-th sortable=this action="changeSort" name="state" width="115" label="generic.state"}} {{sortable-th sortable=this action="changeSort" name="state" width="115" label="generic.state"}}
{{sortable-th sortable=this action="changeSort" name="name" width="350" label="storagePoolSection.models.table.header.volumeName"}} {{sortable-th sortable=this action="changeSort" name="name" width="350" label="storagePoolSection.models.table.header.volumeName"}}
<th>{{t 'storagePoolSection.models.table.header.activeMounts'}}</th> <th>{{t 'storagePoolSection.models.table.header.activeMounts'}}</th>
<th width="70">&nbsp;</th> <th width="75">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -59,7 +59,7 @@
<p class="hand force-wrap clip r-m0">{{vol.displayName}}</p> <i classs="icon icon-info"></i> <p class="hand force-wrap clip r-m0">{{vol.displayName}}</p> <i classs="icon icon-info"></i>
{{/tooltip-element}} {{/tooltip-element}}
</td> </td>
<td> <td class="force-wrap">
{{#if vol.activeMounts.length}} {{#if vol.activeMounts.length}}
{{#each vol.activeMounts as |mount|}} {{#each vol.activeMounts as |mount|}}
<div> <div>
@ -91,7 +91,7 @@
<th width="125">{{t 'storagePoolSection.models.table.header.snapshotState'}}</th> <th width="125">{{t 'storagePoolSection.models.table.header.snapshotState'}}</th>
<th>{{t 'storagePoolSection.models.table.header.snapshotName'}}</th> <th>{{t 'storagePoolSection.models.table.header.snapshotName'}}</th>
<th>{{t 'storagePoolSection.models.table.header.backedUp'}}</th> <th>{{t 'storagePoolSection.models.table.header.backedUp'}}</th>
<th width="70">&nbsp;</th> <th width="75">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

6
app/components/tooltip-warning/template.hbs
View File

@ -1,4 +1,6 @@
<span class="tooltip-content-inner warning"> <div {{action "hideAccessWarning"}}>
<span class="tooltip-content-inner warning" {{action "hideAccessWarning"}}>
{{t 'tooltipWarning.notConfigured'}} {{t 'tooltipWarning.notConfigured'}}
</span> </span>
<div class="dismiss pull-right" {{action "hideAccessWarning"}}><i class="icon icon-close"></i> {{t 'tooltipWarning.dismiss'}}</div> <div class="dismiss pull-right"><i class="icon icon-close"></i> {{t 'tooltipWarning.dismiss'}}</div>
</div>

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

@ -152,6 +152,7 @@
.tooltip-warning-container { .tooltip-warning-container {
background : $lightTeal; background : $lightTeal;
color : white; color : white;
cursor: pointer;
&.top::after { &.top::after {
border-top : 5px solid $lightTeal; border-top : 5px solid $lightTeal;

4
app/styles/layout/_header.scss
View File

@ -203,6 +203,8 @@ HEADER {
.gh-block-detail { .gh-block-detail {
color: $text-color; color: $text-color;
max-width: 175px;
font-size: .85em;
} }
.user-logout { .user-logout {
@ -212,7 +214,7 @@ HEADER {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
padding: 18px 10px; padding: 17px 10px;
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;

11
app/styles/layout/_sm-screen.scss
View File

@ -92,13 +92,8 @@
} }
} }
.well { /*responsive tables and nav 695-959*/
padding: 0;
}
}
/*responsive tables and nav*/
@media (max-width: $screen-sm-max) {
table, table,
thead, thead,
tbody, tbody,
@ -124,6 +119,10 @@
tr { tr {
border: 1px solid $table-border-color; border: 1px solid $table-border-color;
margin: 10px 0; margin: 10px 0;
&.sm-noborder{
border-width: 0px;
}
} }
td { td {