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

resolve #3774

This commit is contained in:
lvuch 2016-03-04 14:08:05 -07:00
parent e71256d42f
commit e692ada5c0
4 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/action-menu/template.hbs
View File

@ -8,4 +8,6 @@
</button> </button>
{{/each}} {{/each}}
{{/if}} {{/if}}
<button class="btn btn-default btn-{{size}} more-actions pull-right"><i class="icon icon-fw icon-vertical-ellipsis" alt="More Actions"></i></button> <button class="btn btn-default btn-{{size}} more-actions pull-right" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-fw icon-vertical-ellipsis" alt="More Actions"></i></button>

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

@ -21,7 +21,7 @@
<button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Outputs <i class="icon icon-chevron-down"></i> Outputs <i class="icon icon-chevron-down"></i>
</button> </button>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right" role="dropdown">
{{#each outputs as |obj|}} {{#each outputs as |obj|}}
<li><a href="{{obj.value}}" target="_blank">{{obj.key}}</a></li> <li><a href="{{obj.value}}" target="_blank">{{obj.key}}</a></li>
{{/each}} {{/each}}
@ -48,7 +48,7 @@
{{upgrade-btn environmentResource=model}} {{upgrade-btn environmentResource=model}}
<div class="btn-group"> <div class="btn-group">
{{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-default btn-sm"}}Add Service{{/link-to}} {{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-default btn-sm"}}Add Service{{/link-to}}
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
<i class="icon icon-fw icon-chevron-down"></i> <i class="icon icon-fw icon-chevron-down"></i>
<span class="sr-only">Toggle Dropdown</span> <span class="sr-only">Toggle Dropdown</span>
</button> </button>
@ -80,7 +80,7 @@
{{#if service.hasSidekicks}} {{#if service.hasSidekicks}}
+ {{service.secondaryLaunchConfigs.length}} Sidekick{{unless (eq service.secondaryLaunchConfigs.length 1) 's'}} + {{service.secondaryLaunchConfigs.length}} Sidekick{{unless (eq service.secondaryLaunchConfigs.length 1) 's'}}
{{/if}} {{/if}}
<i class="icon icon-info addtl-info-trigger" {{action 'addtlInfo' service target=controller}}/> <button type="button" class="btn-link"><i class="icon icon-info addtl-info-trigger" {{action 'addtlInfo' service target=controller}}/></button>
</td> </td>
<td data-title="Details:" class="force-wrap service-detail">{{service.displayDetail}}{{service.displayPorts}}</td> <td data-title="Details:" class="force-wrap service-detail">{{service.displayDetail}}{{service.displayPorts}}</td>
<td data-title="Kind:"> <td data-title="Kind:">

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

@ -136,6 +136,7 @@ HEADER {
.link-admin { .link-admin {
position : relative; position : relative;
} }
&>li{ &>li{
&>A, &>A,
&>.link-admin > a { &>.link-admin > a {
@ -157,10 +158,12 @@ HEADER {
left : 45%; left : 45%;
} }
} }
&.active, &.active,
{ {
color : white; color : white;
font-weight : bold; font-weight : bold;
&:after{ &:after{
content : ""; content : "";
border-width : 5px; border-width : 5px;
@ -174,6 +177,11 @@ HEADER {
} }
} }
} }
LI A UL A {
background: red!important;
display: block;
}
} }
.logo { .logo {

25
app/styles/layout/_layout.scss
View File

@ -988,16 +988,23 @@ SECTION.header {
display: none; display: none;
} }
+ ul>a { + ul {
display: block; padding: 0;
color: white; &>a {
padding: 5px; display: block;
color: white;
padding: 5px 5px 5px 40px;
> I { &:hover {
font-size: 20px; background: rgba(0,0,0,.15);
padding-right: 10px; }
vertical-align: middle;
color: $brand-info; > I {
font-size: 20px;
padding-right: 10px;
vertical-align: middle;
color: $brand-info;
}
} }
} }
} }