# HG changeset patch # User Mads Kiilerich # Date 2017-01-09 00:41:30 # Node ID 1f02a239c23c35127ea3c4c9415fb0a13bdd3dcf # Parent 81d20cfa2607d66ef09334d50ace5ff99901b6b6 style: use panel, panel-heading, panel-title, panel-body and settings This imply lots of tweaking of header handling and panel spacing. Not converted yet: codeblock code-header code-body. Based on work by Dominik Ruf. 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 @@ -538,18 +538,14 @@ div.header img { background-repeat: repeat-x; background-image: linear-gradient(to bottom, #577632, #577632); margin: 0 0 20px; - padding: 0; + padding: 10px 20px; border-radius: 4px 4px 0 0; } -#content div.panel div.panel-heading .link-white { +#content div.panel div.panel-heading a { color: #FFFFFF; } -#content div.panel div.panel-heading .link-white.current { - color: #BFE3FF; -} - #content div.panel div.panel-heading ul.links li { list-style: none; float: left; @@ -561,7 +557,6 @@ div.header img { font-size: 13px; font-weight: 700; height: 1%; - margin: 4px; text-decoration: none; } @@ -572,14 +567,6 @@ div.header img { padding: 11px 10px 11px 10px; } -#content div.panel div.panel-heading .links.icon-only-links a { - float: left; - color: #fff; - margin: 0; - padding: 0 10px; - line-height: 18px; -} - .clearfix::before, .clearfix::after, .dl-horizontal dd::before, .dl-horizontal dd::after, .container::before, .container::after, .container-fluid::before, .container-fluid::after, .row::before, .row::after, .form-horizontal .form-group::before, .form-horizontal .form-group::after, .btn-toolbar::before, .btn-toolbar::after, .btn-group-vertical > .btn-group::before, .btn-group-vertical > .btn-group::after, .nav::before, .nav::after, .navbar::before, .navbar::after, .navbar-header::before, .navbar-header::after, .navbar-collapse::before, .navbar-collapse::after, .pager::before, .pager::after, .panel::before, .panel::after, .panel-body::before, .panel-body::after, .modal-header::before, .modal-header::after, .modal-footer::before, .modal-footer::after, td.inline-comments::before, td.inline-comments::after { content: " "; display: table; @@ -604,13 +591,10 @@ div.header img { float: right; } -#content div.panel div.panel-heading .pull-left { - margin: 10px; - color: white; -} - -#content div.panel div.panel-heading .pull-right { - margin: 5px; +#content div.panel div.panel-heading .pull-left, +#content div.panel div.panel-heading .pull-left a, +#content div.panel div.panel-heading .pull-right, +#content div.panel div.panel-heading .pull-right a { color: white; } @@ -628,14 +612,10 @@ div.header img { #content div.panel div.h6 { clear: both; overflow: hidden; - margin: 8px 20px 3px; + margin: 8px 0 3px; padding-bottom: 2px; } -#content div.panel div.normal-indent { - margin: 0 20px 10px 20px; -} - #content div.panel p { color: #5f5f5f; font-size: 12px; @@ -1176,6 +1156,10 @@ div.form div.form-horizontal div.form-gr padding: 0 3px 2px; } +#content div.panel #summary-panel-body { + position: relative; +} + #content div.panel #summary { margin-right: 200px; min-height: 240px; @@ -1190,7 +1174,6 @@ div.form div.form-horizontal div.form-gr } #summary-menu-stats ul { - margin: 0 10px; display: block; background-color: #f9f9f9; border: 1px solid #d1d1d1; @@ -1322,7 +1305,7 @@ a.metatag[data-tag="license"]:hover { overflow: hidden; text-align: right; margin: 0; - padding: 0 10px 4px; + padding: 10px 20px; margin: -10px 0 0; background-color: #577632; background-repeat: repeat-x; @@ -1332,7 +1315,6 @@ a.metatag[data-tag="license"]:hover { } #footer > span { - padding: 15px 25px 15px 0; color: #FFF; font-weight: 700; } @@ -1630,6 +1612,10 @@ a.metatag[data-tag="license"]:hover { padding-bottom: 4px; } +#journal { + margin-left: 20px; +} + #journal .journal_day { font-size: 20px; padding: 10px 0px; @@ -1639,13 +1625,11 @@ a.metatag[data-tag="license"]:hover { } #journal .journal_container { - padding: 5px; clear: both; - margin: 0px 5px 0px 10px; } #journal .journal_action_container { - padding-left: 38px; + padding-left: 18px; } #journal .journal_user { @@ -2791,14 +2775,8 @@ table.code-browser i[class^='icon-'] { .breadcrumbs { border: medium none; color: #FFF; - float: left; font-weight: 700; font-size: 14px; - margin: 10px; -} - -.pull-left .breadcrumbs { - margin: 0; } .breadcrumbs .hash { @@ -2806,10 +2784,6 @@ table.code-browser i[class^='icon-'] { color: #fff; } -.breadcrumbs a { - color: #FFF; -} - .flash_msg { } @@ -2913,6 +2887,7 @@ table#permissions_manage tr#add_perm_inp } div.gravatar { + float: left; background-color: #FFF; margin-right: 0.7em; padding: 1px 1px 1px 1px; @@ -2947,7 +2922,7 @@ div.gravatar img { .label, .btn { - color: #515151; + color: #515151 !important; background-color: #DADADA; background-repeat: repeat-x; background-image: linear-gradient(to bottom, #F4F4F4, #DADADA); @@ -2957,7 +2932,7 @@ div.gravatar img { border-right: 1px solid #DDD; border-bottom: 1px solid #c6c6c6; outline: none; - margin: 0px 3px 3px 0px; + margin: 0 3px 0 0; border-radius: 4px 4px 4px 4px !important; padding: 3px 3px 3px 3px; display: inline-block; @@ -2970,20 +2945,35 @@ div.gravatar img { cursor: default !important; } -ul.nav-stacked { +.panel-body.settings > ul.nav-stacked { + float: left; + width: 150px; margin: 20px; color: #393939; font-weight: 700; } -ul.nav-stacked a { +.panel-body.settings > ul.nav-stacked a { color: inherit; } -ul.nav-stacked li.active { +.panel-body.settings > ul.nav-stacked li.active { list-style-type: disc } +.panel-body.settings > div, +.panel-body.settings > form { + float: left; + width: 750px; + margin: 10px 0 0 0; + border-left: 1px solid #DDDDDD; +} + +.panel-body > div, +.panel-body > form { + padding: 0 20px 10px; +} + /* make .btn inputs and buttons and divs look the same */ button.btn, input.btn { @@ -3035,7 +3025,7 @@ input[disabled].btn, .label.label-danger, .btn.btn-danger { - color: #fff; + color: #fff !important; background-color: #c43c35; background-repeat: repeat-x; background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); @@ -3045,7 +3035,7 @@ input[disabled].btn, .label.label-primary, .btn.btn-primary { - color: #fff; + color: #fff !important; background-color: #339bb9; background-repeat: repeat-x; background-image: linear-gradient(to bottom, #5bc0de, #339bb9); @@ -3055,7 +3045,7 @@ input[disabled].btn, .label.label-success, .btn.btn-success { - color: #fff; + color: #fff !important; background-color: #57a957; background-repeat: repeat-x; background-image: linear-gradient(to bottom, #62c462, #57a957); @@ -3065,7 +3055,7 @@ input[disabled].btn, .label.label-warning, .btn.btn-warning { - color: #fff; + color: #fff !important; background-color: #faa732; background-repeat: repeat-x; background-image: linear-gradient(to bottom, #fbb450, #f89406); @@ -3074,7 +3064,7 @@ input[disabled].btn, } label.disabled { - color: #aaa; + color: #aaa !important; } .btn.active { @@ -3206,26 +3196,6 @@ div#legend_data, div#legend_container, d margin: 10px 24px 10px 44px; } -#content div.panel div.form, -#content div.panel div.panel-body, -#content div.panel div.traffic { - position: relative; - clear: both; - margin: 0; - padding: 0 20px 10px; -} - -#content div.panel div.form div.form-horizontal, -#login div.form-horizontal, -#login div.form-horizontal div.form-group, -#register div.form, -#register div.form div.form-horizontal { - clear: both; - overflow: hidden; - margin: 0; - padding: 0; -} - #content div.panel div.form div.form-horizontal div.form-group > div input.error, #login div.form div.form-horizontal div.form-group > div input.error, #register div.form div.form-horizontal div.form-group > div input.error { @@ -3440,10 +3410,6 @@ div#legend_choices table td { padding: 0px 0px 0px 10px; } -.emails_wrap { - padding: 0px 20px; -} - .emails_wrap .email_entry { height: 30px; padding: 0px 0px 0px 10px; @@ -3455,10 +3421,6 @@ div#legend_choices table td { float: left } -.ips_wrap { - padding: 0px 20px; -} - .ips_wrap .ip_entry { height: 30px; padding: 0px 0px 0px 10px; @@ -3920,12 +3882,6 @@ input.status_change_radio { font-weight: bold; font-size: 17px; } -.notification-table { - border: 1px solid #ccc; - border-radius: 6px 6px 6px 6px; - clear: both; - margin: 0px 20px 0px 20px; -} .notification-header .delete-notifications { float: right; padding-top: 8px; @@ -3939,7 +3895,7 @@ input.status_change_radio { .notification-subject { clear: both; border-bottom: 1px solid #eee; - padding: 5px 0px 5px 38px; + padding: 5px 0px; } .notification-body { @@ -4014,7 +3970,13 @@ span.pr-closed-tag { text-transform: capitalize; } +#perms .perms_section_head label { + margin-left: 10px; +} + #perms .perm_tag { + position: relative; + top: -2px; padding: 3px 3px 1px 3px; font-size: 10px; font-weight: bold; @@ -4043,6 +4005,11 @@ span.pr-closed-tag { color: #ffffff; } +input.perm_filter { + position: relative; + top: 2px; +} + .perm-gravatar { vertical-align: middle; padding: 2px; @@ -4095,9 +4062,7 @@ div.diffblock { line-height: 125%; border-radius: 6px 6px 0px 0px; } -div.diffblock.margined { - margin: 0px 20px 0px 20px; -} + .compare-revision-selector, div.diffblock .code-header { border-bottom: 1px solid #CCCCCC; @@ -4397,15 +4362,6 @@ div.comment-prev-next-links div.next-com margin: 3px 6px; } -#help_kb { - display: none; -} - -.icon-only-links i { - color: white; -} - - body table.dataTable thead .sorting { background-image: none; } @@ -4472,3 +4428,12 @@ body table.dataTable thead .sorting_desc .text-nowrap { white-space: nowrap; } + +div.codeblock div.code-header div.author { + height: auto; + min-height: 25px; +} + +ul.user_group_member li { + clear: both; +} diff --git a/kallithea/templates/about.html b/kallithea/templates/about.html --- a/kallithea/templates/about.html +++ b/kallithea/templates/about.html @@ -12,10 +12,11 @@ <%def name="main()">
-
-
${_('About')} Kallithea
+
+
${_('About')} Kallithea
+

