kallithea Changeset - 7e22d42320cd

Changeset - 7e22d42320cd

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 8 years ago 2017-09-11 21:45:33
dominikruf@gmail.com

style: be consistent and don't use col-*-* classes

In order to not show overlap the lock icon also change its positioning style.

2 files changed with 5 insertions and 6 deletions:

kallithea/public/css/style.css

kallithea/templates/login.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -556,49 +556,48 @@ a.metatag[data-tag="license"]:hover { @@
 #footer {
     padding: 10px 15px;
     background-color: #577632;
     background-repeat: repeat-x;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #footer > span {
     color: #FFF;
     font-weight: 700;
+}
 #footer .navbar-link {
     color: #FFF;
+}
 #footer.navbar {
     min-height: inherit;
     padding-bottom: 8px;
+}
 #login .panel-body .icon-lock {
     font-size: 100px;
     color: #DDD;
     position: absolute;
     margin-left: -15px;
     z-index: 1;
+}
 .user-menu {
     padding: 0 !important;
+}
 .user-menu .gravatar {
     margin: 0px 0px 0px 0px;
     cursor: pointer;
+}
 .user-menu .gravatar.enabled {
     background-color: #FDF784 !important;
+}
 .user-menu .gravatar:hover {
     background-color: #FDF784 !important;
+}
 #quick_login {
     width: 330px;
     min-height: 110px;
     padding: 0;
     position: absolute;

kallithea/templates/login.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 <%block name="title">
     ${_('Log In')}
 </%block>
 <%include file="/base/flash_msg.html"/>
 <div id="login" class="panel panel-primary">
     <div class="panel-heading">
         %if c.site_name:
             <h5>${_('Log In to %s') % c.site_name}</h5>
         %else:
             <h5>${_('Log In')}</h5>
         %endif
     </div>
     <div class="panel-body">
         ${h.form(url('login_home', came_from=c.came_from))}
         <div class="form">
             <i class="icon-lock"></i>
                 <div class="form-group">
                     <label class="control-label col-sm-5" for="username">${_('Username')}:</label>
                     <div class="col-sm-7">
                     <label class="control-label" for="username">${_('Username')}:</label>
                     <div>
                         ${h.text('username',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label col-sm-5" for="password">${_('Password')}:</label>
                     <div class="col-sm-7">
                     <label class="control-label" for="password">${_('Password')}:</label>
                     <div>
                         ${h.password('password',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
-                    <div class="col-sm-offset-5 col-sm-7">
                     <div>
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" id="remember" name="remember"/>
                                 ${_('Stay logged in after browser restart')}
                             </label>
                         </div>
                     </div>
                 </div>
             <div class="links">
                 ${h.link_to(_('Forgot your password ?'),h.url('reset_password'))}
                 %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
                 <span class="buttons">
                     ${h.submit('sign_in',_('Sign In'),class_="btn btn-default")}
                 </span>
             </div>
         </div>
         ${h.end_form()}
         <script type="text/javascript">
         $(document).ready(function(){
             $('#username').focus();

0 comments (0 inline, 0 general)