Moved Adminbar to Infobar

public/less/_admin.less

@@ -91,33 +91,6 @@
 	}
 }
 
-.adminbar {
-	&.main {
-		background-color: #2f363c;
-		border-bottom: 1px solid #454e57;
-		height: 41px;
-	}
-	&.text {
-		padding: @5 0 !important;
-		color: #fff !important;
-		font-size: 13px !important;
-	}
-	&.embed {
-		background: @primary;
-		padding: 3px @5;
-		border-radius: 4px;
-		margin: @5 3px;
-		font-size: 11px;
-	}
-	&.align {
-		margin-right: @5;
-	}
-	&.divider {
-		border-left: 1px solid #ababab;
-		margin-right: @10;
-	}
-}
-
 .admin-badge {
 	font-size: 10px !important;
 }

public/less/_base.less

@@ -598,11 +598,22 @@ footer {
 		border-bottom: 1px solid #454e57;
 		height: 41px;
 	}
+	&.embed {
+		background: @primary;
+		padding: 3px @5;
+		border-radius: 4px;
+		margin: @5 3px;
+		font-size: 11px;
+	}
 	&.text {
 		padding: @5 0 !important;
 		color: #fff !important;
 		font-size: 13px !important;
 	}
+	&.divider {
+		border-left: 1px solid #ababab;
+		margin-right: @10;
+	}
 }
 
 @media only screen and (max-width: 991px) and (min-width: 768px) {

templates/base/admin_bar.tmpl

@@ -1,30 +0,0 @@
-<div class="navbar container adminbar main">
-    <div class="ui grid">
-        <div class="column">
-            <div class="ui left floated header adminbar text">
-                <span class="adminbar align">
-                    Version <span class="adminbar embed">{{AppVer}}</span>
-                </span>
-                
-                <span class="adminbar align hide-mobile">
-                    Render
-                    <span class="adminbar embed">{{LoadTimes .PageStartTime}}</span>
-                </span>
-            </div>
-            <div class="ui right floated header adminbar text">
-                <div class="ui dropdown">
-                    {{if .Lab}}<i class="octicon octicon-pulse"></i>
-                    {{else}}<i class="octicon octicon-squirrel"></i>
-                    {{end}}
-                </div>
-
-                <span class="adminbar align hide-mobile">
-                    {{if .Lab}}Gitote:Lab{{else}}Gitote:Prod{{end}}
-                </span>
-                <span class="adminbar divider hide-mobile"></span>
-
-                <span>{{GoVer}}</span>
-            </div>
-        </div>
-    </div>
-</div>

templates/base/head.tmpl

@@ -95,9 +95,6 @@
 		{{if not .PageIsInstall}}
 		{{if not .PageIsSuspended}}
 			<div class="following bar light" style="{{if not .IsLogged}}padding-top:5px;padding-bottom:5px{{end}}">
-				{{if or .IsAdmin .IsStaff .IsIntern}}
-					{{template "base/admin_bar" .}}
-				{{end}}
 				{{if .IsLogged}}
 					{{template "base/info_bar" .}}
 				{{end}}

templates/base/info_bar.tmpl

@@ -2,6 +2,16 @@
     <div class="ui grid">
         <div class="column">
             <div class="ui left floated header infobar text">
+                {{if or .IsAdmin .IsStaff .IsIntern}}
+                    <span class="adminbar align">
+                        Version <span class="adminbar embed">{{AppVer}}</span>
+                    </span>
+                    
+                    <span class="adminbar align hide-mobile">
+                        Render
+                        <span class="adminbar embed">{{LoadTimes .PageStartTime}}</span>
+                    </span>
+                {{end}}
                 <span class="infobar align">
                     <span class="infobar heart">❤</span>
                     <span id="expansion" class="infobar expansion" onclick="document.getElementById('expansion').innerHTML = nextWord();">Get Into Text</span>
@@ -20,6 +30,20 @@
                 <a href="{{AppURL}}contact">
                     <span class="infobar">Support</span>
                 </a>
+                {{if or .IsAdmin .IsStaff .IsIntern}}
+                    <div class="ui dropdown">
+                        {{if .Lab}}<i class="octicon octicon-pulse"></i>
+                        {{else}}<i class="octicon octicon-squirrel"></i>
+                        {{end}}
+                    </div>
+                    <span class="adminbar align hide-mobile">
+                        {{if .Lab}}Gitote:Lab{{else}}Gitote:Prod{{end}}
+                    </span>
+                    
+                    <span class="adminbar divider hide-mobile"></span>
+
+                    <span>{{GoVer}}</span>
+                {{end}}
             </div>
         </div>
     </div>