Kallithea is a project of the Software Freedom Conservancy, Inc. and is released under the terms of the @@ -143,15 +144,16 @@ ## Stefan Engel in 2012 ## Ton Plomp in 2013 ## -

+

-

The above are the copyright holders who have submitted direct +

The above are the copyright holders who have submitted direct contributions to the Kallithea repository. In the Kallithea source code, there is a list of third-party libraries and code that Kallithea incorporates.

+
diff --git a/kallithea/templates/admin/auth/auth_settings.html b/kallithea/templates/admin/auth/auth_settings.html --- a/kallithea/templates/admin/auth/auth_settings.html +++ b/kallithea/templates/admin/auth/auth_settings.html @@ -20,8 +20,8 @@
${self.breadcrumbs()}
+
${h.form(url('auth_settings'))} -
## enabled auth plugins

${_('Authentication Plugins')}

@@ -107,8 +107,8 @@
+ ${h.end_form()} - ${h.end_form()}
+
+
- ## diff block -
+ ## diff block +
+
<%namespace name="diff_block" file="/changeset/diff_block.html"/> ${diff_block.diff_block_js()} <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %> @@ -300,4 +303,5 @@ ${self.repo_context_bar('changelog', c.c
+
diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html --- a/kallithea/templates/changeset/changeset_range.html +++ b/kallithea/templates/changeset/changeset_range.html @@ -23,6 +23,7 @@ ${self.repo_context_bar('changelog')} ${self.breadcrumbs()}
+
@@ -71,11 +72,13 @@ ${self.repo_context_bar('changelog')} %endfor
+
<%namespace name="comment" file="/changeset/changeset_file_comment.html"/> <%namespace name="diff_block" file="/changeset/diff_block.html"/> ${diff_block.diff_block_js()} %for cs in c.cs_ranges: +
## diff block
${h.show_id(cs)} @@ -107,6 +110,7 @@ ${self.repo_context_bar('changelog')} <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %> ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev, c.repo_name, 'rev', cs_rev, cs_rev, file_diff_data)} +
%endfor
diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html +++ b/kallithea/templates/compare/compare_diff.html @@ -24,6 +24,7 @@ ${self.repo_context_bar('changelog')} ${self.breadcrumbs()}
+
## divs are "inline-block" and cannot have whitespace between them. @@ -80,7 +81,7 @@ ${self.repo_context_bar('changelog')}
${_('Changeset was too big and was cut off...')} ${_('Show full diff anyway')}
%endif
-
+
## diff block <%namespace name="diff_block" file="/changeset/diff_block.html"/> @@ -90,6 +91,7 @@ ${self.repo_context_bar('changelog')} % if c.limited_diff:

