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

@@ @@ -196,769 +196,768 @@ div.panel.panel-default { @@
     border: 1px solid #ccc;
     box-shadow: none;
     border-radius: 6px 6px 0px 0px;
     margin-bottom: 15px;
+}
 div.panel.panel-default:last-child {
     margin-bottom: 0;
+}
 div.panel.panel-default > div.panel-heading {
     background: #eee;
     border-bottom: 1px solid #ccc;
     font-size: 14px;
     font-weight: 700;
+}
 div.panel.panel-default div.panel-heading .diff-actions a,
 div.panel.panel-default div.panel-heading .diff-actions span.no-file,
 div.panel.panel-default div.panel-heading .diff-actions span.arrow {
     color: #577632 !important;
+}
 div.panel.panel-default div.panel-heading .diff-actions span.no-file,
 div.panel.panel-default div.panel-heading .diff-actions span.arrow {
     opacity: 0.5;
+}
 #content div.panel div.panel-heading .pull-left {
     margin-right: 10px;
+}
 #content div.panel div.panel-heading .pull-right {
     margin-left: 10px;
+}
 #content div.panel div.form div.form-group {
     border-bottom: 1px solid #DDD;
     clear: both;
+}
 #content div.panel div.form div.form-group > label {
     color: #393939;
     font-weight: 700;
+}
 .reviewer_ac {
     padding: 10px
+}
 #content div.panel table.table {
     border: 1px solid transparent;
+}
 #content div.panel table {
     border-collapse: separate;
     margin: 0;
     padding: 0;
     border: 1px solid #eee;
     border-radius: 4px;
+}
 #content div.panel table#permissions_manage {
     width: auto;
+}
 #content div.panel table th {
     background: #eee;
     border-bottom: 1px solid #ddd;
     padding: 5px 0px 5px 5px;
     text-align: left;
+}
 #content div.panel table th.left {
     text-align: left;
+}
 #content div.panel table th.right {
     text-align: right;
+}
 #content div.panel table th.center {
     text-align: center;
+}
 #content div.panel table th.selected {
     vertical-align: middle;
     padding: 0;
+}
 #content div.panel table td.annotate {
     border-bottom: none;
+}
 #content div.panel table td.linenos pre,
 #content div.panel table td.annotate pre,
 #content div.panel table td.code pre {
     padding-top: inherit;
     margin: inherit;
+}
 #content div.panel table td.compact {
     padding-left: 0;
     padding-right: 0;
+}
 #content div.panel table tr.selected td {
     background: #FFC;
+}
 #content div.panel table td.selected {
     width: 3%;
     text-align: center;
     vertical-align: middle;
     padding: 0;
+}
 #content div.panel table td.action {
     width: 45%;
     text-align: left;
+}
 #content div.panel table td.date {
     width: 33%;
     text-align: center;
+}
 #content div.panel div.action {
     float: right;
     background: #FFF;
     text-align: right;
     margin: 10px 0 0;
     padding: 0;
+}
 #content div.panel div.action select {
     font-size: 11px;
     margin: 0;
+}
 #content div.panel div.action .ui-selectmenu {
     margin: 0;
     padding: 0;
+}
 #content div.panel ul.pagination {
     margin: 10px 0 0 0;
+}
 #content div.panel ul.pagination > li > a,
 #content div.panel ul.pagination > li > span {
     background: #ebebeb url("../images/pager.png") repeat-x;
     color: #4A4A4A;
     font-weight: 700;
     border-top: 1px solid #dedede;
     border-left: 1px solid #cfcfcf;
     border-bottom: 1px solid #c4c4c4;
     border-right: 1px solid #cfcfcf;
+}
 #content div.panel ul.pagination > li.active > span,
 #content div.panel ul.pagination > li:hover > a,
 #content div.panel ul.pagination > li:active > a {
     background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
     border-top: 1px solid #ccc;
     border-left: 1px solid #bebebe;
     border-bottom: 1px solid #afafaf;
     border-right: 1px solid #bebebe;
     color: #515151;
+}
 #content div.panel div.traffic div.legend {
     clear: both;
     overflow: hidden;
     border-bottom: 1px solid #ddd;
     margin: 0 0 10px;
     padding: 0 0 10px;
