From 66c7c6b7a7f47deadc2009f3d2e18f99e9eb2275 Mon Sep 17 00:00:00 2001
From: russellballestrini <russell.ballestrini@gmail.com>
Date: Mon, 16 Oct 2017 10:31:40 -0400
Subject: [PATCH] 	modified:  
 remarkbox_theme_meta/static/theme/meta/css/diff.css 	modified:  
 remarkbox_theme_meta/templates/meta-base.j2

---
 .../static/theme/meta/css/diff.css            | 27 +++++++++++++++++++
 remarkbox_theme_meta/templates/meta-base.j2   | 13 ++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/remarkbox_theme_meta/static/theme/meta/css/diff.css b/remarkbox_theme_meta/static/theme/meta/css/diff.css
index 40a07b3..31f7b18 100644
--- a/remarkbox_theme_meta/static/theme/meta/css/diff.css
+++ b/remarkbox_theme_meta/static/theme/meta/css/diff.css
@@ -114,3 +114,30 @@ ul {
 .alert-success, .alert-notice {
   background-color: #517DA4;
 }
+
+.navlogotiny {
+  vertical-align: middle;
+  padding-left: 10px;
+  padding-right: 10px;
+  float: left;
+}
+
+input.rb-submit.search {
+  height: 28px;
+  line-height: 28px;
+  margin-left: 10px
+}
+
+@media screen and (max-width:750px) {
+  .navother {
+    top: 0px;
+  }
+  #keyword {
+    margin-left 10px;
+    margin-right: 10px;
+  }
+  #remarkbox-menu {
+    padding-left: 30px;
+  }
+}
+
diff --git a/remarkbox_theme_meta/templates/meta-base.j2 b/remarkbox_theme_meta/templates/meta-base.j2
index 14a2959..2ba385a 100644
--- a/remarkbox_theme_meta/templates/meta-base.j2
+++ b/remarkbox_theme_meta/templates/meta-base.j2
@@ -54,6 +54,8 @@
     {% endif %}
     
     <div id="remarkbox-menu">
+    <span class="avoidwrap">
+    <a href="{{ main_domain }}" class="navlogolink"><img src="/static/img/remarkbox-logo.png" width="16px" class="shown-on-tablet navlogotiny"></a>
     {%- block menu %}
     {% if request.namespace.name == request.domain %}
     <a href="/">{{ request.namespace.name }}</a>
@@ -63,16 +65,21 @@
     &nbsp;
     | 
     &nbsp;
+    </span>
    
-      {%- if request.user.authenticated %}
+    {%- if request.user.authenticated %}
+      <span class="hidden-on-tablet">
       <a href="/u/namespaces">my namespaces</a>
       &nbsp;
       |
       &nbsp;
+      </span>
+    <span class="avoidwrap">
       {{ snippets.user_link(request.user) }} <a href="/log-out">[log out]</a>
-      {% else %}
+    </span>
+    {% else %}
       <a href="/join-or-log-in">join-or-log-in</a>
-      {%- endif %}
+    {%- endif %}
     {%- endblock %}
     </div>
 </div>