From 1cf3a259eeeab0c0754e099cb9009db199d20a6e Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Wed, 11 Jan 2017 18:04:47 -0500 Subject: [PATCH 1/3] add view more/less logic to credential owners related to #3313 --- .../src/credentials/ownerList.partial.html | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/src/credentials/ownerList.partial.html b/awx/ui/client/src/credentials/ownerList.partial.html index 1ed46c081b..8fde4f3c0a 100644 --- a/awx/ui/client/src/credentials/ownerList.partial.html +++ b/awx/ui/client/src/credentials/ownerList.partial.html @@ -1,5 +1,12 @@ -
- {{ owner.name }}{{$last ? '' : ', '}} - {{ owner.name }}{{$last ? '' : ', '}} - {{ owner.name }}{{$last ? '' : ', '}} -
+
+
+ {{ owner.name }}{{$last ? '' : ', '}} + {{ owner.name }}{{$last ? '' : ', '}} + {{ owner.name }}{{$last ? '' : ', '}} +
+ +
View More
+
View Less
+
\ No newline at end of file From ee0295a37836fa8a14490bc9e12b023433114479 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 12 Jan 2017 10:55:54 -0500 Subject: [PATCH 2/3] css mods --- .../src/credentials/ownerList.block.less | 37 +++++++++++++++++++ .../src/credentials/ownerList.partial.html | 8 ++-- 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 awx/ui/client/src/credentials/ownerList.block.less diff --git a/awx/ui/client/src/credentials/ownerList.block.less b/awx/ui/client/src/credentials/ownerList.block.less new file mode 100644 index 0000000000..7f6272a302 --- /dev/null +++ b/awx/ui/client/src/credentials/ownerList.block.less @@ -0,0 +1,37 @@ +/** @define OwnerList */ +@import "./client/src/shared/branding/colors.default.less"; + +.OwnerList { + display: flex; + flex-wrap: wrap; + align-items: flex-start; +} + +.OwnerList-seeBase { + display: flex; + max-width: 100%; + + color: @default-link; + margin: 5px 0px; + text-transform: uppercase; + padding: 2px 0px; + cursor: pointer; + border-radius: 5px; + font-size: 11px; +} + +.OwnerList-seeBase:hover { + color: @default-link-hov; +} + +.OwnerList-seeLess { + .OwnerList-seeBase; +} + +.OwnerList-seeMore { + .OwnerList-seeBase; +} + +.OwnerList-Container { + margin-right: 5px; +} diff --git a/awx/ui/client/src/credentials/ownerList.partial.html b/awx/ui/client/src/credentials/ownerList.partial.html index 8fde4f3c0a..5c73ac4d15 100644 --- a/awx/ui/client/src/credentials/ownerList.partial.html +++ b/awx/ui/client/src/credentials/ownerList.partial.html @@ -1,12 +1,12 @@ -
-
+ \ No newline at end of file From 2215f8561bfb85005f5f4dd3e956357891641d56 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 12 Jan 2017 15:05:01 -0500 Subject: [PATCH 3/3] better spacing --- awx/ui/client/src/credentials/ownerList.block.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/awx/ui/client/src/credentials/ownerList.block.less b/awx/ui/client/src/credentials/ownerList.block.less index 7f6272a302..64f76db17b 100644 --- a/awx/ui/client/src/credentials/ownerList.block.less +++ b/awx/ui/client/src/credentials/ownerList.block.less @@ -12,9 +12,8 @@ max-width: 100%; color: @default-link; - margin: 5px 0px; text-transform: uppercase; - padding: 2px 0px; + padding: 2px 15px; cursor: pointer; border-radius: 5px; font-size: 11px;