+}
 #content div.panel div.traffic div.legend h6 {
     float: left;
     border: none;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.traffic div.legend li {
     list-style: none;
     float: left;
     font-size: 11px;
     margin: 0;
     padding: 0 8px 0 4px;
+}
 #content div.panel div.traffic div.legend li.visits {
     border-left: 12px solid #edc240;
+}
 #content div.panel div.traffic div.legend li.pageviews {
     border-left: 12px solid #afd8f8;
+}
 #content div.panel div.traffic table {
     width: auto;
+}
 #content div.panel div.traffic table td {
     background: transparent;
     border: none;
     padding: 2px 3px 3px;
+}
 #content div.panel div.traffic table td.legendLabel {
     padding: 0 3px 2px;
+}
 #content div.panel #summary-panel-body {
     position: relative;
+}
 #content div.panel div#summary-panel-body.form div.form-group > div {
     margin: 0 0 10px 150px;
+}
 #content div.panel #summary {
     margin-right: 200px;
     min-height: 200px;
+}
 ul#summary-menu-stats {
     width: 180px;
     position: absolute;
     top: 0;
     right: 0;
     border-radius: 4px;
     margin: 15px;
+}
 #content #summary-menu-stats li {
     padding: 0;
+}
 #content #summary-menu-stats li:hover {
     background: #f0f0f0;
+}
 #summary-menu-stats a {
     display: block;
     padding: 10px;
+}
 #repo_size_2 {
     display: none;
+}
 #repo_size_2.loaded {
     display: block;
     padding-right: 10px;
     padding-bottom: 7px;
+}
 #summary-menu-stats a:hover {
     text-decoration: none;
+}
 #summary-menu-stats .badge {
     padding: 2px 4px !important;
     font-size: 10px;
+}
 #summary .metatag {
     display: inline-block;
     padding: 3px 5px;
     margin-bottom: 3px;
     margin-right: 1px;
     border-radius: 5px;
+}
 #content div.panel #summary p {
     margin-bottom: -5px;
     width: 600px;
     white-space: pre-wrap;
+}
 #clone_by_name.input-group,
 #clone_by_id.input-group {
     width: 100%;
+}
 #clone_by_name.input-group > span,
 #clone_by_id.input-group > span {
     display: inline-block;
     float: left;
     height: 30px;
+}
 #clone_by_name.input-group > input,
 #clone_by_id.input-group > input {
     width: 50%;
+}
 #clone_by_name.input-group .form-control,
 #clone_by_id.input-group .form-control {
     height: 30px;
+}
 .metatag {
     display: inline-block;
     margin-right: 1px;
     border-radius: 4px 4px 4px 4px;
     border: solid 1px #9CF;
     padding: 2px 3px 2px 3px !important;
     background-color: #DEF;
+}
 .metatag[data-tag="dead"] {
     background-color: #E44;
+}
 .metatag[data-tag="stale"] {
     background-color: #EA4;
+}
 .metatag[data-tag="featured"] {
     background-color: #AEA;
+}
 .metatag[data-tag="requires"] {
     background-color: #9CF;
+}
 .metatag[data-tag="recommends"] {
     background-color: #BDF;
+}
 .metatag[data-tag="lang"] {
     background-color: #FAF474;
+}
 .metatag[data-tag="license"] {
     border: solid 1px #9CF;
     background-color: #DEF;
+}
 .metatag[data-tag="see"] {
     border: solid 1px #CBD;
     background-color: #EDF;
+}
 a.metatag[data-tag="license"]:hover {
     background-color: #577632;
     color: #FFF;
     text-decoration: none;
+}
 #summary .desc {
     white-space: pre;
     width: 100%;
+}
 #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;
     right: 0;
     color: #fff;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     z-index: 999;
     border-radius: 0px 0px 4px 4px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     overflow: hidden;
+}
 #quick_login .form {
     margin: 15px;
+}
 #quick_login h4 {
     color: #fff;
     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 {
     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 {
     color: #FFFFFF;
     font-weight: bold;
     padding: 3px 3px 3px 15px;
+}
 #quick_login .big_gravatar {
     padding: 15px 0px 0px 15px;
+}
 #quick_login .notifications {
     padding: 2px 0px 0px 15px;
     color: #FFFFFF;
     font-weight: bold;
     line-height: 10px !important;
