diff --git a/awx/ui/client/features/projects/projectsList.controller.js b/awx/ui/client/features/projects/projectsList.controller.js index fcfecba65f..fcddcd46b7 100644 --- a/awx/ui/client/features/projects/projectsList.controller.js +++ b/awx/ui/client/features/projects/projectsList.controller.js @@ -417,6 +417,16 @@ function projectsListController ( } return tooltip; } + + vm.isCollapsed = true; + + vm.onCollapse = () => { + vm.isCollapsed = true; + }; + + vm.onExpand = () => { + vm.isCollapsed = false; + }; } projectsListController.$inject = [ diff --git a/awx/ui/client/features/projects/projectsList.view.html b/awx/ui/client/features/projects/projectsList.view.html index 78cb78ddf2..7949234ddc 100644 --- a/awx/ui/client/features/projects/projectsList.view.html +++ b/awx/ui/client/features/projects/projectsList.view.html @@ -19,67 +19,78 @@ + +
- - -
-
- {{ :: vm.strings.get('list.ROW_ITEM_LABEL_REVISION') }} -
- -
- - - - - - -
-
-
-
- +
+ + +
+
+
+ +
+
+ + + + + +
- - - - - - +
+
+
+ {{ :: vm.strings.get('list.ROW_ITEM_LABEL_REVISION') }} +
+ +
+ + + + + + +
diff --git a/awx/ui/client/lib/components/list/_index.less b/awx/ui/client/lib/components/list/_index.less index 2127f0a823..f402826a82 100644 --- a/awx/ui/client/lib/components/list/_index.less +++ b/awx/ui/client/lib/components/list/_index.less @@ -118,7 +118,7 @@ } .at-Row--collapsed { - max-height: 50px !important; + max-height: 50px; } .at-Row--active { border-left: @at-border-style-list-active-indicator; @@ -174,7 +174,6 @@ .at-Row-actions { display: flex; - flex-wrap: wrap; } .at-Row-items { @@ -351,8 +350,10 @@ } @media screen and (max-width: @at-breakpoint-compact-list) { - .at-Row-actions { - flex-direction: column; + .at-Row--collapsed { + max-height: 60px; + } + .at-Row-actions { align-items: center; } diff --git a/awx/ui/client/lib/components/truncate/_index.less b/awx/ui/client/lib/components/truncate/_index.less index 80e3c8f8a4..b4e4cb9dd5 100644 --- a/awx/ui/client/lib/components/truncate/_index.less +++ b/awx/ui/client/lib/components/truncate/_index.less @@ -1,16 +1,19 @@ .at-Truncate { - display: flex; - align-items: center; - height: 100%; + display: inline-block; .at-Truncate-text { font-family: monospace, Courier, "Courier New", "Open Sans", sans-serif; } + .at-Truncate-tag { + display: inherit; + } + .at-Truncate-copy { color: @at-gray-b7; cursor: pointer; - margin-left: 10px; + margin: 0 20px 0 0; + display: inherit; i:hover { color: @at-blue;