From 09fe4d76edfe3414b61fd1f7aec5082974f5a8c7 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 8 Feb 2015 16:02:13 +0200
Subject: mv CRI logo to co-exist by rhizi logo at page bottom

---
 res/client/css/partials/base.scss    | 13 ++++++++++---
 res/client/css/partials/top-bar.scss |  7 -------
 res/client/css/style.css             | 12 ++++++------
 res/templates/index.html             |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/res/client/css/partials/base.scss b/res/client/css/partials/base.scss
index 6595d656..7edebc53 100644
--- a/res/client/css/partials/base.scss
+++ b/res/client/css/partials/base.scss
@@ -70,9 +70,16 @@ input{
 }
 
 .rhizi-logo{
-  position:fixed;
+  position: fixed;
   color: $dark-grey;
-  bottom:10px;
-  right:10px;
+  bottom: 10px;
+  right: 10px;
   vertical-align: middle;
+}
+
+#org-logo__CRI {
+  position: fixed;
+  bottom: 10px;
+  right: 80px;
+  height: 30px;
 }
\ No newline at end of file
diff --git a/res/client/css/partials/top-bar.scss b/res/client/css/partials/top-bar.scss
index 258c83eb..c8aba010 100644
--- a/res/client/css/partials/top-bar.scss
+++ b/res/client/css/partials/top-bar.scss
@@ -50,10 +50,3 @@
   left: -20px;
   top: -10px;
 }
-
-.organization-logo {
-  display: inline-block;
-  margin-left: 12px;
-  min-height: 30px;
-  min-width: 30px;
-}
\ No newline at end of file
diff --git a/res/client/css/style.css b/res/client/css/style.css
index 5e96e7eb..b7434a43 100644
--- a/res/client/css/style.css
+++ b/res/client/css/style.css
@@ -829,12 +829,12 @@ body.debug .debug-ui-right {
   left: -20px;
   top: -10px; }
 
-.organization-logo {
-  display: inline-block;
-  margin-left: 12px;
-  background: url(../img/CRI-logo.png);
-  min-height: 30px;
-  min-width: 30px; }
+#org-logo__CRI {
+  position: fixed;
+  bottom: 10px;
+  right: 80px;
+  height: 30px;
+}
 
 /* Headings */
 h1 {
diff --git a/res/templates/index.html b/res/templates/index.html
index f52ac89b..8563cc69 100644
--- a/res/templates/index.html
+++ b/res/templates/index.html
@@ -17,7 +17,7 @@
         <div class="profile-circle"></div>
          <div class="profile-username">Welcome&nbsp;<span id="user_id">{{ rz_username }}</span>!<span id="btn-logout" class="button">Logout</span></div>
       </div>
-      <img class="organization-logo" src="/static/img/CRI-logo.png">
+      <img id="org-logo__CRI" src="/static/img/CRI-logo.png">
     </div>
   </div>
   <div class="search-bar">
-- 
cgit v1.3.1