+}
 #quick_login .notifications a,
 #quick_login .unread a {
     color: #FFFFFF;
     display: block;
     padding: 0px !important;
+}
 #quick_login .notifications a:hover,
 #quick_login .unread a:hover {
     background-color: inherit !important;
+}
 #quick_login .email,
 #quick_login .unread {
     color: #FFFFFF;
     padding: 3px 3px 3px 15px;
+}
 #quick_login .links .logout {
+}
 #quick_login div.form div.form-group {
     padding: 5px;
+}
 #quick_login div.form div.form-group > label {
     color: #fff;
     padding-bottom: 3px;
+}
 #quick_login div.form div.form-group > div input {
     width: 236px;
     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: 5px 7px 4px;
+}
 #quick_login div.form div.buttons {
     clear: both;
     overflow: hidden;
     text-align: right;
     margin: 0;
     padding: 5px 14px 0px 5px;
+}
 #quick_login div.form div.links {
     clear: both;
     overflow: hidden;
     margin: 10px 0 0;
     padding: 0 0 2px;
+}
 #quick_login ol.links {
     display: block;
     font-weight: bold;
     list-style: none outside none;
     text-align: right;
+}
 #quick_login ol.links li {
     line-height: 27px;
     margin: 0;
     padding: 0;
     color: #fff;
     display: block;
     float: none !important;
+}
 #quick_login ol.links li a {
     color: #fff;
     display: block;
     padding: 2px;
+}
 #quick_login ol.links li a:HOVER {
     background-color: inherit !important;
+}
 #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;
+}
 .trending_language_tbl, .trending_language_tbl tr {
     border-spacing: 1px;
+}
 #lang_stats .progress-bar {
     background-color: #577632;
     min-width: 15px;
     text-decoration: none;
     border-top-right-radius: 8px;
     border-bottom-right-radius: 8px;
+}
 #lang_stats table td {
     border-bottom: none !important;
     padding: 1px 0 !important;
+}
 h3.files_location {
     font-size: 1.8em;
     font-weight: 700;
     border-bottom: none !important;
     margin: 10px 0 !important;
+}
 .file_history {
     padding-top: 10px;
     font-size: 16px;
+}
 .file_author {
     float: left;
+}
 .file_author .item {
     float: left;
     padding: 5px;
     color: #888;
+}
 .changeset_id {
     color: #666666;
     margin-right: -3px;
+}
 .changeset-logical-index {
     color: #666666;
     font-style: italic;
     font-size: 85%;
     padding-right: 0.5em;
     text-align: right;
+}
 #changeset_compare_view_content .compare_view_commits {
     width: auto !important;
+}
 #changeset_compare_view_content .compare_view_commits td {
     padding: 0px 0px 0px 12px !important;
+}
 td.author {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     max-width: 210px;
+}
 .cs_files .progress {
     margin-bottom: 0;
+}
 .cs_files .cur_cs {
     margin: 10px 2px;
     font-weight: bold;
+}
 .cs_files .node {
     float: left;
+}
 .cs_files .changes {
     float: right;
     color: #577632;
+}
 .cs_files .changes .added {
     color: inherit;
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .deleted {
     background-color: #FF8888;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*new binary
 NEW_FILENODE = 1
 DEL_FILENODE = 2
 MOD_FILENODE = 3
 RENAMED_FILENODE = 4
 CHMOD_FILENODE = 5
 BIN_FILENODE = 6
 */
 .cs_files .changes .bin {
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .bin.bin1 {
     background-color: #BBFFBB;
+}
 /*deleted binary*/
 .cs_files .changes .bin.bin2 {
     background-color: #FF8888;
+}
 /*mod binary*/
 .cs_files .changes .bin.bin3 {
     background-color: #DDDDDD;
+}
 /*rename file*/
 .cs_files .changes .bin.bin4 {
     background-color: #6D99FF;
+}
 /*rename file*/
 .cs_files .changes .bin.bin4 {
     background-color: #6D99FF;
+}
 /*chmod file*/
 .cs_files .changes .bin.bin5 {
     background-color: #6D99FF;
+}

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();
         });
         </script>
     </div>
 </div>

0 comments (0 inline, 0 general)