Mercurial > kallithea
changeset 6347:ad2a922da0ba
style: temporary style tweaks before Bootstrap
Some input fields were truncated - especially if 100% width.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 04 Dec 2016 22:52:33 +0100 |
parents | 2e1f40e605b0 |
children | fb2c6f734ac9 |
files | kallithea/public/css/style.css kallithea/templates/data_table/_dt_elements.html |
diffstat | 2 files changed, 28 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Thu Dec 01 00:40:36 2016 +0100 +++ b/kallithea/public/css/style.css Sun Dec 04 22:52:33 2016 +0100 @@ -210,8 +210,7 @@ .help-block { color: #999999; display: block; - margin-bottom: 0; - margin-top: 5px; + margin: 0 0 10px; } .empty_data { @@ -804,8 +803,8 @@ min-height: 12px; border-bottom: 1px solid #DDD; clear: both; - margin: 0; - padding: 10px 0; + padding: 0; + margin: 10px 0; } #content div.panel div.form div.fields div.field-first, @@ -857,7 +856,7 @@ #content div.panel div.form div.fields div.field div.input, #content div.panel div.form div.form-horizontal div.form-group div.input { - margin: 0 0 0 200px; + margin: 0 20px 0 200px; } #content div.panel div.form div.fields div.field div.input.summary, @@ -866,18 +865,22 @@ } #content div.panel div.form div.fields div.field div.input.summary-short, #content div.panel div.form div.form-horizontal div.form-group div.input.summary-short { - margin: 0 0 0 110px; + margin: 10px 20px 10px 110px; +} +#content div.panel div.form div.form-horizontal div.form-group > div.summary-short input { + margin: 0; } #content div.panel div.form div.fields div.field div.file, #content div.panel div.form div.form-horizontal div.form-group div.file { - margin: 0 0 0 200px; + margin: 0 20px 0 200px; } #content div.panel div.form div.fields div.field div.editor, #content div.panel div.form div.form-horizontal div.form-group div.editor { - margin: 0 0 0 200px; + margin: 0 10px 0 200px; } #content div.panel div.form div.fields div.field div.input input, +#content div.panel div.form div.form-horizontal div.form-group > label > input, #content div.panel div.form div.form-horizontal div.form-group div.input input, .reviewer_ac input { background: #FFF; @@ -887,7 +890,7 @@ border-bottom: 1px solid #eaeaea; color: #000; font-size: 12px; - margin: 0; + margin: 5px 0 10px; padding: 7px 7px 6px; } @@ -918,8 +921,11 @@ } #content div.panel div.form div.fields div.field div.input input.form-control, +#content div.panel div.form div.form-horizontal div.form-group > div select.form-control, +#content div.panel div.form div.form-horizontal div.form-group > div div.form-control.select2-container, #content div.panel div.form div.form-horizontal div.form-group div.input input.form-control { width: 100%; + margin: 5px 0 10px; } #content div.panel div.form div.fields div.field div.input input.date, @@ -945,7 +951,7 @@ border-left: 1px solid #b3b3b3; border-right: 1px solid #eaeaea; border-bottom: 1px solid #eaeaea; - margin: 0 0 0 200px; + margin: 0 20px 0 200px; padding: 7px 7px 6px; } @@ -2969,7 +2975,6 @@ div.gravatar { background-color: #FFF; - float: left; margin-right: 0.7em; padding: 1px 1px 1px 1px; line-height: 0; @@ -3323,7 +3328,7 @@ #content div.panel div.form div.form-horizontal div.form-group div.checkboxes, #content div.panel div.form div.fields div.field div.radios, #content div.panel div.form div.form-horizontal div.form-group div.radios { - margin: 0 0 0 200px; + margin: 10px 20px 10px 200px; padding: 0; } @@ -3347,9 +3352,9 @@ #content div.panel div.form div.fields div.field div.radios div.radio, #content div.panel div.form div.form-horizontal div.form-group div.radios div.radio { clear: both; - overflow: hidden; - margin: 0; - padding: 8px 0 2px; + min-height: 12px; + padding: 0; + margin: 14px 0 10px; } #content div.panel div.form div.fields div.field div.checkboxes div.checkbox input, @@ -3357,7 +3362,7 @@ #content div.panel div.form div.fields div.field div.radios div.radio input, #content div.panel div.form div.form-horizontal div.form-group div.radios div.radio input { float: left; - margin: 0; + margin: -4px 5px 0px 0px; } #content div.panel div.form div.fields div.field div.checkboxes div.checkbox label, @@ -3393,7 +3398,7 @@ #content div.panel div.form div.form-horizontal div.buttons, div.form div.fields div.buttons, div.form div.form-horizontal div.buttons { - margin: 10px 0 0 200px; + margin: 10px 10px 0 200px; padding: 0; } @@ -4569,3 +4574,7 @@ .text-muted { color: #777777; } + +.grid_edit a { + text-decoration: none; +}
--- a/kallithea/templates/data_table/_dt_elements.html Thu Dec 01 00:40:36 2016 +0100 +++ b/kallithea/templates/data_table/_dt_elements.html Sun Dec 04 22:52:33 2016 +0100 @@ -163,8 +163,7 @@ <%def name="user_group_actions(user_group_id, user_group_name)"> <div style="float:left" class="grid_edit"> <a href="${h.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}"> - <i class="icon-pencil"></i> - ${h.submit('edit_%s' % user_group_name,_('Edit'),class_="btn btn-default btn-xs", id_="submit_user_group_edit")} + <i class="icon-pencil"></i> ${h.submit('edit_%s' % user_group_name,_('Edit'),class_="btn btn-default btn-xs", id_="submit_user_group_edit")} </a> </div> <div style="float:left" class="grid_delete"> @@ -179,8 +178,7 @@ <%def name="repo_group_actions(repo_group_id, repo_group_name, gr_count)"> <div style="float:left" class="grid_edit"> <a href="${h.url('edit_repo_group',group_name=repo_group_name)}" title="${_('Edit')}"> - <i class="icon-pencil"></i> - ${h.submit('edit_%s' % repo_group_name, _('Edit'),class_="btn btn-default btn-xs")} + <i class="icon-pencil"></i> ${h.submit('edit_%s' % repo_group_name, _('Edit'),class_="btn btn-default btn-xs")} </a> </div> <div style="float:left" class="grid_delete">