From 8c6246a4e51b8129a5603f534db1d4dac5b6cd59 Mon Sep 17 00:00:00 2001 From: Ambroise Maupate Date: Tue, 12 Sep 2023 17:54:39 +0200 Subject: [PATCH] style: Better table style for horizontal ones --- .../templates/admin/edit.html.twig | 4 +- .../templates/documents/preview.html.twig | 12 ++-- .../templates/nodes/editAliases.html.twig | 4 +- .../templates/realms/edit.html.twig | 4 +- lib/Rozier/src/Resources/app/less/common.less | 8 ++- .../src/Resources/app/less/forms/forms.less | 20 +++---- .../app/less/node-types/node-types.less | 5 +- .../src/Resources/app/less/tables/tables.less | 11 ++-- .../views/cache/deleteDoctrine.html.twig | 2 +- .../views/custom-forms/edit.html.twig | 4 +- .../Resources/views/documents/edit.html.twig | 12 ++-- .../Resources/views/folders/edit.html.twig | 6 +- .../Resources/views/node-types/edit.html.twig | 4 +- .../Resources/views/node-types/list.html.twig | 2 +- .../views/nodes/attributes/edit.html.twig | 55 ++++++++----------- .../src/Resources/views/nodes/edit.html.twig | 6 +- .../views/partials/js-inject.html.twig | 4 +- .../views/partials/simple-js-inject.html.twig | 2 +- .../Resources/views/tags/settings.html.twig | 6 +- .../src/Resources/views/users/edit.html.twig | 4 +- .../static/css/app.52aa5b7a45890ac8c622.css | 2 +- .../css/app.52aa5b7a45890ac8c622.css.map | 2 +- ...7764a84.js => app.4709f8b7db4362e04115.js} | 0 ...4a84.js => simple.4709f8b7db4362e04115.js} | 0 ...4a84.js => vendor.4709f8b7db4362e04115.js} | 0 25 files changed, 88 insertions(+), 91 deletions(-) rename lib/Rozier/src/static/js/{app.bef642fdf27e97764a84.js => app.4709f8b7db4362e04115.js} (100%) rename lib/Rozier/src/static/js/{simple.bef642fdf27e97764a84.js => simple.4709f8b7db4362e04115.js} (100%) rename lib/Rozier/src/static/js/{vendor.bef642fdf27e97764a84.js => vendor.4709f8b7db4362e04115.js} (100%) diff --git a/lib/RoadizFontBundle/templates/admin/edit.html.twig b/lib/RoadizFontBundle/templates/admin/edit.html.twig index e7819fd1..8aab8164 100644 --- a/lib/RoadizFontBundle/templates/admin/edit.html.twig +++ b/lib/RoadizFontBundle/templates/admin/edit.html.twig @@ -6,11 +6,11 @@
- + - +
{% trans %}created.at{% endtrans %}{% trans %}created.at{% endtrans %} {{ item.createdAt|format_datetime('long', locale=app.request.locale) }}
{% trans %}updated.at{% endtrans %}{% trans %}updated.at{% endtrans %} {{ item.updatedAt|format_datetime('long', locale=app.request.locale) }}
diff --git a/lib/RoadizRozierBundle/templates/documents/preview.html.twig b/lib/RoadizRozierBundle/templates/documents/preview.html.twig index 99debc57..49d0c9e2 100644 --- a/lib/RoadizRozierBundle/templates/documents/preview.html.twig +++ b/lib/RoadizRozierBundle/templates/documents/preview.html.twig @@ -48,15 +48,15 @@
- - - + + + {% if document.isEmbed and document|embedFinder %} - + {% endif %} - + {% for key, info in infos %} - + {% endfor %}
{% trans %}document.relative_url{% endtrans %}{{ document|url(thumbnailFormat) }}
{% trans %}document.absolute_url{% endtrans %}{{ document|url(thumbnailFormat|merge({absolute:true})) }}
{% trans %}document.unprocessed_url{% endtrans %}{{ document|url({noProcess:true}) }}
{% trans %}document.relative_url{% endtrans %}{{ document|url(thumbnailFormat) }}
{% trans %}document.absolute_url{% endtrans %}{{ document|url(thumbnailFormat|merge({absolute:true})) }}
{% trans %}document.unprocessed_url{% endtrans %}{{ document|url({noProcess:true}) }}
{% trans %}document.source_url{% endtrans %}{{ (document|embedFinder).source }}
{% trans %}document.source_url{% endtrans %}{{ (document|embedFinder).source }}
{% trans %}document.filesize{% endtrans %}{{ document.filesize|formatBytes }}
{% trans %}document.filesize{% endtrans %}{{ document.filesize|formatBytes }}
{{ ('document.' ~ key)|trans }}{{ info }}
{{ ('document.' ~ key)|trans }}{{ info }}
{% if otherVideos|length %} diff --git a/lib/RoadizRozierBundle/templates/nodes/editAliases.html.twig b/lib/RoadizRozierBundle/templates/nodes/editAliases.html.twig index 1c73d51c..39a93c47 100644 --- a/lib/RoadizRozierBundle/templates/nodes/editAliases.html.twig +++ b/lib/RoadizRozierBundle/templates/nodes/editAliases.html.twig @@ -39,7 +39,7 @@ {% endif %}

