kallithea Changeset - 18a19c7d5145

Changeset - 18a19c7d5145

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 8 years ago 2017-06-26 23:49:26
dominikruf@gmail.com

Grafted from: f73c9545d709

templates: use bootstrap grid system for centered panels (login page etc.)

The bootstrap grid system rearranges the elements so that the pages look
good an small screens as well. (i.e. no vertical scrolling)

2 files changed with 20 insertions and 16 deletions:

kallithea/public/less/style.less

kallithea/templates/password_reset_confirmation.html

0 comments (0 inline, 0 general)

kallithea/public/less/style.less

➞

Show inline comments

@@ @@ -211,111 +211,97 @@ div.panel-primary { @@
 /* remove margin below footer */
 .navbar.footer {
   margin-bottom: 0;
+}
 .user-menu {
   padding: 0 !important;
+}
 #quick_login {
   width: 360px;
   margin-top: 15px;
   min-height: 110px;
+}
 #quick_login input#username,
 #quick_login input#password {
   display: block;
   margin: 5px 0 10px;
+}
 #quick_login .password_forgotten a,
 #quick_login .register a {
   padding: 0 !important;
   line-height: 25px !important;
   float: left;
   clear: both;
+}
 #quick_login .submit {
   float: right;
+}
 #quick_login .submit input#sign_in {
   margin-top: 5px;
+}
 #quick_login > .pull-left {
   width: 170px;
+}
 #quick_login > .pull-right {
   width: 140px;
+}
 #quick_login .full_name {
   font-weight: bold;
   padding: 3px;
+}
 #quick_login .email {
   padding: 3px 3px 3px 0;
+}
 #quick_login :not(input) {
   color: @kallithea-theme-inverse-color;
   padding-bottom: 3px;
+}
 #register div.form div.form-group > label {
   width: 135px;
   float: left;
   text-align: right;
   margin: 2px 10px 0 0;
   padding: 5px 0 0 5px;
+}
 #register div.form div.form-group > div input {
   width: 300px;
+}
 #register div.form div.buttons {
   border-top: 1px solid #DDD;
   margin: 0;
   padding: 10px 0 0 145px;
+}
 #journal .journal_user {
   color: #747474;
   font-size: 14px;
   font-weight: bold;
   height: 30px;
+}
 #journal .journal_user.deleted {
   color: #747474;
   font-size: 14px;
   font-weight: normal;
   height: 30px;
   font-style: italic;
+}
 #journal .journal_icon {
   clear: both;
   float: left;
   padding-right: 4px;
   padding-top: 3px;
+}
 #journal .journal_action {
   padding-top: 4px;
   min-height: 2px;
   float: left;
+}
 #journal .journal_action_params {
   clear: left;
   padding-left: 22px;
+}
 #journal .date {
   clear: both;
   color: #777777;
   font-size: 11px;
   padding-left: 22px;
+}
 #journal .journal_repo_name {
   font-weight: bold;
   font-size: 1.1em;
+}
 #journal .compare_view {
   padding: 5px 0px 5px 0px;
   width: 95px;
+}
 .trending_language_tbl,
 .trending_language_tbl td {
   border: 0 !important;
   margin: 0 !important;
   padding: 0 !important;
+}
@@ @@ -671,96 +657,114 @@ div.comment:target:before { @@
+}
 div.comment:target > .panel {
   border: solid 2px #ee0 !important;
+}
 .lineno:target a {
   border: solid 2px #ee0 !important;
   margin: -2px;
+}
 .btn-image-diff-show,
 .btn-image-diff-swap {
   margin: 5px;
+}
 .img-diff {
   max-width: 45%;
   height: auto;
   margin: 5px;
   /* http://lea.verou.me/demos/css3-patterns.html */
   background-image: linear-gradient(45deg, #888 25%, transparent 25%, transparent), linear-gradient(-45deg, #888 25%, transparent 25%, transparent), linear-gradient(45deg, transparent 75%, #888 75%), linear-gradient(-45deg, transparent 75%, #888 75%);
   background-size: 10px 10px;
   background-color: #999;
+}
 .img-preview {
   max-width: 100%;
   height: auto;
   margin: 5px;
+}
 div.comment-prev-next-links div.prev-comment,
 div.comment-prev-next-links div.next-comment {
   display: inline-block;
   min-width: 150px;
   margin: 3px 6px;
+}
 #comments-general-comments div.comment-prev-next-links div.prev-comment,
 #comments-general-comments div.comment-prev-next-links div.next-comment {
   margin-left: 0;
+}
 /* changelog graph */
 #graph_nodes,
 #updaterevs-graph {
   .make-xs-column(1);
+}
 #graph_content,
 #graph_content_pr,
 #updaterevs-table {
   .make-xs-column(11);
+}
 /* use bootstrap grid columns for centered forms */
 #login,
 #register {
   .form {
     .form-horizontal;
     .form-group > label {
       .make-sm-column(4);
+    }
     .form-group > div {
       .make-sm-column(8);
+    }
     .form-group > div:first-child { /* in case there is no label */
       .make-sm-column-offset(4);
       .make-sm-column(8);
+    }
+  }
+}
 /* use columns and form-horizontal for settings pages ... on wide screens */
 @media (min-width: @screen-sm-min) {
   .settings {
     max-width: @container-md;
     > ul.nav-stacked {
       .make-sm-column(2);
       max-width: (@container-md/12)*2;
+    }
     > div {
       .make-sm-column(10);
       max-width: (@container-md/12)*10;
+    }
     .form {
       .form-horizontal;
+    }
     .form-group {
       .clearfix;
       > label {
         .make-xs-column(3);
         input {
           width: 100%;
+        }
+      }
       > div {
         .make-xs-column(9);
+      }
       .buttons {
         .make-xs-column-offset(3);
+      }
+    }
+  }
+}
 /* use columns and form-horizontal for summary page */
 #summary {
   max-width: @container-md;
   .form-horizontal;
   .make-sm-column(10);
   .form-group > label {
     .make-sm-column(2);
+  }
   .form-group > div {
     .make-sm-column(10);
+  }
+}
 #summary-menu-stats {
   .make-sm-column(2);
+}

kallithea/templates/password_reset_confirmation.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 <%block name="title">
     ${_('Reset Your Password')}
 </%block>
 <%include file="/base/flash_msg.html"/>
 <div class="panel panel-primary">
+<div id="register" class="panel panel-primary">
     <div class="panel-heading">
         %if c.site_name:
             <h5>${_('Reset Your Password to %s') % c.site_name}</h5>
         %else:
             <h5>${_('Reset Your Password')}</h5>
         %endif
     </div>
     <div class="panel-body">
         ${h.form(h.url('reset_password_confirmation'), method='post')}
         <p>${_('You are about to set a new password for the email address %s.') % c.email}</p>
         <p>${_('Note that you must use the same browser session for this as the one used to request the password reset.')}</p>
         ${h.hidden('email')}
         ${h.hidden('timestamp')}
         <div class="form">
                 <div class="form-group">
                     <label class="control-label" for="token">${_('Code you received in the email')}:</label>
                     <div>
                         ${h.text('token', class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="password">${_('New Password')}:</label>
                     <div>
                         ${h.password('password',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="password_confirm">${_('Confirm New Password')}:</label>
                     <div>
                         ${h.password('password_confirm',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="buttons">
                         ${h.submit('send',_('Confirm'),class_="btn btn-default")}
                     </div>
                 </div>
         </div>
         ${h.end_form()}
     </div>
    </div>

0 comments (0 inline, 0 general)