Merge branch 'master' of https://github.com/ewhal/nyaa

public/css/style.css

@@ -188,11 +188,33 @@ div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:last-of-typ
 .navbar {
     border-radius: 0px;
 }
-.navbar-nav>li>a.profile-image {
-    padding-top: 10px;
-    padding-bottom: 10px;
-}
 
 :target {
     background-color: #e5eecc;
 }
+#mainmenu button .search_text {
+	display: none;
+}
+#mainmenu .navbar-form select.form-control
+{
+	width: 12rem;
+}
+.special-img 
+{
+    position: relative;
+    top: -5px;
+    float: left;
+    left: -5px;
+}
+
+#mainmenu .badgemenu .profile-image {
+	line-height: 35px;
+}
+
+#mainmenu .navbar-header, #mainmenu .navbar-nav, #mainmenu .navbar-form {
+	padding-top: 10px;
+}
+
+#mainmenu .badgemenu {
+	padding-top: 0;
+}

templates/_badgemenu.html

@@ -1,22 +1,23 @@
 {{define "badge_user"}}
 {{with .User}}
+	<ul class="nav navbar-nav navbar-right badgemenu">
 		<li class="dropdown">
 			{{if gt .Id 0}}
-		    <a href="{{ genRoute "user_profile" "id" (print .Id) "username" .Username }}" class="dropdown-toggle" data-toggle="dropdown">
-		    <img src="https://www.gravatar.com/avatar/{{ .Md5 }}?s=50" class="profile-image img-circle"> {{ .Username }} <b class="caret"></b></a>
+		    <a href="{{ genRoute "user_profile" "id" (print .Id) "username" .Username }}" class="dropdown-toggle profile-image" data-toggle="dropdown">
+		    <img src="https://www.gravatar.com/avatar/{{ .Md5 }}?s=50" class="img-circle special-img"> {{ .Username }} <b class="caret"></b></a>
 		    <ul class="dropdown-menu">
 		        <li><a href="{{ genRoute "user_profile" "id" (print .Id) "username" .Username }}"><i class="fa fa-cog"></i> Profile</a></li>
 		        <li class="divider"></li>
 		        <li><a href="#soon"><i class="fa fa-sign-out"></i> Sign-out</a></li>
 		    </ul>
 		    {{ else }}
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Other<span class="caret"></span></a>
+            <a href="#" class="dropdown-toggle profile-image" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Member<span class="caret"></span></a>
             <ul class="dropdown-menu">
                 <li><a href="{{ genRoute "user_login" }}"><i class="fa fa-sign-out"></i> Sign in</a></li>
                 <li><a href="{{ genRoute "user_register" }}"><i class="fa fa-cog"></i> Sign Up</a></li>
-                <li><a href="irc://irc.rizon.net/nyaapantsu">IRC</a></li>
             </ul>
 	{{end}}
 		</li>
+		</ul>
 {{end}}
 {{end}}

templates/_search.html

@@ -67,7 +67,7 @@
   <div class="input-group">
     <input name="q" class="form-control input-sm" placeholder="Search" type="text" value="{{.Search.Query}}">
     <span class="input-group-btn">
-      <button type="submit" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> Search</button>
+      <button type="submit" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-search" aria-hidden="true"></span><span class="search_text"> Search</span></button>
     </span>
   </div>
 {{end}}

templates/index.html

@@ -46,12 +46,15 @@
                       <li><a href="{{.URL.Parse "/faq"}}">FAQ</a></li>
                       <li><a href="{{ genRouteWithQuery "feed" .URL }}">RSS</a></li>
                       <li><a href="https://sukebei.pantsu.cat">Fap</a></li>
-                      {{block "badge_user" .}}{{end}}
+                      <li><a href="irc://irc.rizon.net/nyaapantsu">IRC</a></li>
 
                   </ul>
+                  {{block "badge_user" .}}{{end}}
                   <form class="navbar-form navbar-right" role="search" action="/search" method="get">
                       <div class="form-group">
                         {{block "search_common" .}}{{end}}
+                      </div>
+                      <div class="form-group">
                         {{block "search_button" .}}{{end}}
                       </div>
                   </form>