From 9c0adcbb4e74b94d306e60923ca5dfd8437d221a Mon Sep 17 00:00:00 2001
From: Jared Tabor <jaredevantabor@gmail.com>
Date: Thu, 15 Jun 2017 12:58:15 -0700
Subject: [PATCH 1/4] adjustments to logos after feedback from trahman

---
 awx/ui/client/assets/variables.less              | 10 ++++++----
 awx/ui/client/src/about/about.block.less         |  2 ++
 awx/ui/client/src/main-menu/main-menu.block.less |  1 -
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/assets/variables.less b/awx/ui/client/assets/variables.less
index dfcf9a073c..b019bc9e69 100644
--- a/awx/ui/client/assets/variables.less
+++ b/awx/ui/client/assets/variables.less
@@ -5,14 +5,16 @@
 @login-margin:               -30px 20px 10px -30px;
 
 // Main nav bar logo
-@main-menu-width:           100px;
-@main-menu-margin:          20px;
-@main-menu-padding-top:     20px;
+@main-menu-width:           200px;
+@main-menu-margin:          -50px 0px 0px -40px;
 @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;
+@about-modal-padding-top:   inherit;
+@about-modal-margin-top:    -60px;
+@about-modal-margin-left:   -50px;
diff --git a/awx/ui/client/src/about/about.block.less b/awx/ui/client/src/about/about.block.less
index 87bd710fa3..f181041c59 100644
--- a/awx/ui/client/src/about/about.block.less
+++ b/awx/ui/client/src/about/about.block.less
@@ -35,6 +35,8 @@
 	float: @about-modal-float;
 	width: @about-modal-width;
 	padding-top: @about-modal-padding-top;
