External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

updates to rebrand

Browse Source
This commit is contained in:
John Mitchell
2016-01-07 14:00:31 -05:00
parent b3fe8c9531
commit 78924f41a2
6 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/dashboard/graphs/host-status/host-status-graph.directive.js
View File

@@ -59,10 +59,10 @@ function HostStatusGraph($compile, $window, adjustGraphSize, templateUrl) {
if(scope.status === "successful"){ if(scope.status === "successful"){
data = [ data = [
{ "label": "SUCCESSFUL", { "label": "SUCCESSFUL",
"color": "#5bbdbf", "color": "#3CB878",
"value" : scope.data.hosts.total - scope.data.hosts.failed "value" : scope.data.hosts.total - scope.data.hosts.failed
}]; }];
colors = ['#5bbdbf']; colors = ['#3cb878'];
} }
else if (scope.status === "failed"){ else if (scope.status === "failed"){
data = [{ "label": "FAILED", data = [{ "label": "FAILED",
@@ -74,7 +74,7 @@ function HostStatusGraph($compile, $window, adjustGraphSize, templateUrl) {
else { else {
data = [ data = [
{ "label": "SUCCESSFUL", { "label": "SUCCESSFUL",
"color": "#5bbdbf", "color": "#3CB878",
"value" : scope.data.hosts.total - scope.data.hosts.failed "value" : scope.data.hosts.total - scope.data.hosts.failed
} , } ,
{ "label": "FAILED", { "label": "FAILED",
@@ -82,7 +82,7 @@ function HostStatusGraph($compile, $window, adjustGraphSize, templateUrl) {
"value" : scope.data.hosts.failed "value" : scope.data.hosts.failed
} }
]; ];
colors = ['#5bbdbf', '#ff5850']; colors = ['#3cb878', '#ff5850'];
} }
host_pie_chart = nv.models.pieChart() host_pie_chart = nv.models.pieChart()
@@ -114,7 +114,7 @@ function HostStatusGraph($compile, $window, adjustGraphSize, templateUrl) {
color = "#ff5850"; color = "#ff5850";
} }
else{ else{
color = "#5bbdbf"; color = "#3CB878";
} }
d3.select(element.find(".nv-label text")[0]) d3.select(element.find(".nv-label text")[0])

2
awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.directive.js
View File

@@ -58,7 +58,7 @@ function JobStatusGraph($rootScope, $compile , $location, $window, Wait, adjustG
scope.status = status; scope.status = status;
var timeFormat, graphData = [ var timeFormat, graphData = [
{ "color": "#5bbdbf", { "color": "#3CB878",
"key": "SUCCESSFUL", "key": "SUCCESSFUL",
"values": data.jobs.successful "values": data.jobs.successful
}, },

34
awx/ui/client/src/dashboard/lists/dashboard-list.block.less
View File

@@ -6,12 +6,12 @@
flex: 1; flex: 1;
} }
.DashboardList--noJobTemplates { .DashboardList--noJobTemplates {
color: @db-list-empty-txt; color: @list-empty-txt;
} }
.DashboardList-header { .DashboardList-header {
display: flex; display: flex;
border-bottom: 1px solid @db-list-header-bord; border-bottom: 1px solid @list-header-bord;
height: 50px; height: 50px;
} }
@@ -20,7 +20,7 @@
margin: 0px; margin: 0px;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
color: @db-list-header-txt; color: @list-header-txt;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
white-space: nowrap; white-space: nowrap;
@@ -28,7 +28,7 @@
} }
.DashboardList-tableHeaderIcon { .DashboardList-tableHeaderIcon {
color: @db-list-header-icon; color: @list-header-icon;
} }
.DashboardList-viewAll { .DashboardList-viewAll {
@@ -72,8 +72,8 @@
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
text-transform: uppercase; text-transform: uppercase;
color: @db-list-header-txt; color: @list-header-txt;
background-color: @db-list-header-bg; background-color: @list-header-bg;
} }
.DashboardList-tableHeader--name { .DashboardList-tableHeader--name {
@@ -104,11 +104,11 @@
.DashboardList-tableRow { .DashboardList-tableRow {
height: 50px; height: 50px;
font-size: 14px; font-size: 14px;
color: @db-list-item; color: @list-item;
} }
.DashboardList-tableRow--evenRow { .DashboardList-tableRow--evenRow {
background-color: @db-list-alt-item-bg; background-color: @list-alt-item-bg;
} }
.DashboardList-status{ .DashboardList-status{
@@ -163,22 +163,22 @@
font-size: 16px; font-size: 16px;
height: 30px; height: 30px;
width: 30px; width: 30px;
color: @db-list-action-icon; color: @list-action-icon;
background-color: @db-list-actn-bg; background-color: @list-actn-bg;
border: 1px solid @db-list-actn-bord; border: 1px solid @list-actn-bord;
border-radius: 50%; border-radius: 50%;
transition: background-color 0.2s, border-color 0.2s, color 0.2s; transition: background-color 0.2s, border-color 0.2s, color 0.2s;
} }
.DashboardList-tableRow--evenRow > .DashboardList-actionButtonCell > .DashboardList-actionButton { .DashboardList-tableRow--evenRow > .DashboardList-actionButtonCell > .DashboardList-actionButton {
background-color: @db-list-actn-alt-bg; background-color: @list-actn-alt-bg;
border: 1px solid @db-list-actn-alt-bord; border: 1px solid @list-actn-alt-bord;
} }
.DashboardList-actionButton:hover { .DashboardList-actionButton:hover {
background-color: @db-list-actn-bg-hov !important; background-color: @list-actn-bg-hov !important;
border: 1px solid @db-list-actn-bord-hov !important; border: 1px solid @list-actn-bord-hov !important;
color: @db-list-actn-icn-hov; color: @list-actn-icn-hov;
border: none; border: none;
} }
@@ -193,5 +193,5 @@
} }
.DashboardList-noJobs { .DashboardList-noJobs {
color: @db-list-empty-txt; color: @list-empty-txt;
} }

40
awx/ui/client/src/shared/branding/colors.default.less
View File

@@ -27,6 +27,26 @@
@btn-bord-sel: @default-icon-hov; @btn-bord-sel: @default-icon-hov;
@btn-txt-sel: @default-bg; @btn-txt-sel: @default-bg;
// lists
@list-empty-txt: @default-interface-txt;
@list-header-bord: @default-bg;
@list-header-bg: #EBEBEB;
@list-header-txt: @default-interface-txt;
@list-header-icon: @default-icon;
@list-item: @default-data-txt;
@list-item-link: @default-link;
@list-item-link-hov: @default-link-hov;
@list-item-bg: @default-bg;
@list-alt-item-bg: @default-tertiary-bg;
@list-action-icon: @default-icon;
@list-actn-bg: @default-bg;
@list-actn-bord: @default-bg;
@list-actn-alt-bg: @default-tertiary-bg;
@list-actn-alt-bord: @default-tertiary-bg;
@list-actn-icn-hov: @default-bg;
@list-actn-bg-hov: @default-link;
@list-actn-bord-hov: @default-link;
// tooltups // tooltups
@tooltip-bg: @default-interface-txt; @tooltip-bg: @default-interface-txt;
@tooltip-txt: @default-bg; @tooltip-txt: @default-bg;
@@ -104,23 +124,3 @@
@db-graph-per-dd-bg-hov:@default-tertiary-bg; @db-graph-per-dd-bg-hov:@default-tertiary-bg;
@db-graph-axis: @default-border; @db-graph-axis: @default-border;
@db-graph-axis-label: @default-interface-txt; @db-graph-axis-label: @default-interface-txt;
// dashboard lists
@db-list-empty-txt: @default-interface-txt;
@db-list-header-bord: @default-bg;
@db-list-header-bg: #EBEBEB;
@db-list-header-txt: @default-interface-txt;
@db-list-header-icon: @default-icon;
@db-list-item: @default-data-txt;
@db-list-item-link: @default-link;
@db-list-item-link-hov: @default-link-hov;
@db-list-item-bg: @default-bg;
@db-list-alt-item-bg: @default-tertiary-bg;
@db-list-action-icon: @default-icon;
@db-list-actn-bg: @default-bg;
@db-list-actn-bord: @default-bg;
@db-list-actn-alt-bg: @default-tertiary-bg;
@db-list-actn-alt-bord: @default-tertiary-bg;
@db-list-actn-icn-hov: @default-bg;
@db-list-actn-bg-hov: @default-link;
@db-list-actn-bord-hov: @default-link;

2
awx/ui/client/src/shared/branding/colors.less
View File

@@ -26,7 +26,7 @@
@tip-background: #0088CC; @tip-background: #0088CC;
@tip-color: #fff; @tip-color: #fff;
@green: #5bbdbf; @green: #3cb878;
@red: #ff5850; @red: #ff5850;
@red-hover: #FA8C87; @red-hover: #FA8C87;
@red-focus: #FF1105; @red-focus: #FF1105;

33
awx/ui/client/src/smart-status/smart-status.block.less
View File

@@ -1,5 +1,6 @@
/** @define SmartStatus */ /** @define SmartStatus */
@import "awx/ui/client/legacy-styles/animations.less"; @import "awx/ui/client/legacy-styles/animations.less";
@import "../shared/branding/colors.default.less";
.SmartStatus-container{ .SmartStatus-container{
max-width: 165px; max-width: 165px;
@@ -12,19 +13,19 @@
} }
.SmartStatus--success{ .SmartStatus--success{
color: #5bbdbf; color: @default-succ;
margin-bottom: 20px; margin-bottom: 20px;
padding: 0px; padding: 0px;
} }
.SmartStatus--failed{ .SmartStatus--failed{
color: #ff5850; color: @default-err;
margin-top: 20px; margin-top: 20px;
padding: 0px; padding: 0px;
} }
.SmartStatus--running{ .SmartStatus--running{
color: #b7b7b7; color: @default-icon;
margin-top: 10px; margin-top: 10px;
padding: 0px; padding: 0px;
.pulsate(); .pulsate();
@@ -37,14 +38,14 @@
} }
.SmartStatus-tooltip--success{ .SmartStatus-tooltip--success{
color: #5bbdbf; color: #3cb878;
padding-left: 5px; padding-left: 5px;
padding-right: 0px; padding-right: 0px;
text-shadow: text-shadow:
-1px -1px 0 #fff, -1px -1px 0 @default-bg,
1px -1px 0 #fff, 1px -1px 0 @default-bg,
-1px 1px 0 #fff, -1px 1px 0 @default-bg,
1px 1px 0 #fff; 1px 1px 0 @default-bg;
} }
@@ -53,10 +54,10 @@
padding-left: 5px; padding-left: 5px;
padding-right: 0px; padding-right: 0px;
text-shadow: text-shadow:
-1px -1px 0 #fff, -1px -1px 0 @default-bg,
1px -1px 0 #fff, 1px -1px 0 @default-bg,
-1px 1px 0 #fff, -1px 1px 0 @default-bg,
1px 1px 0 #fff; 1px 1px 0 @default-bg;
} }
.SmartStatus-tooltip--running{ .SmartStatus-tooltip--running{
@@ -64,9 +65,9 @@
padding-left: 5px; padding-left: 5px;
padding-right: 0px; padding-right: 0px;
text-shadow: text-shadow:
-1px -1px 0 #fff, -1px -1px 0 @default-bg,
1px -1px 0 #fff, 1px -1px 0 @default-bg,
-1px 1px 0 #fff, -1px 1px 0 @default-bg,
1px 1px 0 #fff; 1px 1px 0 @default-bg;
.pulsate(); .pulsate();
} }