${_('Changeset was too big and was cut off...')} ${_('Show full diff')}

% endif +
%endif
diff --git a/kallithea/templates/files/file_diff.html b/kallithea/templates/files/file_diff.html --- a/kallithea/templates/files/file_diff.html +++ b/kallithea/templates/files/file_diff.html @@ -18,7 +18,7 @@ ${self.repo_context_bar('changelog')}
${self.breadcrumbs()}
-
+
## diff block <%namespace name="diff_block" file="/changeset/diff_block.html"/> ${diff_block.diff_block_js()} diff --git a/kallithea/templates/files/files_browser.html b/kallithea/templates/files/files_browser.html --- a/kallithea/templates/files/files_browser.html +++ b/kallithea/templates/files/files_browser.html @@ -55,7 +55,7 @@
-
+
diff --git a/kallithea/templates/forks/fork.html b/kallithea/templates/forks/fork.html --- a/kallithea/templates/forks/fork.html +++ b/kallithea/templates/forks/fork.html @@ -20,7 +20,7 @@ ${self.repo_context_bar('createfork')} ${self.breadcrumbs()} ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))} -
+
diff --git a/kallithea/templates/index_base.html b/kallithea/templates/index_base.html --- a/kallithea/templates/index_base.html +++ b/kallithea/templates/index_base.html @@ -1,7 +1,7 @@ <%page args="parent,group_name=''" />
- %if c.groups:
-
@@ -71,10 +70,9 @@ % endfor
-
%endif -
+
diff --git a/kallithea/templates/journal/journal.html b/kallithea/templates/journal/journal.html --- a/kallithea/templates/journal/journal.html +++ b/kallithea/templates/journal/journal.html @@ -25,14 +25,14 @@
${self.breadcrumbs()}
- -
+
<%include file='journal_data.html'/>
diff --git a/kallithea/templates/journal/public_journal.html b/kallithea/templates/journal/public_journal.html --- a/kallithea/templates/journal/public_journal.html +++ b/kallithea/templates/journal/public_journal.html @@ -20,12 +20,12 @@
${_('Public Journal')}
-
+
-
+
<%include file='journal_data.html'/>
diff --git a/kallithea/templates/login.html b/kallithea/templates/login.html --- a/kallithea/templates/login.html +++ b/kallithea/templates/login.html @@ -5,16 +5,16 @@ ${_('Log In')} -
- <%include file="/base/flash_msg.html"/> -
+<%include file="/base/flash_msg.html"/> +
+
%if c.site_name:
${_('Log In to %s') % c.site_name}
%else:
${_('Log In')}
%endif
-
+
${h.form(url('login_home', came_from=c.came_from))}
diff --git a/kallithea/templates/password_reset.html b/kallithea/templates/password_reset.html --- a/kallithea/templates/password_reset.html +++ b/kallithea/templates/password_reset.html @@ -5,16 +5,16 @@ ${_('Password Reset')} -
- <%include file="/base/flash_msg.html"/> -
+<%include file="/base/flash_msg.html"/> +
+
%if c.site_name:
${_('Reset Your Password to %s') % c.site_name}
%else:
${_('Reset Your Password')}
%endif
-
+
${h.form(url('password_reset'))}
@@ -64,4 +64,4 @@ });
-
+
diff --git a/kallithea/templates/password_reset_confirmation.html b/kallithea/templates/password_reset_confirmation.html --- a/kallithea/templates/password_reset_confirmation.html +++ b/kallithea/templates/password_reset_confirmation.html @@ -5,23 +5,22 @@ ${_('Reset Your Password')} -
- <%include file="/base/flash_msg.html"/> -
+<%include file="/base/flash_msg.html"/> + +
+
%if c.site_name:
${_('Reset Your Password to %s') % c.site_name}
%else:
${_('Reset Your Password')}
%endif
-
+
${h.form(h.url('reset_password_confirmation'), method='post')}

