diff --git a/awx/ui/client/src/portal-mode/portal-mode.block.less b/awx/ui/client/src/portal-mode/portal-mode.block.less
index 747ceab325..a75aa028ae 100644
--- a/awx/ui/client/src/portal-mode/portal-mode.block.less
+++ b/awx/ui/client/src/portal-mode/portal-mode.block.less
@@ -17,7 +17,8 @@
}
.List-header {
- height: 20px;
+ height: 14px;
+ margin-bottom: 20px;
}
}
.PortalMode-panelHeader{
diff --git a/awx/ui/client/src/projects/projects.list.js b/awx/ui/client/src/projects/projects.list.js
index f4d504304c..a43db7d900 100644
--- a/awx/ui/client/src/projects/projects.list.js
+++ b/awx/ui/client/src/projects/projects.list.js
@@ -35,7 +35,7 @@ export default ['i18n', function(i18n) {
name: {
key: true,
label: i18n._('Name'),
- columnClass: "col-lg-4 col-md-4 col-sm-5 col-xs-7 List-staticColumnAdjacent",
+ columnClass: "col-lg-4 col-md-4 col-sm-4 col-xs-7 List-staticColumnAdjacent",
modalColumnClass: 'col-md-8',
awToolTip: '{{project.description | sanitize}}',
dataPlacement: 'top'
@@ -44,18 +44,18 @@ export default ['i18n', function(i18n) {
label: i18n._('Type'),
ngBind: 'project.type_label',
excludeModal: true,
- columnClass: 'col-lg-2 col-md-2 col-sm-3 hidden-xs'
+ columnClass: 'col-lg-2 col-md-2 col-sm-2 hidden-xs'
},
scm_revision: {
label: i18n._('Revision'),
excludeModal: true,
- columnClass: 'List-tableCell col-lg-4 col-md-2 col-sm-3 hidden-xs',
+ columnClass: 'List-tableCell col-lg-2 col-md-2 hidden-sm hidden-xs',
type: 'revision'
},
last_updated: {
label: i18n._('Last Updated'),
filter: "longDate",
- columnClass: "col-lg-3 col-md-3 hidden-sm hidden-xs",
+ columnClass: "col-lg-3 hidden-md hidden-sm hidden-xs",
excludeModal: true,
nosort: true
}
@@ -82,8 +82,13 @@ export default ['i18n', function(i18n) {
fieldActions: {
- columnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-5',
-
+ columnClass: 'col-lg-4 col-md-3 col-sm-4 col-xs-5',
+ edit: {
+ ngClick: "editProject(project.id)",
+ awToolTip: i18n._('Edit the project'),
+ dataPlacement: 'top',
+ ngShow: "project.summary_fields.user_capabilities.edit"
+ },
scm_update: {
ngClick: 'SCMUpdate(project.id, $event)',
awToolTip: "{{ project.scm_update_tooltip }}",
@@ -108,12 +113,6 @@ export default ['i18n', function(i18n) {
dataPlacement: 'top',
ngShow: 'project.summary_fields.user_capabilities.copy'
},
- edit: {
- ngClick: "editProject(project.id)",
- awToolTip: i18n._('Edit the project'),
- dataPlacement: 'top',
- ngShow: "project.summary_fields.user_capabilities.edit"
- },
view: {
ngClick: "editProject(project.id)",
awToolTip: i18n._('View the project'),
diff --git a/awx/ui/client/src/scheduler/scheduleToggle.block.less b/awx/ui/client/src/scheduler/scheduleToggle.block.less
index b234a0b5f2..8a90281050 100644
--- a/awx/ui/client/src/scheduler/scheduleToggle.block.less
+++ b/awx/ui/client/src/scheduler/scheduleToggle.block.less
@@ -15,8 +15,9 @@
background-color: @default-link;
margin-top: 2px;
cursor: pointer;
- display: inline-block;
- min-width: 42px;
+ display: flex;
+ justify-content: flex-end;
+ width: 42px;
&.ScheduleToggle--disabled {
cursor: not-allowed;
@@ -32,30 +33,27 @@
.ScheduleToggle-switch {
color: @default-link;
background-color: @default-bg;
- margin-left: 7px;
border-left: 1px solid @default-link;
- margin-right: 0px;
text-align: center;
text-transform: uppercase;
font-size: 11px;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
- padding-top: 0px;
+ padding: 0px 5px;
border-top: 0px;
border-bottom: 0px;
border-right: 0px;
- display: inline-block;
- height: 22px;
+ height: 16px;
+ line-height: 16px;
}
.ScheduleToggle.is-on {
border-color: @default-link;
background-color: @default-bg;
+ justify-content: flex-start;
}
.ScheduleToggle-switch.is-on {
- margin-right: 5px;
- margin-left: 0px;
background-color: @default-link;
color: @default-bg;
border-left: 0;
@@ -63,6 +61,7 @@
border-bottom-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
+ padding: 0 7px;
}
.ScheduleToggle-switch:hover {
diff --git a/awx/ui/client/src/templates/templates.list.js b/awx/ui/client/src/templates/templates.list.js
index 17534209f2..434825355b 100644
--- a/awx/ui/client/src/templates/templates.list.js
+++ b/awx/ui/client/src/templates/templates.list.js
@@ -76,6 +76,15 @@ export default ['i18n', function(i18n) {
columnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-3',
+ edit: {
+ label: i18n._('Edit'),
+ ngClick: "editJobTemplate(template)",
+ awToolTip: i18n._('Edit template'),
+ "class": 'btn-default btn-xs',
+ dataPlacement: 'top',
+ ngShow: 'template.summary_fields.user_capabilities.edit',
+ editStateParams: ['job_template_id', 'workflow_job_template_id']
+ },
submit: {
// The submit key lets the list generator know that we want to use the
// at-launch-template directive
@@ -95,15 +104,6 @@ export default ['i18n', function(i18n) {
dataPlacement: 'top',
ngShow: 'template.summary_fields.user_capabilities.copy'
},
- edit: {
- label: i18n._('Edit'),
- ngClick: "editJobTemplate(template)",
- awToolTip: i18n._('Edit template'),
- "class": 'btn-default btn-xs',
- dataPlacement: 'top',
- ngShow: 'template.summary_fields.user_capabilities.edit',
- editStateParams: ['job_template_id', 'workflow_job_template_id']
- },
view: {
label: i18n._('View'),
ngClick: "editJobTemplate(template)",
diff --git a/awx/ui/client/src/workflow-results/standard-out.block.less b/awx/ui/client/src/workflow-results/standard-out.block.less
index 980f401c75..c5fad72826 100644
--- a/awx/ui/client/src/workflow-results/standard-out.block.less
+++ b/awx/ui/client/src/workflow-results/standard-out.block.less
@@ -2,122 +2,10 @@
@breakpoint-md: 1180px;
-standard-out-log {
- flex: 5;
- display: flex;
- min-height: 0;
-}
-
-.StandardOut-preContent{
- font-size: 12px;
- padding: 0 20px 0 20px;
- font-family: Menlo,Monaco,Consolas,"Courier New",monospace;
-}
-
-.StandardOut-container {
- .OnePlusOne-container(100%, @breakpoint-md);
-
- &.fullscreen {
- .StandardOut-rightPanel {
- max-width: 100%;
- }
- }
-}
-
-.StandardOut-leftPanel {
- .OnePlusOne-panel--left(100%, @breakpoint-md);
- max-width: 600px;
- display: flex;
- @media (max-width: @breakpoint-md - 1px) {
- max-width: 100%;
- }
-
- .Panel {
- height: ~"calc(100% - 20px)";
- overflow-y: scroll;
- }
-}
-
-.StandardOut-rightPanel {
- .OnePlusOne-panel--right(100%, @breakpoint-md);
- max-width: ~"calc(100% - 615px)";
- @media (max-width: @breakpoint-md - 1px) {
- padding-right: 15px;
- }
-
- .Panel {
- display: flex;
- flex-direction: column;
- height: ~"calc(100% - 20px)";
- }
-}
-
.StandardOut-panelHeader {
.OnePlusOne-panelHeader
}
-.StandardOut-consoleOutput {
- margin-top: 25px;
- border-radius: 5px;
- width: 100%;
- overflow: auto;
-}
-
-.StandardOut-details {
- display: flex;
- flex-wrap: wrap;
- flex-direction: row;
- padding-top: 25px;
-}
-
-.StandardOut-detailsRow {
- width: 100%;
- display: flex;
- margin: 0 -15px;
-}
-
-.StandardOut-detailsRow + .StandardOut-detailsRow {
- margin-top: 20px;
-}
-
-.StandardOut-detailsRow--extraVars {
- margin: 20px 0;
- width: 100%;
-}
-
-.StandardOut-extraVarsContainer {
- width: 100%;
- padding-right: 15px;
-}
-
-.StandardOut-detailsLabel {
- text-transform: uppercase;
- color: @default-interface-txt;
-}
-
-.StandardOut-detailsContent {
- width: 40%;
- flex: 1 0 auto;
- padding: 0px 29px;
- text-transform: none;
- word-wrap: break-word;
-}
-
-.StandardOut-statusText {
- margin-left: 6px;
-}
-
-.StandardOut--capitalize {
- text-transform: capitalize;
-}
-
-.StandardOut-preContainer {
- height: 100%;
- border: 1px solid @d7grey;
- background: @default-secondary-bg;
- color: @default-interface-txt;
-}
-
.StandardOut-panelHeaderText {
align-items: center;
flex: 1 0 auto;
@@ -130,10 +18,6 @@ standard-out-log {
font-size: 12px;
}
-.StandardOut-actions {
- display: flex;
-}
-
.StandardOut-actionButton {
font-size: 16px;
height: 20px;
@@ -160,13 +44,3 @@ standard-out-log {
.StandardOut-actionButton + a {
margin-left: 15px;
}
-
-.StandardOut-seeMoreLess {
- color: #337AB7;
- margin: 4px 0px;
- text-transform: uppercase;
- padding: 2px 0px;
- cursor: pointer;
- border-radius: 5px;
- font-size: 11px;
-}
\ No newline at end of file