# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2017-03-01 02:53:06
# Node ID 51caa592b8f0a85f00e3ad322b327fdc30f2bfec
# Parent  302af1ceaeddfe411f637c1c102b17c0a9332bdd

style: fix weird styling of quick login

diff --git a/kallithea/public/css/contextbar.css b/kallithea/public/css/contextbar.css
--- a/kallithea/public/css/contextbar.css
+++ b/kallithea/public/css/contextbar.css
@@ -97,6 +97,7 @@ ul.horizontal-list > li ul {
     z-index: 999;
 }
 
+nav.navbar #quick_login a.list-group-item,
 nav.navbar #quick li ul li,
 ul.navbar-nav ul li,
 ul.horizontal-list ul li {
diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css
--- a/kallithea/public/css/style.css
+++ b/kallithea/public/css/style.css
@@ -1387,12 +1387,13 @@ a.metatag[data-tag="license"]:hover {
 .user-menu .gravatar:hover {
     background-color: #FDF784 !important;
 }
+
 #quick_login {
     width: 300px;
     min-height: 110px;
-    padding: 4px;
     position: absolute;
     right: 0;
+    color: #fff;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
@@ -1403,41 +1404,36 @@ a.metatag[data-tag="license"]:hover {
 
     overflow: hidden;
 }
+
+#quick_login .form {
+    margin: 15px;
+}
+
 #quick_login h4 {
     color: #fff;
-    padding: 5px 0px 5px 14px;
-}
-
-#quick_login .password_forgoten {
-    padding-right: 0px;
-    padding-top: 0px;
-    text-align: left;
-}
-
-#quick_login .password_forgoten a {
-    font-size: 10px;
-    color: #fff;
-    padding: 0px !important;
-    line-height: 20px !important;
-}
-
-#quick_login .register {
-    padding-right: 10px;
-    padding-top: 5px;
-    text-align: left;
-}
-
+    margin-bottom: 10px;
+}
+
+#quick_login input#username,
+#quick_login input#password {
+    display: block;
+    margin: 5px 0 10px;
+}
+
+#quick_login .password_forgotten a,
 #quick_login .register a {
-    font-size: 10px;
-    color: #fff;
-    padding: 0px !important;
-    line-height: 20px !important;
+    padding: 0 !important;
+    line-height: 25px !important;
+    float: left;
+    clear: both;
 }
 
 #quick_login .submit {
-    margin: -20px 0 0 0px;
-    position: absolute;
-    right: 15px;
+    float: right;
+}
+
+#quick_login .submit input#sign_in {
+    margin-top: 5px;
 }
 
 #quick_login > .pull-left {
@@ -1449,13 +1445,13 @@ a.metatag[data-tag="license"]:hover {
 #quick_login .full_name {
     color: #FFFFFF;
     font-weight: bold;
-    padding: 3px 3px 3px 6px;
+    padding: 3px 3px 3px 15px;
 }
 #quick_login .big_gravatar {
-    padding: 4px 0px 0px 6px;
+    padding: 15px 0px 0px 15px;
 }
 #quick_login .notifications {
-    padding: 2px 0px 0px 6px;
+    padding: 2px 0px 0px 15px;
     color: #FFFFFF;
     font-weight: bold;
     line-height: 10px !important;
@@ -1473,7 +1469,7 @@ a.metatag[data-tag="license"]:hover {
 #quick_login .email,
 #quick_login .unread {
     color: #FFFFFF;
-    padding: 3px 3px 3px 6px;
+    padding: 3px 3px 3px 15px;
 }
 #quick_login .links .logout {
 }
diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html
--- a/kallithea/templates/base/base.html
+++ b/kallithea/templates/base/base.html
@@ -371,40 +371,27 @@
       <div class="dropdown-menu user-menu" role="menu">
         <div id="quick_login" role="form" aria-describedby="quick_login_h" aria-hidden="true" class="container-fluid">
           %if request.authuser.username == 'default' or request.authuser.user_id is None:
-            <h4 id="quick_login_h">${_('Login to Your Account')}</h4>
-            ${h.form(h.url('login_home', came_from=request.path_qs))}
-            <div class="form">
-                <div>
-                    <div>
-                        <div>
-                            <label for="username">${_('Username')}:</label>
-                        </div>
-                        <div>
-                            ${h.text('username',class_='form-control')}
-                        </div>
-                    </div>
-                    <div>
-                        <div>
-                            <label for="password">${_('Password')}:</label>
-                        </div>
-                        <div>
-                            ${h.password('password',class_='form-control')}
-                        </div>
-
-                    </div>
-                    <div class="buttons">
-                        <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>
-                        <div class="register">
-                        %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
-                         ${h.link_to(_("Don't have an account ?"),h.url('register'))}
-                        %endif
-                        </div>
-                        <div class="submit">
-                            ${h.submit('sign_in',_('Log In'),class_="btn btn-default btn-xs")}
-                        </div>
-                    </div>
+            ${h.form(h.url('login_home', came_from=request.path_qs), class_='form clearfix')}
+                <h4 id="quick_login_h">${_('Login to Your Account')}</h4>
+                <label>
+                    ${_('Username')}:
+                    ${h.text('username',class_='form-control')}
+                </label>
+                <label>
+                    ${_('Password')}:
+                    ${h.password('password',class_='form-control')}
+                </label>
+                <div class="password_forgotten">
+                    ${h.link_to(_('Forgot password?'),h.url('reset_password'))}
                 </div>
-            </div>
+                <div class="register">
+                    %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
+                        ${h.link_to(_("Don't have an account?"),h.url('register'))}
+                    %endif
+                </div>
+                <div class="submit">
+                    ${h.submit('sign_in',_('Log In'),class_="btn btn-default btn-xs")}
+                </div>
             ${h.end_form()}
           %else:
             <div class="pull-left">