From d32ba1b992da39d53be996802ab06dae77081fe6 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 12 Jun 2017 15:41:14 -0700 Subject: [PATCH 1/5] adding new AWX icons --- awx/ui/client/assets/favicon.ico | Bin 15086 -> 15086 bytes .../login/loginModal/loginModal.controller.js | 3 ++- .../src/main-menu/main-menu.partial.html | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/assets/favicon.ico b/awx/ui/client/assets/favicon.ico index 5003cda615bd139085627face4da71ed34c80f6e..550879805122719d52005b50d412f94106718180 100644 GIT binary patch literal 15086 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 Lu3f{Av{d-N$NdAy diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js index e65728cb21..8fcc27a27f 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.controller.js +++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js @@ -98,7 +98,8 @@ export default ['$log', '$cookies', '$compile', '$rootScope', scope.customLogo = $rootScope.custom_logo; scope.customLogoPresent = true; } else { - scope.customLogo = "tower-logo-login.svg"; + // scope.customLogo = "tower-logo-login.svg"; + scope.customLogo = "awx-logo-small.png"; scope.customLogoPresent = false; } scope.customLoginInfo = $AnsibleConfig.custom_login_info; diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html index 398488add7..f82e0b7a71 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -6,7 +6,8 @@ ng-class="{'is-loggedOut' : !current_user || !current_user.username, 'MainMenu-logoImage--licenseMissing': licenseMissing}"> + ng-src="/static/assets/awx-logo-small.png"> + From 7b1c25bc3b2f03b297d71b0e6b1bc5526ddf120d Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 12 Jun 2017 17:57:20 -0700 Subject: [PATCH 2/5] Creating .less files for Tower branding and AWX branding This separates the classes used for the Tower logos and the AWX logos, into two separate files which I placed in /assets. --- awx/ui/client/assets/awx_branding.block.less | 19 +++++++++++++++++ .../client/assets/tower_branding.block.less | 21 +++++++++++++++++++ awx/ui/client/legacy-styles/ansible-ui.less | 2 ++ awx/ui/client/src/about/about.block.less | 5 ----- awx/ui/client/src/about/about.partial.html | 3 ++- .../login/loginModal/loginModal.block.less | 4 ---- .../client/src/main-menu/main-menu.block.less | 8 ------- .../src/main-menu/main-menu.partial.html | 1 + 8 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 awx/ui/client/assets/awx_branding.block.less create mode 100644 awx/ui/client/assets/tower_branding.block.less diff --git a/awx/ui/client/assets/awx_branding.block.less b/awx/ui/client/assets/awx_branding.block.less new file mode 100644 index 0000000000..2685e8ce76 --- /dev/null +++ b/awx/ui/client/assets/awx_branding.block.less @@ -0,0 +1,19 @@ +// Styling for login modal logo +.LoginModal-logoImage, .LoginModal-logoImage--notCustom { + width: 200px; + margin: -30px 20px 10px -30px; +} + +// Styling for home button on left-hand side of the nav bar +.MainMenu-logoImage { + width: 100px; + margin: 20px; + padding-top: 20px; +} + +// Styling for the about modal +.About-brandImg { + float: left; + width: 200px; + padding-top: 13px; +} diff --git a/awx/ui/client/assets/tower_branding.block.less b/awx/ui/client/assets/tower_branding.block.less new file mode 100644 index 0000000000..441621ff56 --- /dev/null +++ b/awx/ui/client/assets/tower_branding.block.less @@ -0,0 +1,21 @@ +// Styling for login modal logo +.LoginModal-logoImage, .LoginModal-logoImage--notCustom { + max-width: 112px; + margin: 20px 20px 10px 20px; +} + +// Styling for home button on left-hand side of the nav bar +.MainMenu-logoImage { + max-width: 147px; + max-height: 50px; + height: 30px; + width: 93px; + margin: 20px; +} + +// Styling for the about modal +.About-brandImg { + float: left; + width: 112px; + padding-top: 13px; +} diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 30911ba194..694cb14974 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -43,6 +43,8 @@ @import "text-label.less"; @import "./bootstrap-datepicker.less"; @import "./client/src/shared/branding/colors.default.less"; +// @import "./client/assets/tower_branding.block.less"; +@import "./client/assets/awx_branding.block.less"; // Bootstrap default overrides @import "./client/src/shared/bootstrap-settings.less"; /* Bootstrap fix that's causing a right margin to appear diff --git a/awx/ui/client/src/about/about.block.less b/awx/ui/client/src/about/about.block.less index 73cd7a9937..0b041f716a 100644 --- a/awx/ui/client/src/about/about.block.less +++ b/awx/ui/client/src/about/about.block.less @@ -30,11 +30,6 @@ padding-top: 0px; padding-bottom: 0px; } -.About-brandImg { - float: left; - width: 112px; - padding-top: 13px; -} .About-close { position: absolute; diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 5874221a54..174d91ddfd 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -21,7 +21,8 @@
- + +

Ansible {{ ansible_version }} diff --git a/awx/ui/client/src/login/loginModal/loginModal.block.less b/awx/ui/client/src/login/loginModal/loginModal.block.less index 0f283846d6..d435d6c42d 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.block.less +++ b/awx/ui/client/src/login/loginModal/loginModal.block.less @@ -56,10 +56,6 @@ padding-right: 20px; } -.LoginModal-logoImage, .LoginModal-logoImage--notCustom { - max-width: 112px; - margin: 20px 20px 10px 20px; -} .LoginModal-alert { margin-bottom: 20px; diff --git a/awx/ui/client/src/main-menu/main-menu.block.less b/awx/ui/client/src/main-menu/main-menu.block.less index 0a20ccc07e..4c6be57237 100644 --- a/awx/ui/client/src/main-menu/main-menu.block.less +++ b/awx/ui/client/src/main-menu/main-menu.block.less @@ -27,14 +27,6 @@ background-color: @menu-link-bg; } -.MainMenu-logoImage { - max-width: 147px; - max-height: 50px; - height: 30px; - width: 93px; - margin: 20px; -} - .MainMenu-logoImage--licenseMissing:hover{ cursor:default; background-color: @default-bg!important; diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html index f82e0b7a71..eb5a519895 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -8,6 +8,7 @@ ng-class="{'MainMenu-logoImage--licenseMissing': licenseMissing}" ng-src="/static/assets/awx-logo-small.png"> + From 850c0d74a1136e8b0a83c8cf731b61fc7a1d50cb Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 13 Jun 2017 10:52:48 -0700 Subject: [PATCH 3/5] using .less variables for replacing styles and other feedback from PR --- awx/ui/client/assets/awx_branding.block.less | 19 ----------------- .../client/assets/tower_branding.block.less | 21 ------------------- awx/ui/client/legacy-styles/ansible-ui.less | 3 +-- awx/ui/client/src/about/about.block.less | 16 +++++++++----- awx/ui/client/src/about/about.partial.html | 2 +- .../login/loginModal/loginModal.block.less | 10 +++++++++ .../login/loginModal/loginModal.controller.js | 3 +-- .../client/src/main-menu/main-menu.block.less | 10 +++++++++ .../src/main-menu/main-menu.partial.html | 3 +-- 9 files changed, 35 insertions(+), 52 deletions(-) delete mode 100644 awx/ui/client/assets/awx_branding.block.less delete mode 100644 awx/ui/client/assets/tower_branding.block.less diff --git a/awx/ui/client/assets/awx_branding.block.less b/awx/ui/client/assets/awx_branding.block.less deleted file mode 100644 index 2685e8ce76..0000000000 --- a/awx/ui/client/assets/awx_branding.block.less +++ /dev/null @@ -1,19 +0,0 @@ -// Styling for login modal logo -.LoginModal-logoImage, .LoginModal-logoImage--notCustom { - width: 200px; - margin: -30px 20px 10px -30px; -} - -// Styling for home button on left-hand side of the nav bar -.MainMenu-logoImage { - width: 100px; - margin: 20px; - padding-top: 20px; -} - -// Styling for the about modal -.About-brandImg { - float: left; - width: 200px; - padding-top: 13px; -} diff --git a/awx/ui/client/assets/tower_branding.block.less b/awx/ui/client/assets/tower_branding.block.less deleted file mode 100644 index 441621ff56..0000000000 --- a/awx/ui/client/assets/tower_branding.block.less +++ /dev/null @@ -1,21 +0,0 @@ -// Styling for login modal logo -.LoginModal-logoImage, .LoginModal-logoImage--notCustom { - max-width: 112px; - margin: 20px 20px 10px 20px; -} - -// Styling for home button on left-hand side of the nav bar -.MainMenu-logoImage { - max-width: 147px; - max-height: 50px; - height: 30px; - width: 93px; - margin: 20px; -} - -// Styling for the about modal -.About-brandImg { - float: left; - width: 112px; - padding-top: 13px; -} diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 694cb14974..46957217e0 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -43,8 +43,7 @@ @import "text-label.less"; @import "./bootstrap-datepicker.less"; @import "./client/src/shared/branding/colors.default.less"; -// @import "./client/assets/tower_branding.block.less"; -@import "./client/assets/awx_branding.block.less"; +@import "./client/assets/variables.less"; // Bootstrap default overrides @import "./client/src/shared/bootstrap-settings.less"; /* Bootstrap fix that's causing a right margin to appear diff --git a/awx/ui/client/src/about/about.block.less b/awx/ui/client/src/about/about.block.less index 0b041f716a..87bd710fa3 100644 --- a/awx/ui/client/src/about/about.block.less +++ b/awx/ui/client/src/about/about.block.less @@ -1,6 +1,6 @@ /** @define About */ @import "./client/src/shared/branding/colors.default.less"; - +@import "./client/assets/variables.less"; .About-ansibleVersion, .About-cowsayCode { @@ -31,11 +31,17 @@ padding-bottom: 0px; } +.About-brandImg { + float: @about-modal-float; + width: @about-modal-width; + padding-top: @about-modal-padding-top; +} + .About-close { - position: absolute; - top: 15px; - right: 15px; - z-index: 10; + position: absolute; + top: 15px; + right: 15px; + z-index: 10; } .About-modalFooter { diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 174d91ddfd..50d3834ac1 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -21,7 +21,7 @@

- +

diff --git a/awx/ui/client/src/login/loginModal/loginModal.block.less b/awx/ui/client/src/login/loginModal/loginModal.block.less index d435d6c42d..13fb18c0e5 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.block.less +++ b/awx/ui/client/src/login/loginModal/loginModal.block.less @@ -1,4 +1,5 @@ @import "../../shared/branding/colors.default.less"; +@import "./client/assets/variables.less"; /** @define LoginModal */ .LoginModal-backDrop { @@ -56,6 +57,15 @@ padding-right: 20px; } +.LoginModal-logoImage { + max-width: 112px; + margin: 20px 20px 10px 20px; +} + +.LoginModal-logoImage--notCustom { + max-width: @login-max-width; + margin: @login-magin; +} .LoginModal-alert { margin-bottom: 20px; diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js index 8fcc27a27f..8abe4993f9 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.controller.js +++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js @@ -98,8 +98,7 @@ export default ['$log', '$cookies', '$compile', '$rootScope', scope.customLogo = $rootScope.custom_logo; scope.customLogoPresent = true; } else { - // scope.customLogo = "tower-logo-login.svg"; - scope.customLogo = "awx-logo-small.png"; + scope.customLogo = "default-logo-large.png"; scope.customLogoPresent = false; } scope.customLoginInfo = $AnsibleConfig.custom_login_info; diff --git a/awx/ui/client/src/main-menu/main-menu.block.less b/awx/ui/client/src/main-menu/main-menu.block.less index 4c6be57237..bd9ead56be 100644 --- a/awx/ui/client/src/main-menu/main-menu.block.less +++ b/awx/ui/client/src/main-menu/main-menu.block.less @@ -1,4 +1,5 @@ @import "../shared/branding/colors.default.less"; +@import "./client/assets/variables.less"; /** @define MainMenu */ @@ -27,6 +28,15 @@ background-color: @menu-link-bg; } +.MainMenu-logoImage { + max-width: @main-menu-max-width; + max-height: @main-menu-max-height; + height: @main-menu-height; + width: @main-menu-width; + margin: @main-menu-margin; + padding-top: @main-menu-padding-top; +} + .MainMenu-logoImage--licenseMissing:hover{ cursor:default; background-color: @default-bg!important; diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html index eb5a519895..2bd354610a 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -6,9 +6,8 @@ ng-class="{'is-loggedOut' : !current_user || !current_user.username, 'MainMenu-logoImage--licenseMissing': licenseMissing}"> + ng-src="/static/assets/default-logo-small.png"> - From e81c6d3c163da6b934beae476214004c6ad8cd6d Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 13 Jun 2017 13:56:22 -0700 Subject: [PATCH 4/5] committing AWX svg icons from trahman and committing the variables.less, I don't think it got picked up in my last commit --- awx/ui/client/assets/tower-logo-header.svg | 2 +- awx/ui/client/assets/tower-logo-login.svg | 2 +- awx/ui/client/assets/variables.less | 18 ++++++++++++++++++ awx/ui/client/src/about/about.partial.html | 3 +-- .../login/loginModal/loginModal.controller.js | 2 +- .../src/main-menu/main-menu.partial.html | 3 +-- 6 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 awx/ui/client/assets/variables.less diff --git a/awx/ui/client/assets/tower-logo-header.svg b/awx/ui/client/assets/tower-logo-header.svg index 61e1de41da..b78bfbd3c9 100644 --- a/awx/ui/client/assets/tower-logo-header.svg +++ b/awx/ui/client/assets/tower-logo-header.svg @@ -1 +1 @@ - \ No newline at end of file +awl-logo-small \ No newline at end of file diff --git a/awx/ui/client/assets/tower-logo-login.svg b/awx/ui/client/assets/tower-logo-login.svg index 2db9414ecd..b78bfbd3c9 100644 --- a/awx/ui/client/assets/tower-logo-login.svg +++ b/awx/ui/client/assets/tower-logo-login.svg @@ -1 +1 @@ -tower-logo-login2 \ No newline at end of file +awl-logo-small \ No newline at end of file diff --git a/awx/ui/client/assets/variables.less b/awx/ui/client/assets/variables.less new file mode 100644 index 0000000000..0e599621f6 --- /dev/null +++ b/awx/ui/client/assets/variables.less @@ -0,0 +1,18 @@ +// Default styles for AWX branding + +// Login modal icon +@login-max-width: 200px; +@login-magin: -30px 20px 10px -30px; + +// Main nav bar logo +@main-menu-width: 100px; +@main-menu-margin: 20px; +@main-menu-padding-top: 20px; +@main-menu-max-width: inherit; +@main-menu-max-height: inherit; +@main-menu-height: inherit; + +// About modal logo +@about-modal-float: left; +@about-modal-width: 200px; +@about-modal-padding-top: 13px; diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 50d3834ac1..5874221a54 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -21,8 +21,7 @@

- - +

Ansible {{ ansible_version }} diff --git a/awx/ui/client/src/login/loginModal/loginModal.controller.js b/awx/ui/client/src/login/loginModal/loginModal.controller.js index 8abe4993f9..e65728cb21 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.controller.js +++ b/awx/ui/client/src/login/loginModal/loginModal.controller.js @@ -98,7 +98,7 @@ export default ['$log', '$cookies', '$compile', '$rootScope', scope.customLogo = $rootScope.custom_logo; scope.customLogoPresent = true; } else { - scope.customLogo = "default-logo-large.png"; + scope.customLogo = "tower-logo-login.svg"; scope.customLogoPresent = false; } scope.customLoginInfo = $AnsibleConfig.custom_login_info; diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html index 2bd354610a..398488add7 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -6,8 +6,7 @@ ng-class="{'is-loggedOut' : !current_user || !current_user.username, 'MainMenu-logoImage--licenseMissing': licenseMissing}"> - + ng-src="/static/assets/tower-logo-header.svg"> From 09f5df004c51e48a9708fd3ebf0e4824edb15457 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 14 Jun 2017 10:52:14 -0700 Subject: [PATCH 5/5] fixing typo --- awx/ui/client/assets/variables.less | 2 +- awx/ui/client/src/login/loginModal/loginModal.block.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/assets/variables.less b/awx/ui/client/assets/variables.less index 0e599621f6..dfcf9a073c 100644 --- a/awx/ui/client/assets/variables.less +++ b/awx/ui/client/assets/variables.less @@ -2,7 +2,7 @@ // Login modal icon @login-max-width: 200px; -@login-magin: -30px 20px 10px -30px; +@login-margin: -30px 20px 10px -30px; // Main nav bar logo @main-menu-width: 100px; diff --git a/awx/ui/client/src/login/loginModal/loginModal.block.less b/awx/ui/client/src/login/loginModal/loginModal.block.less index 13fb18c0e5..4aae364bcc 100644 --- a/awx/ui/client/src/login/loginModal/loginModal.block.less +++ b/awx/ui/client/src/login/loginModal/loginModal.block.less @@ -64,7 +64,7 @@ .LoginModal-logoImage--notCustom { max-width: @login-max-width; - margin: @login-magin; + margin: @login-margin; } .LoginModal-alert {