From 5987d86a4b1ea9e7a0fe14670f2adec8a2b9e301 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 3 May 2016 14:48:34 -0400 Subject: [PATCH] update general styling of first-time license page --- awx/ui/client/src/footer/footer.block.less | 2 +- awx/ui/client/src/license/license.block.less | 29 +++++++++++++++++-- .../client/src/license/license.partial.html | 19 +++++++----- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/awx/ui/client/src/footer/footer.block.less b/awx/ui/client/src/footer/footer.block.less index 95ec11463d..3f40c009de 100644 --- a/awx/ui/client/src/footer/footer.block.less +++ b/awx/ui/client/src/footer/footer.block.less @@ -3,7 +3,7 @@ .Footer { height: 40px; - background-color: @default-no-items-bord; + background-color: @default-secondary-bg; color: @default-interface-txt; width: 100%; z-index: 1040; diff --git a/awx/ui/client/src/license/license.block.less b/awx/ui/client/src/license/license.block.less index 2204d37454..6493169a06 100644 --- a/awx/ui/client/src/license/license.block.less +++ b/awx/ui/client/src/license/license.block.less @@ -10,6 +10,13 @@ .License-container{ .OnePlusTwo-container; } + +.License-container--missing { + max-width: 800px; + margin: 0 auto; + padding: 0 20px; +} + .License-field--label{ .OnePlusTwo-left--detailsLabel; } @@ -33,10 +40,22 @@ .License-submit--success.ng-hide{ opacity: 0; } -.License-eula textarea{ + +.License-eulaNotice{ + font-size: 12px; width: 100%; - height: 200px; + max-height: 129px; + padding: 15px; + padding-top: 10px; + margin-bottom: 10px; + border-radius: 4px; + border: 1px solid @login-notice-border; + background-color: @login-notice-bg; + color: @login-notice-text; + overflow-y: scroll; + overflow-x: visible; } + .License-field label{ width: 155px; } @@ -76,9 +95,11 @@ color:@default-bg; } .License-downloadLicenseButton:hover{ + background-color: @default-link-hov !important; color:@default-bg !important; } .License-downloadLicenseButton:focus{ + background-color: @default-link-hov !important; color:@default-bg !important; } .License-submit--container{ @@ -111,3 +132,7 @@ border-top-right-radius: 4px !important; border-bottom-right-radius: 4px !important; } + +.License-detailsGroup { + margin-bottom: 20px; +} diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html index 414749c79d..0c109e361a 100644 --- a/awx/ui/client/src/license/license.partial.html +++ b/awx/ui/client/src/license/license.partial.html @@ -1,4 +1,5 @@ -
+
Details
@@ -102,14 +103,18 @@ {{fileName}}
-
End User License Agreement
-
- +
End User License Agreement
-
+
+ {{ license.eula }} +
+
-
I agree to the End User License Agreement
+