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

header and font

This commit is contained in:
lvuch 2016-12-13 14:46:58 -07:00 committed by Vincent Fiduccia
parent 2fc2b73dd7
commit 7745c8531d
22 changed files with 92 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin-tab/audit-logs/template.hbs
View File

@ -36,7 +36,7 @@
{{/each}} {{/each}}
</ul> </ul>
</span> </span>
<button role="button" class="btn btn-sm bg-danger ml-5" {{action "clearAll"}}> {{t 'auditLogsPage.form.clearButtonText'}}</button> <button role="button" class="btn btn-sm bg-error ml-5" {{action "clearAll"}}> {{t 'auditLogsPage.form.clearButtonText'}}</button>
<button role="button" class="btn btn-sm bg-primary ml-5" {{action "search"}}> {{t 'auditLogsPage.form.searchButtonText'}}</button> <button role="button" class="btn btn-sm bg-primary ml-5" {{action "search"}}> {{t 'auditLogsPage.form.searchButtonText'}}</button>
</div> </div>
</div> </div>

4
app/admin-tab/auth/azuread/template.hbs
View File

@ -19,11 +19,11 @@
</p> </p>
{{#if confirmDisable}} {{#if confirmDisable}}
<button class="btn bg-danger" {{action "disable"}}> <button class="btn bg-error" {{action "disable"}}>
<i class="icon icon-alert"></i> {{t 'authPage.azuread.enabled.reallyDisable'}} <i class="icon icon-alert"></i> {{t 'authPage.azuread.enabled.reallyDisable'}}
</button> </button>
{{else}} {{else}}
<button class="btn bg-danger" {{action "promptDisable"}}> <button class="btn bg-error" {{action "promptDisable"}}>
<i class="icon icon-umbrella"></i> {{t 'authPage.azuread.enabled.promptDisable'}} <i class="icon icon-umbrella"></i> {{t 'authPage.azuread.enabled.promptDisable'}}
</button> </button>
{{/if}} {{/if}}

4
app/admin-tab/auth/github/template.hbs
View File

@ -39,11 +39,11 @@
</p> </p>
{{#if confirmDisable}} {{#if confirmDisable}}
<button class="btn bg-danger" {{action "disable"}}> <button class="btn bg-error" {{action "disable"}}>
<i class="icon icon-alert"></i> {{t 'authPage.github.authenticated.disableAccess.confirmDisable'}} <i class="icon icon-alert"></i> {{t 'authPage.github.authenticated.disableAccess.confirmDisable'}}
</button> </button>
{{else}} {{else}}
<button class="btn bg-danger" {{action "promptDisable"}}> <button class="btn bg-error" {{action "promptDisable"}}>
<i class="icon icon-umbrella"></i> {{t 'authPage.github.authenticated.disableAccess.disable'}} <i class="icon icon-umbrella"></i> {{t 'authPage.github.authenticated.disableAccess.disable'}}
</button> </button>
{{/if}} {{/if}}

4
app/admin-tab/auth/localauth/template.hbs
View File

@ -18,11 +18,11 @@
</p> </p>
{{#if confirmDisable}} {{#if confirmDisable}}
<button class="btn bg-danger" {{action "disable"}}> <button class="btn bg-error" {{action "disable"}}>
<i class="icon icon-alert"></i> {{t 'authPage.localAuth.accessEnabled.buttonText.disable'}} <i class="icon icon-alert"></i> {{t 'authPage.localAuth.accessEnabled.buttonText.disable'}}
</button> </button>
{{else}} {{else}}
<button class="btn bg-danger" {{action "promptDisable"}}> <button class="btn bg-error" {{action "promptDisable"}}>
<i class="icon icon-umbrella"></i> {{t 'authPage.localAuth.accessEnabled.buttonText.prompt'}} <i class="icon icon-umbrella"></i> {{t 'authPage.localAuth.accessEnabled.buttonText.prompt'}}
</button> </button>
{{/if}} {{/if}}

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

@ -24,7 +24,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-danger pull-left"> <span class="state badge 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}}

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

@ -25,7 +25,7 @@
{{input value=ownResourceId class="form-control input-sm mr-5" enter='submit' placeholder=(t 'processesPage.indexPage.form.resourceId.placeholder') disabled=disableId}} {{input value=ownResourceId class="form-control input-sm mr-5" enter='submit' placeholder=(t 'processesPage.indexPage.form.resourceId.placeholder') disabled=disableId}}
{{input value=ownProcessName class="form-control input-sm mr-5" enter='submit' placeholder=(t 'processesPage.indexPage.form.processName.placeholder')}} {{input value=ownProcessName class="form-control input-sm mr-5" enter='submit' placeholder=(t 'processesPage.indexPage.form.processName.placeholder')}}
<button class="btn bg-primary bg-danger btn-sm inline-block" {{action 'reset'}}>{{t 'processesPage.indexPage.form.clear'}}</button> <button class="btn bg-primary bg-error btn-sm inline-block" {{action 'reset'}}>{{t 'processesPage.indexPage.form.clear'}}</button>
<button class="btn bg-primary btn-sm inline-block" {{action 'submit'}}>{{t 'processesPage.indexPage.form.search'}}</button> <button class="btn bg-primary btn-sm inline-block" {{action 'submit'}}>{{t 'processesPage.indexPage.form.search'}}</button>
</div> </div>
</div> </div>

2
app/components/columns-section/template.hbs
View File

@ -1,6 +1,6 @@
{{#if podCount}} {{#if podCount}}
{{#each columns as |col index|}} {{#each columns as |col index|}}
<div class="pod-column" style={{if (eq index lastIndex) lastColumnWidthCss columnWidthCss}}> <div class="pod-column col" style={{if (eq index lastIndex) lastColumnWidthCss columnWidthCss}}>
{{#each col as |item|}} {{#each col as |item|}}
{{yield item}} {{yield item}}
{{/each}} {{/each}}

2
app/components/confirm-delete/template.hbs
View File

@ -24,6 +24,6 @@
</div> </div>
<div class="footer-actions"> <div class="footer-actions">
<button {{action "confirm"}} class="btn bg-danger">{{t 'confirmDelete.confirmAction'}}</button> <button {{action "confirm"}} class="btn bg-error">{{t 'confirmDelete.confirmAction'}}</button>
<button {{action "cancel"}} class="btn bg-transparent">{{t 'confirmDelete.cancelAction'}}</button> <button {{action "cancel"}} class="btn bg-transparent">{{t 'confirmDelete.cancelAction'}}</button>
</div> </div>

2
app/components/edit-projecttemplate/template.hbs
View File

@ -69,7 +69,7 @@
<button type="button" class="btn bg-default bg-disabled" {{action "disableStack" obj true allowedKeys="meta ctrl"}}>{{t 'editProjectTemplate.stackRequired'}}</button> <button type="button" class="btn bg-default bg-disabled" {{action "disableStack" obj true allowedKeys="meta ctrl"}}>{{t 'editProjectTemplate.stackRequired'}}</button>
{{else if obj.enabled}} {{else if obj.enabled}}
<button type="button" class="btn bg-default" {{action "enableStack" obj}}>{{t 'editProjectTemplate.stackEdit'}}</button> <button type="button" class="btn bg-default" {{action "enableStack" obj}}>{{t 'editProjectTemplate.stackEdit'}}</button>
<button type="button" class="btn bg-danger" {{action "disableStack" obj}}>{{t 'generic.disable'}}</button> <button type="button" class="btn bg-error" {{action "disableStack" obj}}>{{t 'generic.disable'}}</button>
{{else if obj.supported}} {{else if obj.supported}}
<button type="button" class="btn bg-primary" {{action "enableStack" obj}}>{{t 'generic.enable'}}</button> <button type="button" class="btn bg-primary" {{action "enableStack" obj}}>{{t 'generic.enable'}}</button>
{{/if}} {{/if}}

2
app/components/modal-confirm-deactivate/template.hbs
View File

@ -9,6 +9,6 @@
<div class="footer-actions"> <div class="footer-actions">
<button {{action "confirm"}} class="btn bg-danger">{{isService.button}}</button> <button {{action "confirm"}} class="btn bg-error">{{isService.button}}</button>
<button {{action "cancel"}} class="btn bg-transparent">{{t 'modalConfirmDeactiviate.cancel'}}</button> <button {{action "cancel"}} class="btn bg-transparent">{{t 'modalConfirmDeactiviate.cancel'}}</button>
</div> </div>

2
app/components/modal-container-stop/template.hbs
View File

@ -25,6 +25,6 @@
</div> </div>
<div class="footer-actions"> <div class="footer-actions">
<button {{action "stop"}} class="btn bg-danger">{{t 'modalContainerStop.button'}}</button> <button {{action "stop"}} class="btn bg-error">{{t 'modalContainerStop.button'}}</button>
<button {{action "cancel"}} class="btn bg-transparent">{{t 'generic.cancel'}}</button> <button {{action "cancel"}} class="btn bg-transparent">{{t 'generic.cancel'}}</button>
</div> </div>

2
app/fail-whale/template.hbs
View File

@ -1,6 +1,6 @@
<section class="fail-whale"> <section class="fail-whale">
<div class="error"> <div class="error">
<h2 class="bg-danger">{{t 'failWhalePage.header'}}</h2> <h2 class="bg-error">{{t 'failWhalePage.header'}}</h2>
<div class="pl-20"> <div class="pl-20">
<h4 class="mt-20">{{model.code}} {{#if model.status}}({{model.status}}){{/if}}</h4> <h4 class="mt-20">{{model.code}} {{#if model.status}}({{model.status}}){{/if}}</h4>
<p>{{model.message}}</p> <p>{{model.message}}</p>

16
app/mixins/cattle-transitioning-resource.js
View File

@ -13,12 +13,12 @@ const defaultStateMap = {
'deactivating': {icon: 'icon icon-adjust', color: 'text-info' }, 'deactivating': {icon: 'icon icon-adjust', color: 'text-info' },
'degraded': {icon: 'icon icon-alert', color: 'text-warning'}, 'degraded': {icon: 'icon icon-alert', color: 'text-warning'},
'disconnected': {icon: 'icon icon-alert', color: 'text-warning' }, 'disconnected': {icon: 'icon icon-alert', color: 'text-warning' },
'error': {icon: 'icon icon-alert', color: 'text-danger' }, 'error': {icon: 'icon icon-alert', color: 'text-error' },
'inactive': {icon: 'icon icon-circle', color: 'text-danger' }, 'inactive': {icon: 'icon icon-circle', color: 'text-error' },
'initializing': {icon: 'icon icon-alert', color: 'text-warning'}, 'initializing': {icon: 'icon icon-alert', color: 'text-warning'},
'purged': {icon: 'icon icon-purged', color: 'text-danger' }, 'purged': {icon: 'icon icon-purged', color: 'text-error' },
'purging': {icon: 'icon icon-purged', color: 'text-info' }, 'purging': {icon: 'icon icon-purged', color: 'text-info' },
'removed': {icon: 'icon icon-trash', color: 'text-danger' }, 'removed': {icon: 'icon icon-trash', color: 'text-error' },
'removing': {icon: 'icon icon-trash', color: 'text-info' }, 'removing': {icon: 'icon icon-trash', color: 'text-info' },
'requested': {icon: 'icon icon-tag', color: 'text-info' }, 'requested': {icon: 'icon icon-tag', color: 'text-info' },
'registering': {icon: 'icon icon-tag', color: 'text-info' }, 'registering': {icon: 'icon icon-tag', color: 'text-info' },
@ -28,9 +28,9 @@ const defaultStateMap = {
'snapshotted': {icon: 'icon icon-snapshot', color: 'text-warning'}, 'snapshotted': {icon: 'icon icon-snapshot', color: 'text-warning'},
'started-once': {icon: 'icon icon-dot-circlefill',color: 'text-success'}, 'started-once': {icon: 'icon icon-dot-circlefill',color: 'text-success'},
'starting': {icon: 'icon icon-adjust', color: 'text-info' }, 'starting': {icon: 'icon icon-adjust', color: 'text-info' },
'stopped': {icon: 'icon icon-circle', color: 'text-danger' }, 'stopped': {icon: 'icon icon-circle', color: 'text-error' },
'stopping': {icon: 'icon icon-adjust', color: 'text-info' }, 'stopping': {icon: 'icon icon-adjust', color: 'text-info' },
'unhealthy': {icon: 'icon icon-alert', color: 'text-danger' }, 'unhealthy': {icon: 'icon icon-alert', color: 'text-error' },
'updating': {icon: 'icon icon-tag', color: 'text-info' }, 'updating': {icon: 'icon icon-tag', color: 'text-info' },
'updating-active': {icon: 'icon icon-tag', color: 'text-info' }, 'updating-active': {icon: 'icon icon-tag', color: 'text-info' },
'updating-healthy': {icon: 'icon icon-tag', color: 'text-info' }, 'updating-healthy': {icon: 'icon icon-tag', color: 'text-info' },
@ -41,7 +41,7 @@ const defaultStateMap = {
}; };
const stateColorSortMap = { const stateColorSortMap = {
'danger': 1, 'error': 1,
'warning': 2, 'warning': 2,
'info': 3, 'info': 3,
'success': 4 'success': 4
@ -232,7 +232,7 @@ export default Ember.Mixin.create({
stateColor: function() { stateColor: function() {
if ( this.get('isError') ) { if ( this.get('isError') ) {
return 'text-danger'; return 'text-error';
} }
var map = this.constructor.stateMap; var map = this.constructor.stateMap;

2
app/not-found/template.hbs
View File

@ -1,6 +1,6 @@
<section class="fail-whale"> <section class="fail-whale">
<div class="error"> <div class="error">
<h2 class="bg-danger">404</h2> <h2 class="bg-error">404</h2>
<div class="pl-20 text-center"> <div class="pl-20 text-center">
<p>{{t 'notFoundPage.header'}}</p> <p>{{t 'notFoundPage.header'}}</p>
<div> <div>

2
app/styles/app-light.scss
View File

@ -54,7 +54,7 @@
@import "app/styles/components/resource-actions"; @import "app/styles/components/resource-actions";
@import "app/styles/components/login"; @import "app/styles/components/login";
@import "app/styles/components/progress-bar"; @import "app/styles/components/progress-bar";
// @import "app/styles/components/pod"; @import "app/styles/components/pod";
@import "app/styles/components/github-avatar"; @import "app/styles/components/github-avatar";
@import "app/styles/components/slider"; @import "app/styles/components/slider";
@import "app/styles/components/sortable"; @import "app/styles/components/sortable";

39
app/styles/base/_rancher.scss
View File

@ -1,3 +1,7 @@
h1, h2, h3, h4, h5, h6 {
color: $secondary;
}
.dropdown-menu { .dropdown-menu {
background-color: $dropdown-bg; background-color: $dropdown-bg;
position: absolute; position: absolute;
@ -64,10 +68,43 @@
//tabs //tabs
.tabs { .tabs {
ul.tab-header { ul.tab-header {
li a { li {
background-color: $tab-bg; background-color: $tab-bg;
color: $tab-color; color: $tab-color;
&.active {
background-color: $tab-active-bg;
color: $tab-color;
}
a {
background-color: transparent;
padding: 10px; padding: 10px;
}
}
}
}
//tables
table{
thead{
tr {
background-color: transparent;
}
}
}
//header
#navbar {
.nav {
li {
a {
font-weight: 300;
&.active {
font-weight: normal;
}
}
} }
} }
} }

20
app/styles/components/_modals.scss
View File

@ -9,6 +9,20 @@
margin: 15px 10px 30px 10px; margin: 15px 10px 30px 10px;
} }
} }
.lacsso.modal-overlay.modal-open .modal-container.modal-logs { // .lacsso.modal-overlay.modal-open .modal-container.modal-logs {
max-height: 100%;
} // }
.modal-overlay {
&.modal-open {
.modal-container {
background: $well-bg;
&.modal-logs {
max-height: 100%;
background-color: $well-bg;
}
}
}
}

16
app/styles/components/_pod.scss
View File

@ -11,9 +11,7 @@ $subpod-detail : $table-bg-accent;
.pod-column { .pod-column {
/* width is set dynamically */ /* width is set dynamically */
width : 260px; width : 260px;
display : inline-block;
vertical-align : top; vertical-align : top;
margin : 0 10px 10px 0;
&:last-of-type { &:last-of-type {
margin-right: 0; margin-right: 0;
@ -21,15 +19,14 @@ $subpod-detail : $table-bg-accent;
} }
.pod { .pod {
background : $accent-one; background : $well-bg;
border : solid transparent; border : solid transparent;
position : relative; position : relative;
padding : 5px; padding : 5px;
margin-bottom : 10px; margin-bottom : 10px;
border-radius : $border-radius-base;
.pod-header { .pod-header {
font-weight : $normal-weight; // font-weight : $normal-weight;
} }
.pod-name { .pod-name {
margin-top: 5px; margin-top: 5px;
@ -37,14 +34,13 @@ $subpod-detail : $table-bg-accent;
.pod-state { .pod-state {
font-size : 11px; font-size : 11px;
font-weight : 300;
text-align : center; text-align : center;
padding : 5px 10px; padding : 5px 10px;
vertical-align : top; vertical-align : top;
display : inline-block; display : inline-block;
border-bottom-left-radius : $border-radius-base;
border-bottom-right-radius : $border-radius-base;
font-weight : $normal-weight;
text-transform : uppercase; text-transform : uppercase;
line-height : 1;
SPAN { SPAN {
position : relative; position : relative;
@ -134,7 +130,7 @@ $subpod-detail : $table-bg-accent;
H6 { H6 {
margin-top: 3px; margin: 3px 0;
} }
.icon-chevron-down { .icon-chevron-down {
@ -244,7 +240,7 @@ $subpod-detail : $table-bg-accent;
padding : 5px 5px 0 5px; padding : 5px 5px 0 5px;
H6 { H6 {
margin-right: 5px; margin: 0 5px 0 0;
} }
} }

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

@ -262,6 +262,7 @@ HEADER {
position: relative; position: relative;
float: none; float: none;
border: 0; border: 0;
font-size: 15px;
label { label {
visibility: hidden; visibility: hidden;

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

@ -500,6 +500,7 @@ TABLE.graphs {
padding : 8px; padding : 8px;
line-height : $base-line-height; line-height : $base-line-height;
vertical-align : top; vertical-align : top;
border: none;
border-top : 1px solid $table-border-color; border-top : 1px solid $table-border-color;
} }

4
app/templates/ldap-config.hbs
View File

@ -66,11 +66,11 @@
</p> </p>
{{#if confirmDisable}} {{#if confirmDisable}}
<button class="btn bg-danger" {{action "disable"}}> <button class="btn bg-error" {{action "disable"}}>
<i class="icon icon-alert"></i> {{t 'ldap.accessEnabled.disable.confirmDisable.post'}} <i class="icon icon-alert"></i> {{t 'ldap.accessEnabled.disable.confirmDisable.post'}}
</button> </button>
{{else}} {{else}}
<button class="btn bg-danger" {{action "promptDisable"}}> <button class="btn bg-error" {{action "promptDisable"}}>
<i class="icon icon-umbrella"></i> {{t 'ldap.accessEnabled.disable.confirmDisable.pre'}} <i class="icon icon-umbrella"></i> {{t 'ldap.accessEnabled.disable.confirmDisable.pre'}}
</button> </button>
{{/if}} {{/if}}

5
app/templates/shibboleth-configured.hbs
View File

@ -28,7 +28,6 @@
</div> </div>
</div> </div>
</div> </div>
</section> </section>
{{site-access {{site-access
@ -45,11 +44,11 @@
</p> </p>
{{#if confirmDisable}} {{#if confirmDisable}}
<button class="btn bg-danger" {{action "disable"}}> <button class="btn bg-error" {{action "disable"}}>
<i class="icon icon-alert"></i> {{t 'authPage.shibboleth.enabled.disableAccess.confirmDisable'}} <i class="icon icon-alert"></i> {{t 'authPage.shibboleth.enabled.disableAccess.confirmDisable'}}
</button> </button>
{{else}} {{else}}
<button class="btn bg-danger" {{action "promptDisable"}}> <button class="btn bg-error" {{action "promptDisable"}}>
<i class="icon icon-umbrella"></i> {{t 'authPage.shibboleth.enabled.disableAccess.disable'}} <i class="icon icon-umbrella"></i> {{t 'authPage.shibboleth.enabled.disableAccess.disable'}}
</button> </button>
{{/if}} {{/if}}