{% trans %}urlAlias{% endtrans %}

-

{% trans %}nodeSource.urlAlias.help{% endtrans %}

+

{% trans %}nodeSource.urlAlias.help{% endtrans %}

@@ -75,7 +75,7 @@

{% trans %}manage.redirections{% endtrans %}

-

{% trans %}nodeSource.redirections.help{% endtrans %}

+

{% trans %}nodeSource.redirections.help{% endtrans %}

diff --git a/lib/RoadizRozierBundle/templates/realms/edit.html.twig b/lib/RoadizRozierBundle/templates/realms/edit.html.twig index 8a78d20d..95423e84 100644 --- a/lib/RoadizRozierBundle/templates/realms/edit.html.twig +++ b/lib/RoadizRozierBundle/templates/realms/edit.html.twig @@ -7,11 +7,11 @@
- + - +
{% trans %}created.at{% endtrans %}{% trans %}created.at{% endtrans %} {{ item.createdAt|format_datetime('long', locale=app.request.locale) }}
{% trans %}updated.at{% endtrans %}{% trans %}updated.at{% endtrans %} {{ item.updatedAt|format_datetime('long', locale=app.request.locale) }}
diff --git a/lib/Rozier/src/Resources/app/less/common.less b/lib/Rozier/src/Resources/app/less/common.less index 60c62486..289f358a 100644 --- a/lib/Rozier/src/Resources/app/less/common.less +++ b/lib/Rozier/src/Resources/app/less/common.less @@ -85,7 +85,13 @@ background: #CCC; .uk-text-small { max-width: 650px; - letter-spacing: 0.02em; + font-size: 12px; + letter-spacing: 0.005em; + line-height: 17px; + + &.uk-text-muted { + color: #a5a5a5 !important; + } } .uk-text-danger { diff --git a/lib/Rozier/src/Resources/app/less/forms/forms.less b/lib/Rozier/src/Resources/app/less/forms/forms.less index 08d9e150..1d1c77cb 100644 --- a/lib/Rozier/src/Resources/app/less/forms/forms.less +++ b/lib/Rozier/src/Resources/app/less/forms/forms.less @@ -319,16 +319,6 @@ } } - .form-row-desc { - max-width: 450px; - font-size: 12px; - letter-spacing: 0.005em; - line-height: 16px; - color: #b0b0b0; - margin: 5px 0 10px; - display: block; - } - .datetime-separator{ display: none; } @@ -413,6 +403,16 @@ } } +.form-row-desc { + max-width: 550px; + font-size: 12px; + letter-spacing: 0.005em; + line-height: 17px; + color: #a5a5a5; + margin: 5px 0 10px; + display: block; +} + .uk-form-row { position: relative; margin: 1em 0; diff --git a/lib/Rozier/src/Resources/app/less/node-types/node-types.less b/lib/Rozier/src/Resources/app/less/node-types/node-types.less index cda5c7dc..13058cef 100644 --- a/lib/Rozier/src/Resources/app/less/node-types/node-types.less +++ b/lib/Rozier/src/Resources/app/less/node-types/node-types.less @@ -17,7 +17,7 @@ padding-left: 15px; .color { - background-color: attr(data-color); + background-color: var(--data-color); display: block; position: absolute; top: 0; @@ -25,13 +25,12 @@ height: 100%; width: 5px; - border-left: 1px solid rgba(0,0,0,0.15); + //border-left: 1px solid rgba(0,0,0,0.15); .box-sizing(); } } .not-reachable .name { padding-left: 25px; - //border-left: 1px dashed #c5c5c5; .color { width: 10px; diff --git a/lib/Rozier/src/Resources/app/less/tables/tables.less b/lib/Rozier/src/Resources/app/less/tables/tables.less index 009e0e5e..935d7cf5 100644 --- a/lib/Rozier/src/Resources/app/less/tables/tables.less +++ b/lib/Rozier/src/Resources/app/less/tables/tables.less @@ -47,9 +47,7 @@ th { vertical-align: middle; position: relative; - color:@form-head-color; - background-color: rgba(255, 255, 255, 0.75); - //border-left:1px solid @form-head-border-color; + color: @form-head-color; .box-sizing(); a { @@ -60,6 +58,11 @@ } } } + thead { + th { + background-color: rgba(255, 255, 255, 0.75); + } + } td { border-top: 1px solid white; border-bottom: 1px solid @form-row-border-color; @@ -75,7 +78,7 @@ } &:nth-of-type(2n){ - td { + td, th { background-color: rgba(255, 255, 255, 0.75); } } diff --git a/lib/Rozier/src/Resources/views/cache/deleteDoctrine.html.twig b/lib/Rozier/src/Resources/views/cache/deleteDoctrine.html.twig index bce9762f..69c14f2f 100644 --- a/lib/Rozier/src/Resources/views/cache/deleteDoctrine.html.twig +++ b/lib/Rozier/src/Resources/views/cache/deleteDoctrine.html.twig @@ -34,7 +34,7 @@ {% for key, cache in cachesInfo %} - + {% endfor %} diff --git a/lib/Rozier/src/Resources/views/custom-forms/edit.html.twig b/lib/Rozier/src/Resources/views/custom-forms/edit.html.twig index e37554a7..6f013dbb 100644 --- a/lib/Rozier/src/Resources/views/custom-forms/edit.html.twig +++ b/lib/Rozier/src/Resources/views/custom-forms/edit.html.twig @@ -19,11 +19,11 @@
{{ key|trans }}{{ key|trans }} {% if cache %} {{ cache }}{% else %} {% trans %}no.cache.available{% endtrans %}{% endif %}
- + - +
{% trans %}created.at{% endtrans %}{% trans %}created.at{% endtrans %} {{ item.createdAt|format_datetime('long', locale=app.request.locale) }}
{% trans %}updated.at{% endtrans %}{% trans %}updated.at{% endtrans %} {{ item.updatedAt|format_datetime('long', locale=app.request.locale) }}
diff --git a/lib/Rozier/src/Resources/views/documents/edit.html.twig b/lib/Rozier/src/Resources/views/documents/edit.html.twig index b5435632..af6503c6 100644 --- a/lib/Rozier/src/Resources/views/documents/edit.html.twig +++ b/lib/Rozier/src/Resources/views/documents/edit.html.twig @@ -27,34 +27,34 @@ + {% if addAttributeForm %} +
+ {% form_theme addAttributeForm '@RoadizRozier/horizontalForms.html.twig' %} + {{ form_start(addAttributeForm, { + 'attr': { + 'id': 'add-node-attribute-form', + 'class': 'uk-form uk-form-stacked' + } + }) }}{{ form_widget(addAttributeForm) }} + {% apply spaceless %} + + {% endapply %} + {{ form_end(addAttributeForm) }} +
+ {% endif %}
{% set currentPath = path('nodesEditAttributesPage', { diff --git a/lib/Rozier/src/Resources/views/nodes/edit.html.twig b/lib/Rozier/src/Resources/views/nodes/edit.html.twig index 1aac19b7..6d969941 100644 --- a/lib/Rozier/src/Resources/views/nodes/edit.html.twig +++ b/lib/Rozier/src/Resources/views/nodes/edit.html.twig @@ -38,15 +38,15 @@