top-bar: restoring original positioning for 3rd party logo

2 files changed, 18 insertions, 10 deletions

diff --git a/res/client/css/partials/base.scss b/res/client/css/partials/base.scss
index 95fb58a1..5fdf93b9 100644
--- a/res/client/css/partials/base.scss
+++ b/res/client/css/partials/base.scss
@@ -76,10 +76,7 @@ input{
   vertical-align: middle;
 }
 
-#org-logo__CRI {
-  position: fixed;
-  bottom: 10px;
-  right: 80px;
+.logo-3rd-party {
   height: 30px;
 }
 
diff --git a/res/client/css/partials/top-bar.scss b/res/client/css/partials/top-bar.scss
index 5b06d1dc..ead313a8 100644
--- a/res/client/css/partials/top-bar.scss
+++ b/res/client/css/partials/top-bar.scss
@@ -1,13 +1,11 @@
 .top-bar{
-    padding-top: 10px;
-    padding-bottom: 10px;
+    line-height: $four-baselines;
     background-color: $dark-grey;
 }
 
-.user-area {
-    display: inline;
-    float: right;
-    margin-right: 40px;
+.top-bar__user-area {
+    margin-right: 20px;
+    vertical-align: middle;
 }
 
 .username {
@@ -41,4 +39,17 @@
     color: $light-grey;
     margin-left: 40px;
     font-size: $h3-size;
+}
+
+#top-bar__float-right {
+    float: right;
+    margin-right: 20px;
+}
+
+#logo-3rd-party__CRI {
+    background-color: white;
+    border-radius: 3px;
+    height: 25px;
+    padding: 2px;
+    vertical-align: middle;
 }
\ No newline at end of file