+	margin-top: @about-modal-margin-top;
+	margin-left: @about-modal-margin-left;
 }
 
 .About-close {
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 bd9ead56be..a851f894da 100644
--- a/awx/ui/client/src/main-menu/main-menu.block.less
+++ b/awx/ui/client/src/main-menu/main-menu.block.less
@@ -34,7 +34,6 @@
     height: @main-menu-height;
     width: @main-menu-width;
     margin: @main-menu-margin;
-    padding-top: @main-menu-padding-top;
 }
 
 .MainMenu-logoImage--licenseMissing:hover{

From eed39ccfc5b2c1eae41180dbf54b7b7e3f5054b0 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jaredevantabor@gmail.com>
Date: Thu, 15 Jun 2017 14:28:25 -0700
Subject: [PATCH 2/4] hiding copyright info for open source

---
 awx/ui/client/assets/variables.less          | 3 +++
 awx/ui/client/src/about/about.block.less     | 4 ++++
 awx/ui/client/src/about/about.partial.html   | 6 ++++--
 awx/ui/client/src/footer/footer.partial.html | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/assets/variables.less b/awx/ui/client/assets/variables.less
index b019bc9e69..e59deb6ebe 100644
--- a/awx/ui/client/assets/variables.less
+++ b/awx/ui/client/assets/variables.less
@@ -18,3 +18,6 @@
 @about-modal-padding-top:   inherit;
 @about-modal-margin-top:    -60px;
 @about-modal-margin-left:   -50px;
+
+// Copyright text should be hidden
+@copyright-text:            0;
diff --git a/awx/ui/client/src/about/about.block.less b/awx/ui/client/src/about/about.block.less
index f181041c59..6acf5e76a5 100644
--- a/awx/ui/client/src/about/about.block.less
+++ b/awx/ui/client/src/about/about.block.less
@@ -61,3 +61,7 @@
 .About-ansibleVersion {
 		color: @default-data-txt;
 }
+
+.Copyright-text{
+	opacity: @copyright-text;
+}
diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html
index 5874221a54..7ff5f4a16a 100644
--- a/awx/ui/client/src/about/about.partial.html
+++ b/awx/ui/client/src/about/about.partial.html
@@ -26,8 +26,10 @@
                       <span class="About-ansibleVersion">
                           Ansible {{ ansible_version }}
                       </span> <br>
-                      Copyright &copy; 2017 Red Hat, Inc. <br>
-                      Visit <a href="http://www.ansible.com/" target="_blank">Ansible.com</a> for more information.<br>
+                      <span class="Copyright-text">
+                          Copyright &copy; 2017 Red Hat, Inc. <br>
+                          Visit <a href="http://www.ansible.com/" target="_blank">Ansible.com</a> for more information.<br>
+                      </span>
                     </p>
                 </div>
         </div>
diff --git a/awx/ui/client/src/footer/footer.partial.html b/awx/ui/client/src/footer/footer.partial.html
index 4a34bde28a..6ba9ac7c47 100644
--- a/awx/ui/client/src/footer/footer.partial.html
+++ b/awx/ui/client/src/footer/footer.partial.html
@@ -1,3 +1,3 @@
 <footer class='Footer'>
-    <div class="Footer-copyright" ng-class="{'is-loggedOut' : !current_user || !current_user.username}">Copyright &copy 2017 <a class="Footer-link" href="http://www.redhat.com" target="_blank">Red Hat</a>, Inc.</div>
+    <div class="Footer-copyright Copyright-text" ng-class="{'is-loggedOut' : !current_user || !current_user.username}">Copyright &copy 2017 <a class="Footer-link" href="http://www.redhat.com" target="_blank">Red Hat</a>, Inc.</div>
 </footer>

From 33165553a9e210a59e123240d92e04fccfb89ff5 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jaredevantabor@gmail.com>
Date: Mon, 19 Jun 2017 18:14:11 -0700
Subject: [PATCH 3/4] fixing main menu logo on mobile breakpoint

---
 awx/ui/client/assets/variables.less           | 25 ++++++++++---------
 .../client/src/main-menu/main-menu.block.less |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/awx/ui/client/assets/variables.less b/awx/ui/client/assets/variables.less
index e59deb6ebe..bc988bf6b9 100644
--- a/awx/ui/client/assets/variables.less
+++ b/awx/ui/client/assets/variables.less
@@ -1,23 +1,24 @@
 // Default styles for AWX branding
 
 // Login modal icon
-@login-max-width:           200px;
-@login-margin:               -30px 20px 10px -30px;
+@login-max-width:               200px;
+@login-margin:                  -30px 20px 10px -30px;
 
 // Main nav bar logo
-@main-menu-width:           200px;
-@main-menu-margin:          -50px 0px 0px -40px;
-@main-menu-max-width:       inherit;
-@main-menu-max-height:      inherit;
-@main-menu-height:          inherit;
+@main-menu-width:               200px;
+@main-menu-margin:              -50px 0px 0px -40px;
+@main-menu-max-width:           initial;
+@main-menu-max-height:          initial;
+@main-menu-height:              initial;
+@main-menu-margin-breakpoint:   -55px 0px 0px -40px;
 
 
 // About modal logo
-@about-modal-float:         left;
-@about-modal-width:         200px;
-@about-modal-padding-top:   inherit;
-@about-modal-margin-top:    -60px;
-@about-modal-margin-left:   -50px;
+@about-modal-float:             left;
+@about-modal-width:             200px;
+@about-modal-padding-top:       initial;
+@about-modal-margin-top:        -60px;
+@about-modal-margin-left:       -50px;
 
 // Copyright text should be hidden
 @copyright-text:            0;
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 a851f894da..2a12ff8728 100644
--- a/awx/ui/client/src/main-menu/main-menu.block.less
+++ b/awx/ui/client/src/main-menu/main-menu.block.less
@@ -187,7 +187,7 @@
     }
 
     .MainMenu-logoImage {
-        margin-top: 15px;
+        margin: @main-menu-margin-breakpoint;
     }
 
     .MainMenu-item--notMobile {

From 6503d0cc8496786e1ff8e2939fe4fb4ca837a8a6 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jaredevantabor@gmail.com>
Date: Mon, 19 Jun 2017 18:51:14 -0700
Subject: [PATCH 4/4] mobile breakpoint

---
 awx/ui/client/assets/variables.less           | 28 +++++++++----------
 .../client/src/main-menu/main-menu.block.less |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/awx/ui/client/assets/variables.less b/awx/ui/client/assets/variables.less
index bc988bf6b9..0434a7f6fc 100644
--- a/awx/ui/client/assets/variables.less
+++ b/awx/ui/client/assets/variables.less
@@ -1,24 +1,24 @@
 // Default styles for AWX branding
 
 // Login modal icon
-@login-max-width:               200px;
-@login-margin:                  -30px 20px 10px -30px;
+@login-max-width:                   200px;
+@login-margin:                      -30px 20px 10px -30px;
 
 // Main nav bar logo
-@main-menu-width:               200px;
-@main-menu-margin:              -50px 0px 0px -40px;
-@main-menu-max-width:           initial;
-@main-menu-max-height:          initial;
-@main-menu-height:              initial;
-@main-menu-margin-breakpoint:   -55px 0px 0px -40px;
+@main-menu-width:                   200px;
+@main-menu-margin:                  -50px 0px 0px -40px;
+@main-menu-max-width:               initial;
+@main-menu-max-height:              initial;
+@main-menu-height:                  initial;
+@main-menu-margin-top-breakpoint:   -55px;
 
 
 // About modal logo
-@about-modal-float:             left;
-@about-modal-width:             200px;
-@about-modal-padding-top:       initial;
-@about-modal-margin-top:        -60px;
-@about-modal-margin-left:       -50px;
+@about-modal-float:                 left;
+@about-modal-width:                 200px;
+@about-modal-padding-top:           initial;
+@about-modal-margin-top:            -60px;
+@about-modal-margin-left:           -50px;
 
 // Copyright text should be hidden
-@copyright-text:            0;
+@copyright-text:                    0;
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 2a12ff8728..6dec896079 100644
--- a/awx/ui/client/src/main-menu/main-menu.block.less
+++ b/awx/ui/client/src/main-menu/main-menu.block.less
@@ -187,7 +187,7 @@
     }
 
     .MainMenu-logoImage {
-        margin: @main-menu-margin-breakpoint;
+        margin-top: @main-menu-margin-top-breakpoint;
     }
 
     .MainMenu-item--notMobile {