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

and a bountiful pixel hunt it was

This commit is contained in:
lvuch 2015-11-19 13:59:54 -07:00
parent 4c4e0919db
commit e5909fd47d
26 changed files with 307 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/admin-tab/auth/template.hbs
View File

@ -24,7 +24,6 @@
</div>
</div>
</div>
<p class="text-center"><i class="icon icon-chevron-down"></i></p>
</section>
{{/unless}}

2
app/admin-tab/processes/index/template.hbs
View File

@ -65,7 +65,7 @@
<td>{{run-time instance.startTimeTS instance.endTimeTS}}</td>
{{/link-to}}
{{else}}
<tr><td colspan="7" class="text-center text-muted">There are no recent proceses.</td></tr>
<tr><td colspan="7" class="text-center text-muted">There are no recent processes.</td></tr>
{{/each}}
</tbody>
</table>

2
app/applications-tab/catalog/index/template.hbs
View File

@ -5,7 +5,7 @@
</ol>
<div class="btn-group pull-right left-divider">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Category: <span class="text-capitalize">{{category}}</span> <span class="caret"></span></button>
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Category: <span class="text-capitalize">{{category}}</span> <i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu dropdown-menu-right">
{{#each categories as |category|}}
<li>

2
app/components/badge-state/template.hbs
View File

@ -1 +1 @@
<i class="{{model.stateIcon}}" tooltip="{{model.displayState}}"></i> {{model.displayState}}
<i class="{{model.stateIcon}}"></i> {{model.displayState}}

14
app/components/environment-header/template.hbs
View File

@ -9,12 +9,26 @@
</li>
</ol>
<div class="btn-group pull-right">
{{#link-to "environment.index" classNames="btn btn-sm btn-default"}}<i class="icon icon-tasks" data-placement="bottom" tooltip="List"></i>{{/link-to}}
{{#link-to "environment.graph" classNames="btn btn-sm btn-default"}}<i class="icon icon-share" data-placement="bottom" tooltip="Link Graph"></i>{{/link-to}}
{{#link-to "environment.code" classNames="btn btn-sm btn-default"}}<i class="icon icon-file" data-placement="bottom" tooltip="Compose YAML"></i>{{/link-to}}
</div>
<div class="btn-group r-ml5 left-divider">
{{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-primary btn-sm"}}Add Service{{/link-to}}
<button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<i class="icon icon-chevron-down"></i>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li>{{#link-to "service.new-balancer" (query-params environmentId=model.id)}}Add Load Balancer{{/link-to}}</li>
<li>{{#link-to "service.new-alias" (query-params environmentId=model.id)}}Add Service Alias{{/link-to}}</li>
<li>{{#link-to "service.new-external" (query-params environmentId=model.id)}}Add External Service{{/link-to}}</li>
</ul>
</div>
{{action-menu model=model classNames="left-divider r-ml5" size="sm"}}
{{upgrade-btn environmentResource=model classNames="left-divider"}}

4
app/components/form-balancer-listeners/template.hbs
View File

@ -46,7 +46,7 @@
<td>&nbsp;</td>
<td>
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown" aria-expanded="false">{{listener.sourceProtocol}} <span class="caret"></span></button>
<button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown" aria-expanded="false">{{listener.sourceProtocol}} <i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu" role="menu">
<li role="presentation" class="dropdown-header">
Select a protocol:
@ -68,7 +68,7 @@
<td>&nbsp;</td>
<td>
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown" aria-expanded="false">{{if listener.isPublic "Public" "Internal"}} <span class="caret"></span></button>
<button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown" aria-expanded="false">{{if listener.isPublic "Public" "Internal"}} <i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu" role="menu">
<li role="presentation" class="dropdown-header">
Select access:

4
app/components/form-healthcheck/template.hbs
View File

@ -33,7 +33,7 @@
<div class="col-sm-12 col-md-8">
<div class="input-group">
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false" style="border-right: 0;">{{uriMethod}} <span class="caret"></span></button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false" style="border-right: 0;">{{uriMethod}} <i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu" role="menu">
<li role="presentation" class="dropdown-header">
Select A HTTP Method:
@ -49,7 +49,7 @@
{{input type="text" classNames="form-control" placeholder="Request Path e.g. /healthcheck" value=uriPath}}
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">{{uriVersion}} <span class="caret"></span></button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">{{uriVersion}} <i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu" role="menu">
<li role="presentation" class="dropdown-header">
Select A HTTP Version:

2
app/components/input-identity/template.hbs
View File

@ -8,7 +8,7 @@
<button class="btn btn-primary" {{action "add"}}><i class="icon icon-plus"></i></button>
{{/if}}
{{#if showDropdown}}
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu" style="min-width: 250px; max-height: 300px; overflow-y: auto;">
<li role="presentation" class="dropdown-header">{{dropdownLabel}}</li>
{{#if dropdownLoaded}}

10
app/components/new-balancer/template.hbs
View File

@ -50,17 +50,16 @@
</section>
{{form-divider}}
<section class="text-center" style="padding: 0;">
<ul class="nav nav-pills" style="display: inline-block">
<section>
<ul class="nav nav-tabs nav-tabs-well shadowed" style="display: inline-block">
<li role="presentation" class="tab" data-section="ssl" {{action "selectTab" "ssl" target=view}}><a>SSL Termination</a></li>
<li role="presentation" class="tab" data-section="stickiness" {{action "selectTab" "stickiness" target=view}}><a>Stickiness</a></li>
<li role="presentation" class="tab" data-section="labels" {{action "selectTab" "labels" target=view}}><a>Labels</a></li>
<li role="presentation" class="tab" data-section="scheduling" {{action "selectTab" "scheduling" target=view}}><a>Scheduling</a></li>
</ul>
</section>
<section class="horizontal-form tab-section" style="background-color: #f8f9fa; margin: -7px 10px 0 10px;">
<div class="horizontal-form well">
<div class="section container-fluid tab-section" data-section="ssl">
{{form-ssl-termination
balancer=service
@ -104,6 +103,7 @@
setGlobal=(action 'setGlobal')
}}
</div>
</div>
</section>
{{partial "save-cancel"}}

12
app/components/page-header/template.hbs
View File

@ -14,21 +14,21 @@
<span class="user-toggle" id="user-dropdown" data-toggle="dropdown" aria-expanded="true" aria-label="User Menu: {{session.user}}">
{{#if accessEnabled}}
{{identity-avatar link=false identity=access.identity}}
<span class="caret user-dropdown-arrow"></span>
<i class="icon icon-chevron-down"></i>
{{else}}
<div class="gh-avatar">
<div class="gh-placeholder">
<i class="icon icon-user"></i>
</div>
</div>
<span class="caret user-dropdown-arrow"></span>
<i class="icon icon-chevron-down"></i>
{{/if}}
</span>
<ul class="dropdown-menu dropdown-menu-right user-menu" role="menu" aria-labelledby="user-dropdown">
{{#if accessEnabled}}
<li role="presentation" class="user-auth">
{{identity-block avatar=false identity=access.identity}}
{{#link-to "logout" tabindex="-1" class="user-logout"}}<i class="icon icon-logout"></i><br/>Log Out{{/link-to}}
{{#link-to "logout" tabindex="-1" class="user-logout"}}<i class="icon icon-logout"></i> Log Out{{/link-to}}
</li>
{{/if}}
@ -59,10 +59,10 @@
</div>
{{#if project}}
<div class="btn-group project-btn">
<div class="dropdown btn-group project-btn">
<button type="button" class="btn btn-link dropdown-toggle text-left clip" data-toggle="dropdown" aria-expanded="false">
<i class="{{project.icon}} icon-fw"></i>&nbsp;{{project.displayName}}
<span class="caret"></span>
<i class="icon icon-chevron-down"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right project-menu" role="menu">
{{#if projectChoices.length}}
@ -116,7 +116,7 @@
<div class="compose-download">
<a class="dropdown-toggle hand" data-toggle="dropdown" aria-expanded="false">
<i class="icon icon-download"></i> Download CLI <span class="caret"></span>
<i class="icon icon-download"></i> Download CLI <i class="icon icon-chevron-down"></i>
</a>
<ul class="dropdown-menu text-right" role="menu" style="min-width: 0">
<li><a {{action "composeDownload" "darwin"}}>Mac OS X <i class="icon icon-fw icon-apple"></i></a></li>

12
app/components/scheduling-rule-row/template.hbs
View File

@ -28,7 +28,7 @@
<div class="input-group">
{{input type="text" class="form-control input-sm" value=userKey}}
<div class="input-group-btn">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
{{#each hostLabelKeyChoices as |key|}}
<li><a {{action "setKey" key}}>{{key}}</a></li>
@ -41,7 +41,7 @@
<div class="input-group">
{{input type="text" class="form-control input-sm" value=userKey}}
<div class="input-group-btn">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
{{#each containerLabelKeyChoices as |key|}}
<li><a {{action "setKey" key}}>{{key}}</a></li>
@ -62,7 +62,7 @@
{{input type="text" class="form-control input-sm" value=userValue}}
{{#if hostLabelValueChoices.length}}
<div class="input-group-btn">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
{{#each hostLabelValueChoices as |value|}}
<li><a {{action "setValue" value}}>{{value}}</a></li>
@ -77,7 +77,7 @@
{{input type="text" class="form-control input-sm" value=userValue}}
{{#if containerLabelValueChoices.length}}
<div class="input-group-btn">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
{{#each containerLabelValueChoices as |value|}}
<li><a {{action "setValue" value}}>{{value}}</a></li>
@ -92,7 +92,7 @@
{{input type="text" class="form-control input-sm" value=userValue}}
{{#if serviceValueChoices.length}}
<div class="input-group-btn">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
{{#each serviceValueChoices as |value|}}
<li><a {{action "setValue" value}}>{{value}}</a></li>
@ -107,7 +107,7 @@
{{input type="text" class="form-control input-sm" value=userValue}}
{{#if containerValueChoices.length}}
<div class="input-group-btn">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><span class="caret"></span></button>
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="icon icon-chevron-down"></i></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
{{#each containerValueChoices as |value|}}
<li><a {{action "setValue" value}}>{{value}}</a></li>

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

@ -10,16 +10,25 @@
</div>
<div class="header-left">
<h4>
{{#if single}}
<span class="divider clip">{{model.name}}</span>
<label class="section" style="color:white;">
State: {{model.displayState~}}
{{#if model.showTransitioningMessage}}
<span class="force-wrap">
({{model.transitioningMessage}})
</span>
{{/if}}
</label>
{{else}}
<span class="divider clip">{{#link-to "environment" model.id}}{{model.name}}{{/link-to}}</span>
<h4>
<span class="divider clip">{{#link-to "environment" model.id}}{{model.name}}{{/link-to}}</span>
</h4>
{{/if}}
{{#if outputs.length}}
<div class="btn-group r-ml10">
<button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Outputs <span class="caret"></span>
Outputs <i class="icon icon-chevron-down"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right">
{{#each outputs as |obj|}}
@ -28,7 +37,7 @@
</ul>
</div>
{{/if}}
</h4>
</div>
<div class="header-right right-divider stack-actions wide">
@ -50,25 +59,25 @@
<div class="header-right right-divider stack-template">
{{#unless single}}
{{upgrade-btn environmentResource=model}}
<div class="btn-group">
{{#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">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu" role="menu">
<li>{{#link-to "service.new-balancer" (query-params environmentId=model.id)}}Add Load Balancer{{/link-to}}</li>
<li>{{#link-to "service.new-alias" (query-params environmentId=model.id)}}Add Service Alias{{/link-to}}</li>
<li>{{#link-to "service.new-external" (query-params environmentId=model.id)}}Add External Service{{/link-to}}</li>
</ul>
</div>
{{/unless}}
<div class="btn-group r-ml5">
{{#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">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li>{{#link-to "service.new-balancer" (query-params environmentId=model.id)}}Add Load Balancer{{/link-to}}</li>
<li>{{#link-to "service.new-alias" (query-params environmentId=model.id)}}Add Service Alias{{/link-to}}</li>
<li>{{#link-to "service.new-external" (query-params environmentId=model.id)}}Add External Service{{/link-to}}</li>
</ul>
</div>
</div>
</div>
{{#liquid-if (not collapsed)}}
<div class="stack-body">
<div class="stack-body {{if single 'single-body'}}">
{{#if model.services.length}}
<table class="grid fixed" style="margin-bottom: 0">
<tbody>

4
app/components/upgrade-btn/component.js
View File

@ -68,7 +68,7 @@ export default Ember.Component.extend({
btnClass: function() {
if ( this.get('isUpgradeState') )
{
return 'btn-link';
return 'btn-disabled';
}
switch ( this.get('upgradeStatus') ) {
@ -77,7 +77,7 @@ export default Ember.Component.extend({
case LOADING:
case CURRENT:
case ERROR:
return 'btn-link';
return 'btn-disabled';
case AVAILABLE:
return 'btn-warning';
}

4
app/environments/index/template.hbs
View File

@ -4,7 +4,9 @@
<li class="active">Stacks</li>
</ol>
{{#link-to "environments.new" classNames="btn btn-sm btn-primary"}}Add Stack{{/link-to}}
{{#unless single}}
{{#link-to "environments.new" classNames="btn btn-sm btn-primary"}}Add Stack{{/link-to}}
{{/unless}}
<div class="pull-right">
<label class="text-muted r-pr5" style="font-size: 13px;">Sort By: </label>

45
app/styles/bootstrap-tweak.scss vendored
View File

@ -71,9 +71,38 @@ H1, H2, H3, H4, H5, H6, SECTION.header {
}
}
/*buttons*/
button {
transition: ease all 100ms;
&:focus {
outline: 0;
}
&:active {
color: $blueTwo;
}
}
.btn {
transition: ease all 100ms;
&:focus {
outline: 0;
}
}
.btn-xs, .btn-group-xs > .btn {
padding: 2px 5px;
line-height: initial;
}
.btn-xs i {
margin: 0;
// font-size: 10px;
}
.btn-disabled,
.btn.disabled {
background: $lightGrayDark;
&:hover,
&:focus {
color: inherit;
}
}
.btn-disabled,
.btn.disabled,
@ -397,7 +426,7 @@ HR {
.dropdown-menu {
@include box-shadow(0 2px 2px rgba(0,0,0,0.1));
border: none;
max-height: 300px;
overflow-y: auto;
&.dropdown-menu-right {
@ -587,6 +616,19 @@ FORM LABEL,
padding: 1px 5px;
}
.ember-power-select-trigger {
background-image: none;
position: relative;
&:after {
content: "\e907";
font-family: 'rancher-icons';
position: absolute;
right: 5px;
top: 0;
}
}
LI {
cursor: pointer;
@ -598,6 +640,7 @@ FORM LABEL,
}
.tooltip {
z-index: 25;
&.left {
white-space: nowrap;
}

61
app/styles/environment.scss
View File

@ -1,8 +1,9 @@
$stackHeight: 66px;
$stateRadius: 13px;
$stateBorder: 2px;
$singleStackHeight: 45px;
$singleStackHeight: 30px;
$countWidth: 99px;
$singleCountWidth : 120px;
.stack-section {
position: relative;
@ -11,18 +12,6 @@ $countWidth: 99px;
background-color: $lightestGray;
margin: 0 20px 10px 20px;
.single {
color: white;
.count LABEL,
.count P,
&>A:not(.btn),
&>BUTTON:not(.btn),
A.btn-link {
color: white;
}
}
&:last-child {
margin-bottom: 0;
}
@ -103,8 +92,7 @@ $countWidth: 99px;
}
.stack-template {
line-height: $stackHeight;
min-width: 150px;
line-height: 60px;
text-align: center;
}
@ -150,6 +138,49 @@ $countWidth: 99px;
}
}
}
.single {
color: white;
.count {
width: $singleCountWidth;
}
.count LABEL,
.count P,
&>A:not(.btn),
&>BUTTON:not(.btn),
A.btn-link {
color: white;
display: inline-block;
vertical-align: middle;
line-height: $singleStackHeight;
margin: 0;
top: 0;
}
.stack-state {
top: ($singleStackHeight - $stateBorder)/2 - $stateRadius;
}
.header-left {
height: $singleStackHeight;
line-height: $singleStackHeight;
H4 {
line-height: $singleStackHeight;
}
}
.header-right, .collapser {
height: $singleStackHeight;
}
}
.stack-body.single-body .grid TD:nth-child(4),
.stack-body.single-body .grid TD:nth-child(5) {
width: ($singleCountWidth + 10);
}
}
.environment-graph {

2
app/styles/fonts.scss
View File

@ -66,7 +66,7 @@ $icon-inverse: #fff !default;
.icon {
display: inline-block;
tranform: translate(0,0);
transform: translate(0,0);
}
// Sizes

6
app/styles/github-avatar.scss
View File

@ -37,7 +37,7 @@
}
}
$size: 39px;
$size: 35px;
$border: 2px;
.gh-avatar {
@ -51,7 +51,9 @@ $border: 2px;
IMG {
border-radius: 50%;
vertical-align: top;
vertical-align: middle;
width: 100%;
height: auto
}
.gh-placeholder {

169
app/styles/header.scss
View File

@ -29,6 +29,73 @@ HEADER {
background-color: $black;
min-height: $topHeight;
.dropdown {
&.open {
& .icon-chevron-down {
transform:rotate(-180deg);
}
}
.icon-chevron-down {
transition: ease all 350ms;
font-size: .75em;
}
.dropdown-toggle {
height: $topHeight;
line-height: $topHeight;
padding: 0;
margin-right: 10px;
max-width: 100%;
color: $midGray;
}
.user-toggle {
cursor: pointer;
position: relative;
color: $midGray;
}
.dropdown-menu {
max-height: 300px;
width: 300px;
overflow-y: auto;
transition: ease top 350ms;
box-shadow: none;
background: rgba(43,43,43,.95);
color: white;
margin: 0;
border-radius: 0 0 2px 2px;
> li > A {
color: white;
&:hover {
color: $blue;
background: rgba(43,43,43,.9);
}
}
& > li.selected > a,
& > li.selected > a:hover,
& > li.selected > a:focus {
color: $greenTwoDark
}
.dropdown-header {
color: $lightGray;
padding: 5px 20px;
}
.divider {
background: black;
}
}/*end dropdown-menu*/
}/*end dropdown*/
NAV {
float: left;
font-size: 14px;
@ -37,9 +104,7 @@ HEADER {
height: $topHeight;
line-height: $topHeight;
position: relative;
}
&>A {
&:hover {
background: $blackDark;
}
@ -74,7 +139,7 @@ HEADER {
.user-btn {
float: right;
vertical-align: top;
padding: 3px 15px;
padding: 5px 15px;
}
.project-btn {
@ -88,54 +153,28 @@ HEADER {
text-transform: inherit;
}
.dropdown-toggle {
height: $topHeight;
line-height: $topHeight;
padding: 0;
margin-right: 10px;
max-width: 100%;
color: $midGray;
}
.dropdown-menu {
max-height: 300px;
max-width: 300px;
overflow-y: auto;
}
}
.user-toggle {
cursor: pointer;
position: relative;
z-index: 1001; /* These have to be > 990 for bootstrap on touch devices */
}
.project-menu {
margin-top: -13px;
z-index: 1000; /* These have to be > 990 for bootstrap on touch devices */
padding-top: 0;
border-radius: 2px;
}
}/*end project button*/
.user-menu {
z-index: 1000; /* These have to be > 990 for bootstrap on touch devices */
transition: ease top 350ms;
padding-top: 0;
width: 250px;
border-radius: 2px;
}
.user-dropdown-arrow {
color: $midGrayTwo;
position: relative;
left: -2px;
}
.user-noauth,
.user-auth {
border-top-left-radius: 2px;
border-top-right-radius: 2px;
color: white;
margin-bottom: 5px;
margin-bottom: 20px;
}
.user-noauth {
@ -146,14 +185,16 @@ HEADER {
.user-auth {
position: relative;
background-color: #9eadb6;
padding: 10px 0 10px 20px;
background: rgba(0,0,0,.5);
padding: 10px 20px;
.gh-block {
margin-right: 60px;
display: inline-block;
vertical-align: middle;
}
.gh-block-name {
font-weight: bold;
A, A:hover, A:focus, A:visited, A:active {
color: white;
}
@ -164,28 +205,30 @@ HEADER {
}
.user-logout {
background-color: #899ba7;
border-top-right-radius: 2px;
position: absolute;
top: 0;
right: 0;
bottom: 0;
padding: 14px 0 0 0;
width: 60px;
color: #dfe9ee;
font-size: 12px;
text-align: center;
background-color: rgba(0, 0, 0, 0.7);
border-top-right-radius: 2px;
position: absolute;
top: 0;
right: 0;
padding: 18px 10px;
color: #dfe9ee;
font-size: 12px;
text-align: center;
vertical-align: middle;
display: inline-block;
&:hover {
background: $blackDark;
}
I {
font-size: 24px;
line-height: 20px;
position: relative;
left: 3px;
font-size: 20px;
vertical-align: middle;
}
}
}
}
} /*end user logout*/
} /*end user auth*/
}/*end top row*/
/*start bottom row*/
.bottom-row {
min-height: $bottomHeight;
background-color: white;
@ -248,15 +291,10 @@ HEADER {
}
}
.dropdown-menu {
A:hover {
color: white;
}
}
}
}
}
} /*end nav*/
}/*end bottom row*/
H3 {
margin: 0;
@ -275,6 +313,5 @@ HEADER {
text-decoration: none;
color: $header-link-text;
}
}
}
} /*end h3 */
}

21
app/styles/layout.scss
View File

@ -472,7 +472,7 @@ $spacing-property-map: (
& > TFOOT > TR > TH,
& > TFOOT > TR > TD {
font-size: 13px;
vertical-align: top;
vertical-align: middle;
}
.actions {
@ -482,6 +482,9 @@ $spacing-property-map: (
.state {
max-width: 100%;
@extend .clip;
i {
vertical-align: middle;
}
}
}
@ -525,10 +528,6 @@ $spacing-property-map: (
* Form
**********/
.horizontal-form {
H2 {
text-align: center;
margin-bottom: 20px;
}
.form-label {
text-align: right;
@ -665,8 +664,14 @@ $spacing-property-map: (
A {
border: 0 !important;
background-color: $lightGrayTwoDark;
color: $darkestGrayTwo;
background-color: $lightGray;
color: $midGrayDark;
transition: ease all .2s;
&:hover {
background-color: $midGray;
color: $midGrayDark;
}
}
&.active A,
@ -675,7 +680,7 @@ $spacing-property-map: (
color: $orange;
position: relative;
z-index: 1;
box-shadow: 0 -6px 7px rgba(0, 0, 0, 0.15)
box-shadow: 0 -3px 8px rgba(0, 0, 0, 0.1)
}
}
}

2
app/styles/resource-actions.scss
View File

@ -54,7 +54,7 @@
position: absolute;
top: 6px;
right: 5px;
color: #aaa;
color: $midGrayDark;
}
&:hover I {

3
app/styles/service-addtl-info.scss
View File

@ -123,9 +123,6 @@
width: 40%;
vertical-align: middle;
}
.btn {
font-size: 11px;
}
}
.action-menu {
margin-right: 15px;

26
app/styles/slider.scss
View File

@ -1,47 +1,45 @@
.slider {
position: relative;
border: 1px solid #ddd;
background: $lightGrayTwo;
border-radius: 5px;
cursor: pointer;
height: 7px;
margin: 5px 0;
height: 15px;
.slider-handle {
position: absolute;
width: 15px;
height: 15px;
top: -5px;
width: 20px;
height: 20px;
top: -3px;
margin-left: -10px;
border-radius: 3px;
background-color: #eee;
border: 1px solid #666;
border-radius: 50%;
background-color: $lightGray;
}
.slider-bar {
position: absolute;
width: 100%;
height: 100%;
background-color: #ddd;
border-radius: 3px;
background-color: $blueTwo;
border-radius: 90px;
}
&.disabled {
cursor: not-allowed;
.slider-handle {
border-color: #aaa;
border-color: $midGrayDark;
background-color: $lightGray;
}
.slider-bar {
background-color: #aaa;
background-color: $midGrayDark;
opacity: 0.6;
}
}
&.active {
.slider-handle {
backround-color: $lightGray;
background-color: $lightGrayDark;
}
}
}

4
app/styles/sortable.scss
View File

@ -11,10 +11,10 @@ TH.sortable {
line-height: inherit;
display: inline;
vertical-align: top;
padding: 0 15px;
padding: 0 10px;
}
}
.table-flat TH.sortable .faded {
color: #aaa;
color: $midGrayDark;
}

17
app/templates/service-addtl-info.hbs
View File

@ -45,14 +45,7 @@
<label class="text-muted">Containers ({{primaryContainers.length}})</label>
<div class="content">
<div class="container-dots clearfix">
<div style="display:inline-block;">
{{#each primaryContainers as |instance|}}
{{container-dot model=instance}}
{{else}}
<span class="text-muted">No Containers</span>
{{/each}}
</div>
<div class="r-mt10">
<div>
<label class="text-muted">Scale</label>
{{#if service.canScale}}
<span class="r-ml20 r-mr20">{{service.scale}}</span>
@ -64,6 +57,14 @@
{{if service.isGlobalScale 'Global'}}
{{/if}}
</div>
<div style="display:inline-block;">
{{#each primaryContainers as |instance|}}
{{container-dot model=instance}}
{{else}}
<span class="text-muted">No Containers</span>
{{/each}}
</div>
</div>
</div>
</div>

2
vendor/bootswatch-cosmo/_variables.scss vendored
View File

@ -75,7 +75,7 @@ $lightGrayTwoDark: #bdc3c7;
$brand-primary: $blue; //button non state
//states
$brand-success: $green; //good
$brand-success: $greenDark; //good
$brand-info: #78c9cf; //transitioning
$brand-warning: $yellow; //orange degraded
$brand-danger: #f15354; //red stopped inactive bad