Mercurial > libervia-templates
changeset 170:6c251da9a4f3
style improvment
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Sat, 19 Jan 2019 11:49:18 +0100 |
| parents | 4b5ad18f6ece |
| children | cede18c118c9 |
| files | sat_templates/templates/default/app/app.html sat_templates/templates/default/merge-request/edit.html sat_templates/templates/default/static/merge-request_item.css sat_templates/templates/default/static/styles.css sat_templates/templates/default/static/ticket.css sat_templates/templates/default/ticket/create.html sat_templates/templates/default/ticket/edit.html sat_templates/templates/default/ticket/item.html |
| diffstat | 8 files changed, 33 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/sat_templates/templates/default/app/app.html Sat Jan 19 11:46:13 2019 +0100 +++ b/sat_templates/templates/default/app/app.html Sat Jan 19 11:49:18 2019 +0100 @@ -1,6 +1,6 @@ {% extends 'base/base.html' %} {% block body %} - <article class="box"> + <article class="box box--large"> <p> {% trans app_name=C.APP_NAME %} The following link allows you to access {{app_name}} web application, which is a more feature rich way to use this software (but it is also a bit more heavy and complex to use).
--- a/sat_templates/templates/default/merge-request/edit.html Sat Jan 19 11:46:13 2019 +0100 +++ b/sat_templates/templates/default/merge-request/edit.html Sat Jan 19 11:49:18 2019 +0100 @@ -8,16 +8,19 @@ {% import 'input/xmlui.html' as xmlui with context %} {% block body %} -<div class='instructions'> - <p><span class="box">{% trans app_name=C.APP_NAME%}Note: to modify content of the merge request, you'll have to use command line (with jp){% endtrans %}</span></p> +<div class='instructions instructions--border box box--medium'> + <p> + <strong>{% trans %}Note:{% endtrans %}</strong> + {% trans app_name=C.APP_NAME%}to modify content of the merge request, you'll have to use command line (with jp){% endtrans %} + </p> </div> -<div class="create single ticket box"> +<div class="create single ticket box box--medium"> {% call form.form() %} {{ xmlui.generate(new_ticket_xmlui, attributes = {'title': {'required': 'required', 'placeholder': _("Short description of your issue/request")}, 'body': {'required': 'required', - 'placeholder': _("Please describe your issue/request with as much details as possible")}, + 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, })}} {{ field.submit(_("Modify ticket")) }}
--- a/sat_templates/templates/default/static/merge-request_item.css Sat Jan 19 11:46:13 2019 +0100 +++ b/sat_templates/templates/default/static/merge-request_item.css Sat Jan 19 11:49:18 2019 +0100 @@ -18,10 +18,6 @@ margin: 0 auto; } -.view #wid_body { - border: 1px solid silver; -} - #tab_patches { overflow: auto; }
--- a/sat_templates/templates/default/static/styles.css Sat Jan 19 11:46:13 2019 +0100 +++ b/sat_templates/templates/default/static/styles.css Sat Jan 19 11:49:18 2019 +0100 @@ -37,8 +37,19 @@ padding: 0; } -#main_side_bar { +p { + margin: 0; +} +blockquote { + margin: 1em 0; + padding-left: 0.3em; + border-left: 0.3rem solid #CCC; +} + +code { + border: solid 1px #DDD; + padding: 0.2em; } #main_area { @@ -206,6 +217,10 @@ text-align: center; } +.instructions--border { + border: 0.2em solid #ccc; +} + .instructions--alt { text-align: center; font-style: italic; @@ -261,9 +276,8 @@ .box { background: var(--color-prim--light); position: relative; - border-top: solid 1px var(--color-prim-dark); margin: 0 auto; - padding: 2rem; + padding: 0.3rem; max-width: 100em; }
--- a/sat_templates/templates/default/static/ticket.css Sat Jan 19 11:46:13 2019 +0100 +++ b/sat_templates/templates/default/static/ticket.css Sat Jan 19 11:49:18 2019 +0100 @@ -14,12 +14,6 @@ /* single ticket */ -.ticket { - padding: 20px; - max-width: 500px; - margin: 0 auto; -} - .view .xmlui_widget { width: auto; } @@ -104,12 +98,13 @@ white-space: pre-wrap; max-height: 500px; overflow: auto; - resize: both; + resize: vertical; background-color: white; padding: 5px; text-align: justify; - border: 1px solid black; - border-radius: 5px; + border-color: #ddd; + border-style: solid; + border-width: 1px 0; grid-column-start: 1; grid-column-end: 3; display: block;
--- a/sat_templates/templates/default/ticket/create.html Sat Jan 19 11:46:13 2019 +0100 +++ b/sat_templates/templates/default/ticket/create.html Sat Jan 19 11:49:18 2019 +0100 @@ -16,7 +16,7 @@ attributes = {'title': {'required': 'required', 'placeholder': _("Short description of your issue/request")}, 'body': {'required': 'required', - 'placeholder': _("Please describe your issue/request with as much details as possible")}, + 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, })}} {{ field.submit(_("Create ticket")) }}
--- a/sat_templates/templates/default/ticket/edit.html Sat Jan 19 11:46:13 2019 +0100 +++ b/sat_templates/templates/default/ticket/edit.html Sat Jan 19 11:49:18 2019 +0100 @@ -7,13 +7,13 @@ {% import 'input/xmlui.html' as xmlui with context %} {% block body %} -<div class="create single ticket box"> +<div class="create single ticket box box--medium"> {% call form.form() %} {{ xmlui.generate(new_ticket_xmlui, attributes = {'title': {'required': 'required', 'placeholder': _("Short description of your issue/request")}, 'body': {'required': 'required', - 'placeholder': _("Please describe your issue/request with as much details as possible")}, + 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, })}} {{ field.submit(_("Modify ticket")) }}
--- a/sat_templates/templates/default/ticket/item.html Sat Jan 19 11:46:13 2019 +0100 +++ b/sat_templates/templates/default/ticket/item.html Sat Jan 19 11:49:18 2019 +0100 @@ -22,7 +22,7 @@ {% block body %} {{ icon_defs('pencil') }} -<div id="{{ item.widget_value['id'] }}" class="view single ticket box"> +<div id="{{ item.widget_value['id'] }}" class="view single ticket box box--medium"> {% if url_ticket_edit is defined %} <p class="box__tools"> <a href="{{url_ticket_edit}}">