${_('You are about to set a new password for the email address %s.') % c.email}

${_('Note that you must use the same browser session for this as the one used to request the password reset.')}

-
- ${h.hidden('email')} - ${h.hidden('timestamp')} -
+ ${h.hidden('email')} + ${h.hidden('timestamp')}
diff --git a/kallithea/templates/pullrequests/pullrequest.html b/kallithea/templates/pullrequests/pullrequest.html --- a/kallithea/templates/pullrequests/pullrequest.html +++ b/kallithea/templates/pullrequests/pullrequest.html @@ -20,9 +20,9 @@ ${self.repo_context_bar('showpullrequest
${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')} -
- -
+
+
+
@@ -40,7 +40,7 @@ ${self.repo_context_bar('showpullrequest
-
+
##ORG
@@ -71,7 +71,6 @@ ${self.repo_context_bar('showpullrequest
-
@@ -82,12 +81,13 @@ ${self.repo_context_bar('showpullrequest
+
-

${_('Changesets')}

+

${_('Changesets')}

## overview pulled by ajax
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -22,7 +22,7 @@ ${self.repo_context_bar('showpullrequest ${self.breadcrumbs()}
- ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form')} + ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form',class_='panel-body')}

@@ -152,7 +152,7 @@ ${self.repo_context_bar('showpullrequest
${c.update_msg}
%if c.avail_revs: -
+
@@ -286,7 +286,8 @@ ${self.repo_context_bar('showpullrequest
-
+
+
${comment.comment_count(c.inline_cnt, len(c.comments))}
@@ -326,7 +327,8 @@ ${self.repo_context_bar('showpullrequest
${_('Changeset was too big and was cut off...')} ${_('Show full diff anyway')}
%endif
-
+
+
## diff block +
<%namespace name="diff_block" file="/changeset/diff_block.html"/> ${diff_block.diff_block_js()} @@ -350,6 +353,7 @@ ${self.repo_context_bar('showpullrequest

${_('Changeset was too big and was cut off...')} ${_('Show full diff anyway')}

% endif
+
## template for inline comment form ${comment.comment_inline_form()} diff --git a/kallithea/templates/pullrequests/pullrequest_show_all.html b/kallithea/templates/pullrequests/pullrequest_show_all.html --- a/kallithea/templates/pullrequests/pullrequest_show_all.html +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html @@ -38,7 +38,7 @@ ${self.repo_context_bar('showpullrequest

-
+
%if c.closed: ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_))} @@ -46,9 +46,9 @@ ${self.repo_context_bar('showpullrequest ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_,closed=1))} %endif
+ + ${pullrequest_data.pullrequest_overview(c.pullrequests_pager)}
- ${pullrequest_data.pullrequest_overview(c.pullrequests_pager)} -
diff --git a/kallithea/templates/pullrequests/pullrequest_show_my.html b/kallithea/templates/pullrequests/pullrequest_show_my.html --- a/kallithea/templates/pullrequests/pullrequest_show_my.html +++ b/kallithea/templates/pullrequests/pullrequest_show_my.html @@ -21,7 +21,8 @@ ${self.breadcrumbs()}
-
+
+
%if c.closed: ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('my_pullrequests'))} @@ -38,6 +39,7 @@

${_('Pull Requests I Participate In')}

${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests)} +
diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html --- a/kallithea/templates/register.html +++ b/kallithea/templates/register.html @@ -5,16 +5,17 @@ ${_('Sign Up')} -
- <%include file="/base/flash_msg.html"/> -
+<%include file="/base/flash_msg.html"/> + +
+
%if c.site_name:
${_('Sign Up to %s') % c.site_name}
%else:
${_('Sign Up')}
%endif
-
+
${h.form(url('register'))}
diff --git a/kallithea/templates/search/search.html b/kallithea/templates/search/search.html --- a/kallithea/templates/search/search.html +++ b/kallithea/templates/search/search.html @@ -41,7 +41,8 @@ ${self.repo_context_bar('options')} %else: ${h.form(h.url('search'),method='get')} %endif -
+ +
diff --git a/kallithea/templates/search/search_path.html b/kallithea/templates/search/search_path.html --- a/kallithea/templates/search/search_path.html +++ b/kallithea/templates/search/search_path.html @@ -2,8 +2,8 @@ %for cnt,sr in enumerate(c.formated_results): %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(sr['repository'],'search results check'): -
-