kallithea Changeset - 7a5db341a942

Changeset - 7a5db341a942

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Andrew Shadura - 11 years ago 2015-05-12 23:32:41
andrew@shadura.me

style: make the login page Bootstrap-ready

Change the template to use CSS classes names compatible with what
Bootstrap provides. That would allow the login page to have sane
appearance with Bootstrap CSS immediately.

The template changes also remove extra vertical space between
the ‘Log in’ button and extra links at the bottom for the sake
of having a simpler markup.

2 files changed with 43 insertions and 47 deletions:

kallithea/public/css/style.css

kallithea/templates/login.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1869,46 +1869,42 @@ a.metatag[tag="license"]:hover { @@
     border-top: none;
     border-bottom: none;
     margin: 0 auto;
     padding: 20px;
+}
-#login div.form div.fields div.field div.label {
+#login div.form div.form-horizontal div.form-group > label {
     width: 173px;
     float: left;
     text-align: right;
     margin: 2px 10px 0 0;
     padding: 5px 0 0 5px;
+}
-#login div.form div.fields div.field div.input input {
+#login div.form div.form-horizontal div.form-group div input {
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 11px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 #login div.form div.fields div.buttons {
     clear: both;
     overflow: hidden;
     border-top: 1px solid #DDD;
     text-align: right;
     margin: 0;
     padding: 10px 0 0;
 #login div.form .buttons {
     float: right;
+}
 #login div.form div.links {
     clear: both;
     overflow: hidden;
     margin: 10px 0 0;
     padding: 0 0 2px;
     border-top: 1px solid #DDD;
     padding: 10px 0 0;
+}
 .user-menu {
     margin: 0px !important;
     float: left;
+}
@@ @@ -3753,44 +3749,44 @@ div#legend_data, div#legend_container, d @@
     clear: both;
     margin: 0;
     padding: 0 20px 10px;
+}
 #content div.box div.form div.fields,
 #login div.form,
 #login div.form div.fields,
 #login div.form-horizontal,
 #login div.form-horizontal div.form-group,
 #register div.form,
 #register div.form div.fields {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0;
+}
 #content div.box div.form div.fields div.field div.label span,
-#login div.form div.fields div.field div.label span,
+#login div.form div.form-horizontal div.form-group div.label span,
 #register div.form div.fields div.field div.label span {
     height: 1%;
     display: block;
     color: #363636;
     margin: 0;
     padding: 2px 0 0;
+}
 #content div.box div.form div.fields div.field div.input input.error,
-#login div.form div.fields div.field div.input input.error,
+#login div.form div.form-horizontal div.form-group div.input input.error,
 #register div.form div.fields div.field div.input input.error {
     background: #FBE3E4;
     border-top: 1px solid #e1b2b3;
     border-left: 1px solid #e1b2b3;
     border-right: 1px solid #FBC2C4;
     border-bottom: 1px solid #FBC2C4;
+}
 #content div.box div.form div.fields div.field div.input input.success,
-#login div.form div.fields div.field div.input input.success,
+#login div.form div.form-horizontal div.form-group div.input input.success,
 #register div.form div.fields div.field div.input input.success {
     background: #E6EFC2;
     border-top: 1px solid #cebb98;
     border-left: 1px solid #cebb98;
     border-right: 1px solid #c6d880;
     border-bottom: 1px solid #c6d880;
@@ @@ -3886,13 +3882,13 @@ div.box-right div.form div.fields div.bu @@
 #content div.box table td.address {
     width: 10%;
     text-align: center;
+}
 #content div.box div.action div.button,
-#login div.form div.fields div.field div.input div.link,
+#login div.form div.form-horizontal div.form-group div.input div.link,
 #register div.form div.fields div.field div.input div.link {
     text-align: right;
     margin: 6px 0 0;
     padding: 0;
+}
@@ @@ -3955,60 +3951,60 @@ div.box-right div.form div.fields div.bu @@
 #register div.title h5 {
     color: #fff;
     margin: 10px;
     padding: 0;
