# HG changeset patch # User Mads Kiilerich # Date 2016-12-24 17:26:48 # Node ID ba18d1f6d081cda92b574d5f37b1907554e57c4d # Parent b172a000249d17490e6663152fb4f1f008343ec2 style: refactor panel headings - use pull-left and pull-right and introduce clearfix like Bootstrap 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 @@ -576,11 +576,42 @@ div.header img { float: left; color: #fff; margin: 0; - padding: 11px 10px 11px 10px; -} - -#content div.panel div.panel-heading .links.icon-only-links { - float: right; + 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; +} + +.clearfix::after, .dl-horizontal dd::after, .container::after, .container-fluid::after, .row::after, .form-horizontal .form-group::after, .btn-toolbar::after, .btn-group-vertical > .btn-group::after, .nav::after, .navbar::after, .navbar-header::after, .navbar-collapse::after, .pager::after, .panel::after, .panel-body::after, .modal-header::after, .modal-footer::after, td.inline-comments::after { + clear: both; +} + +/* avoid conflict with .container in changeset tables */ +#content div.panel table .container::before, +#content div.panel table .container::after { + content: inherit; + display: inherit; +} + +.pull-left { + float: left; +} + +.pull-right { + float: right; +} + +#content div.panel div.panel-heading .pull-left { + margin: 10px; + color: white; +} + +#content div.panel div.panel-heading .pull-right { + margin: 5px; + color: white; } #content div.panel h1, @@ -1452,7 +1483,6 @@ a.metatag[data-tag="license"]:hover { width: 170px; } #quick_login .links_right { - position: absolute; right: 0; } @@ -2776,8 +2806,11 @@ table.code-browser i[class^='icon-'] { float: left; font-weight: 700; font-size: 14px; + margin: 10px; +} + +.pull-left .breadcrumbs { margin: 0; - padding: 11px 0 11px 10px; } .breadcrumbs .hash { diff --git a/kallithea/templates/about.html b/kallithea/templates/about.html --- a/kallithea/templates/about.html +++ b/kallithea/templates/about.html @@ -12,7 +12,7 @@ <%def name="main()">
-
+
${_('About')} Kallithea
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 @@ -17,7 +17,7 @@ <%def name="main()">
-
+
${self.breadcrumbs()}
${h.form(url('auth_settings'))} diff --git a/kallithea/templates/admin/defaults/defaults.html b/kallithea/templates/admin/defaults/defaults.html --- a/kallithea/templates/admin/defaults/defaults.html +++ b/kallithea/templates/admin/defaults/defaults.html @@ -17,7 +17,7 @@ <%def name="main()">
-
+
${self.breadcrumbs()}
diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html --- a/kallithea/templates/admin/gists/edit.html +++ b/kallithea/templates/admin/gists/edit.html @@ -24,7 +24,7 @@ <%def name="main()">
-
+
${self.breadcrumbs()}
diff --git a/kallithea/templates/admin/gists/index.html b/kallithea/templates/admin/gists/index.html --- a/kallithea/templates/admin/gists/index.html +++ b/kallithea/templates/admin/gists/index.html @@ -29,13 +29,13 @@ <%def name="main()">
- ${self.breadcrumbs()} +
+ ${self.breadcrumbs()} +
%if c.authuser.username != 'default': - +
%endif
%if c.gists_pager.item_count>0: diff --git a/kallithea/templates/admin/gists/new.html b/kallithea/templates/admin/gists/new.html --- a/kallithea/templates/admin/gists/new.html +++ b/kallithea/templates/admin/gists/new.html @@ -24,7 +24,7 @@ <%def name="main()">
-
+
${self.breadcrumbs()}
diff --git a/kallithea/templates/admin/gists/show.html b/kallithea/templates/admin/gists/show.html --- a/kallithea/templates/admin/gists/show.html +++ b/kallithea/templates/admin/gists/show.html @@ -17,13 +17,13 @@ <%def name="main()">
- ${self.breadcrumbs()} +
+ ${self.breadcrumbs()} +
%if c.authuser.username != 'default': - + %endif
diff --git a/kallithea/templates/admin/my_account/my_account.html b/kallithea/templates/admin/my_account/my_account.html --- a/kallithea/templates/admin/my_account/my_account.html +++ b/kallithea/templates/admin/my_account/my_account.html @@ -15,7 +15,7 @@ <%def name="main()">
-
+
${self.breadcrumbs()}
diff --git a/kallithea/templates/admin/notifications/notifications.html b/kallithea/templates/admin/notifications/notifications.html --- a/kallithea/templates/admin/notifications/notifications.html +++ b/kallithea/templates/admin/notifications/notifications.html @@ -15,7 +15,7 @@ <%def name="main()">
-
+
${self.breadcrumbs()}
diff --git a/kallithea/templates/admin/notifications/show_notification.html b/kallithea/templates/admin/notifications/show_notification.html --- a/kallithea/templates/admin/notifications/show_notification.html +++ b/kallithea/templates/admin/notifications/show_notification.html @@ -17,7 +17,7 @@ <%def name="main()">
-
+
${self.breadcrumbs()}
diff --git a/kallithea/templates/admin/repo_groups/repo_group_add.html b/kallithea/templates/admin/repo_groups/repo_group_add.html --- a/kallithea/templates/admin/repo_groups/repo_group_add.html +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html @@ -19,7 +19,7 @@ <%def name="main()">
-
+
${self.breadcrumbs()}
${h.form(url('repos_groups'))} diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit.html b/kallithea/templates/admin/repo_groups/repo_group_edit.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html @@ -20,14 +20,14 @@ <%def name="main()"> -
+
- ${self.breadcrumbs()} - +
##main diff --git a/kallithea/templates/admin/repo_groups/repo_groups.html b/kallithea/templates/admin/repo_groups/repo_groups.html --- a/kallithea/templates/admin/repo_groups/repo_groups.html +++ b/kallithea/templates/admin/repo_groups/repo_groups.html @@ -17,14 +17,14 @@ <%def name="main()">
- ${self.breadcrumbs()} - +
diff --git a/kallithea/templates/admin/repos/repos.html b/kallithea/templates/admin/repos/repos.html --- a/kallithea/templates/admin/repos/repos.html +++ b/kallithea/templates/admin/repos/repos.html @@ -15,14 +15,14 @@
- ${self.breadcrumbs()} - +
diff --git a/kallithea/templates/admin/user_groups/user_groups.html b/kallithea/templates/admin/user_groups/user_groups.html --- a/kallithea/templates/admin/user_groups/user_groups.html +++ b/kallithea/templates/admin/user_groups/user_groups.html @@ -16,14 +16,14 @@ <%def name="main()">
- ${self.breadcrumbs()} - +
diff --git a/kallithea/templates/admin/users/users.html b/kallithea/templates/admin/users/users.html --- a/kallithea/templates/admin/users/users.html +++ b/kallithea/templates/admin/users/users.html @@ -16,12 +16,12 @@ <%def name="main()">
- ${self.breadcrumbs()} - +
diff --git a/kallithea/templates/files/files.html b/kallithea/templates/files/files.html --- a/kallithea/templates/files/files.html +++ b/kallithea/templates/files/files.html @@ -22,12 +22,12 @@ ${self.repo_context_bar('files', c.revision)}
- ${self.breadcrumbs()} - +
diff --git a/kallithea/templates/files/files_add.html b/kallithea/templates/files/files_add.html --- a/kallithea/templates/files/files_add.html +++ b/kallithea/templates/files/files_add.html @@ -25,12 +25,12 @@ ${self.repo_context_bar('files')}
- ${self.breadcrumbs()} - +
+ ${self.breadcrumbs()} +
+
diff --git a/kallithea/templates/files/files_delete.html b/kallithea/templates/files/files_delete.html --- a/kallithea/templates/files/files_delete.html +++ b/kallithea/templates/files/files_delete.html @@ -16,12 +16,12 @@ ${self.repo_context_bar('files')}
- ${self.breadcrumbs()} - +
+ ${self.breadcrumbs()} +
+
diff --git a/kallithea/templates/files/files_edit.html b/kallithea/templates/files/files_edit.html --- a/kallithea/templates/files/files_edit.html +++ b/kallithea/templates/files/files_edit.html @@ -25,12 +25,12 @@ ${self.repo_context_bar('files')}
- ${self.breadcrumbs()} - +
+ ${self.breadcrumbs()} +
+
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 @@ -16,6 +16,9 @@ <%def name="main()"> ${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/journal/journal.html b/kallithea/templates/journal/journal.html --- a/kallithea/templates/journal/journal.html +++ b/kallithea/templates/journal/journal.html @@ -22,8 +22,10 @@ <%def name="main()">
- ${self.breadcrumbs()} -