Merge branch 'search_button' of https://github.com/Hugodby/botbot-web …

…into Hugodby-search_button
BotBotMe · Oct 28, 2015 · 72110e8 · 72110e8
2 parents 1d25c7c + c4eee6b
commit 72110e8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/botbot/less/responsive.less b/botbot/less/responsive.less
@@ -1,6 +1,6 @@
 /* We really only have problems on small devices in portrait
    mode, so tackle anything smaller than that */
-@media (max-width: 860px) {
+@media (max-width: 915px) {
 	.channel-nav .wicon span {
 		display: none;
 	}
@@ -124,7 +124,7 @@ and (max-width: 768px) {
 	.display_bbsponsor #Log-Container article {
 		margin-right: 0;
 	}
-	
+
 	.display_bbsponsor #Log-Container .timeline-navigation {
 	        width: auto;
 	        position: fixed;

diff --git a/botbot/static/css/screen.css b/botbot/static/css/screen.css
@@ -5855,7 +5855,7 @@ body.welcome-page .account-header {
 /* Responsive stuff is always last */
 /* We really only have problems on small devices in portrait
    mode, so tackle anything smaller than that */
-@media (max-width: 860px) {
+@media (max-width: 915px) {
   .channel-nav .wicon span {
     display: none;
   }

diff --git a/botbot/templates/logs/logs.html b/botbot/templates/logs/logs.html
@@ -1,12 +1,10 @@
 {% extends "base.html" %}
 
-
 {% block head_title %}IRC Logs for {{ channel.name }} {{ super() }}{% endblock %}
 {% block body_class %}log-view{% if big %} big{% endif %}{% if request.GET.framed %} framed{% endif %}
 {% if channel_ads %} display_bbsponsor{% endif %}{% endblock %}
 
 {% block content_outer %}
-
     <header id="Log-Header">
         <a href="/" class="brand-btn">
             <object data="{{ static("img/logo.svg") }}" type="image/svg+xml" id="Logo"></object>
@@ -23,26 +21,12 @@ <h4 class="date"></h4>
           <a href="#Log-Nav" class="nav-toggle"><i class="icon-calendar icon-large"></i></a>
         </nav>
 
-        <form id="Search" method="get" action="{{ channel_url(channel, 'log_search') }}">
+        <form id="Search" method="get" class="well form-search" action="{{ channel_url(channel, 'log_search') }}">
             {{ search_form.q }}
-            {# <a href="#" class="context-help"> <i class="icon-question-sign icon-large"></i></a> #}
+            <button class="btn" type="submit"><i class="icon icon-search"></i> Search</button>
         </form>
 
         <nav class="channel-nav">
-          {#
-          <span class="user-count wicon">
-            <i class="icon-group icon-large"></i>
-            {{ size }}
-          </span>
-          #}
-
-          {#
-          <a href="#" class="wicon">
-            <i class="icon-text-height icon-large"></i>
-            <span>Smaller Text</span>
-          </a>
-          #}
-
           {% if show_kudos %}
           <a href="{{ channel_url(channel, 'kudos') }}" class="wicon" title="Helpful individuals in this channel">
             <i class="icon-gift icon-large"></i>
@@ -63,8 +47,6 @@ <h4 class="date"></h4>
 
     <div id="Content" class="container-fluid">
       {% block content %}
-
-
       <!-- Current users: {{size}} -->
       <div id="Log-Container">
         <article>