+}
-#login div.form div.fields div.field,
+#login div.form div.form-horizontal div.form-group,
 #register div.form div.fields div.field {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 0 10px;
+}
-#login div.form div.fields div.field span.error-message,
+#login div.form div.form-horizontal div.form-group span.error-message,
 #register div.form div.fields div.field span.error-message {
     height: 1%;
     display: block;
     color: red;
     margin: 8px 0 0;
     padding: 0;
     max-width: 320px;
+}
-#login div.form div.fields div.field div.label label,
+#login div.form div.form-horizontal div.form-group label,
 #register div.form div.fields div.field div.label label {
     color: #000;
     font-weight: 700;
+}
-#login div.form div.fields div.field div.input,
+#login div.form div.form-horizontal div.form-group div,
 #register div.form div.fields div.field div.input {
     float: left;
     margin: 0;
     padding: 0;
+}
-#login div.form div.fields div.field div.input input.large {
+#login div.form div.form-horizontal div.form-group div input.large {
     width: 250px;
+}
-#login div.form div.fields div.field div.checkbox,
+#login div.form div.form-horizontal div.form-group div.checkbox,
 #register div.form div.fields div.field div.checkbox {
     margin: 0 0 0 184px;
     padding: 0;
+}
-#login div.form div.fields div.field div.checkbox label,
+#login div.form div.form-horizontal div.form-group div.checkbox label,
 #register div.form div.fields div.field div.checkbox label {
     color: #565656;
     font-weight: 700;
+}
-#login div.form div.fields div.buttons input,
 #login div.form div.buttons input,
 #register div.form div.fields div.buttons input {
     color: #000;
     font-size: 1em;
     font-weight: 700;
     margin: 0;
+}

kallithea/templates/login.html

➞

Show inline comments

@@ @@ -2,65 +2,65 @@ @@
 <%inherit file="base/root.html"/>
 <%block name="title">
     ${_('Log In')}
 </%block>
 <div id="login">
+<div id="login" class="panel panel-default">
     <%include file="/base/flash_msg.html"/>
     <!-- login -->
     <div class="title withlogo">
+    <div class="panel-heading title withlogo">
         %if c.site_name:
             <h5>${_('Log In to %s') % c.site_name}</h5>
         %else:
             <h5>${_('Log In')}</h5>
         %endif
     </div>
     <div class="inner">
+    <div class="panel-body inner">
         ${h.form(h.url.current(came_from=c.came_from))}
         <div class="form">
             <i class="icon-lock"></i>
             <!-- fields -->
             <div class="fields">
                 <div class="field">
                     <div class="label">
                         <label for="username">${_('Username')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('username',class_='focus large')}
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label col-sm-5" for="username">${_('Username')}:</label>
                     <div class="input col-sm-7">
                         ${h.text('username',class_='form-control focus large')}
                     </div>
                 </div>
                 <div class="field">
                     <div class="label">
                         <label for="password">${_('Password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password',class_='focus large')}
                 <div class="form-group">
                     <label class="control-label col-sm-5" for="password">${_('Password')}:</label>
                     <div class="input col-sm-7">
                         ${h.password('password',class_='form-control focus large')}
                     </div>
                 </div>
                 <div class="field">
                     <div class="checkbox">
                         <input type="checkbox" id="remember" name="remember" />
                         <label for="remember">${_('Remember me')}</label>
                 <div class="form-group">
                     <div class="col-sm-offset-5 col-sm-7">
                         <div class="checkbox">
                             <label for="remember">
                                 <input type="checkbox" id="remember" name="remember"/>
                                 ${_('Remember me')}
                             </label>
                         </div>
                     </div>
                 </div>
                 <div class="buttons">
                     ${h.submit('sign_in',_('Sign In'),class_="btn")}
                 </div>
             </div>
             <!-- end fields -->
             <!-- links -->
             <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>
             <!-- end links -->
         </div>
         ${h.end_form()}
         <script type="text/javascript">

0 comments (0 inline, 0 general)