# HG changeset patch # User Goffi # Date 1547894958 -3600 # Node ID 6c251da9a4f3790d3d797f55fff37347e84effe5 # Parent 4b5ad18f6ece19da940eb586dc65948ad3a83cef style improvment diff -r 4b5ad18f6ece -r 6c251da9a4f3 sat_templates/templates/default/app/app.html --- 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 %} -
+

{% 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). diff -r 4b5ad18f6ece -r 6c251da9a4f3 sat_templates/templates/default/merge-request/edit.html --- 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 %} -

-

{% trans app_name=C.APP_NAME%}Note: to modify content of the merge request, you'll have to use command line (with jp){% endtrans %}

+
+

+ {% trans %}Note:{% endtrans %} + {% trans app_name=C.APP_NAME%}to modify content of the merge request, you'll have to use command line (with jp){% endtrans %} +

-
+
{% 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")) }} diff -r 4b5ad18f6ece -r 6c251da9a4f3 sat_templates/templates/default/static/merge-request_item.css --- 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; } diff -r 4b5ad18f6ece -r 6c251da9a4f3 sat_templates/templates/default/static/styles.css --- 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; } diff -r 4b5ad18f6ece -r 6c251da9a4f3 sat_templates/templates/default/static/ticket.css --- 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; diff -r 4b5ad18f6ece -r 6c251da9a4f3 sat_templates/templates/default/ticket/create.html --- 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")) }} diff -r 4b5ad18f6ece -r 6c251da9a4f3 sat_templates/templates/default/ticket/edit.html --- 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 %} -
+
{% 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")) }} diff -r 4b5ad18f6ece -r 6c251da9a4f3 sat_templates/templates/default/ticket/item.html --- 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') }} -
+
{% if url_ticket_edit is defined %}