From 3caac22a0e59e5fbe7aa86bdc79c3e49b9530be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sat, 4 Jan 2020 21:42:44 +0100 Subject: [PATCH] Improved mobile view for part edit and sidebar. --- assets/css/app.css | 16 +++++++++++--- assets/js/app.js | 1 - package.json | 2 +- .../Form/extendedBootstrap4_layout.html.twig | 4 ++-- templates/Parts/edit/_orderdetails.html.twig | 2 +- .../Parts/info/_attachments_info.html.twig | 2 +- .../Parts/info/_extended_infos.html.twig | 2 +- templates/Parts/info/_main_infos.html.twig | 4 ++-- templates/Parts/info/_order_infos.html.twig | 2 +- templates/Parts/info/_part_lots.html.twig | 3 +-- templates/Parts/info/show_part_info.html.twig | 2 +- templates/Users/_2fa_settings.html.twig | 22 +++++++++---------- templates/Users/user_info.html.twig | 4 ++-- templates/_sidebar.html.twig | 2 +- templates/security/login.html.twig | 2 +- yarn.lock | 8 +++---- 16 files changed, 43 insertions(+), 35 deletions(-) diff --git a/assets/css/app.css b/assets/css/app.css index d9b9616c..fdbdd74e 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -81,8 +81,7 @@ body { top: 56px; right: 0; left: 0; - background-color: inherit; - /* z-index: 1000; */ + z-index: 1000; width: inherit; overflow-x: hidden; overflow-y: auto; @@ -93,11 +92,16 @@ body { padding: 7px 15px 50px; margin-top: -10px; + /* Fill window */ + height: 100%; + /** Hide scrollbar in Firefox and Edge **/ -ms-overflow-style: none; overflow: -moz-scrollbars-none; /* Use standard version for hiding the scrollbar */ scrollbar-width: none; + + background-color: var(--light); } .sidebar-container { @@ -105,6 +109,11 @@ body { padding-top: 5px; background-color: #F8F8F8; } + + /* Hide devices menu */ + #treeBox-devices { + display: none; + } } /* Hide scrollbar */ @@ -645,7 +654,8 @@ BS 4 overrides } } -.form-group > label { +.form-group > label, +.form-group > .col-form-label { font-weight: bold; } diff --git a/assets/js/app.js b/assets/js/app.js index 9d23993e..1a64e6a1 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -103,7 +103,6 @@ window.ajaxUI = ajaxUI; require('../ts_src/event_listeners'); - //Register darkmode (we must do it here, TS does not support ES6 constructor... try { //The browser needs to support mix blend mode diff --git a/package.json b/package.json index d5b11bd3..71c62ede 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "clipboard": "^2.0.4", "copy-webpack-plugin": "^5.0.4", "corejs-typeahead": "^1.2.1", - "darkmode-js": "^1.5.3", + "darkmode-js": "1.5.3", "datatables.net-bs4": "^1.10.19", "datatables.net-buttons-bs4": "^1.5.4", "datatables.net-colreorder-bs4": "^1.5.1", diff --git a/templates/Form/extendedBootstrap4_layout.html.twig b/templates/Form/extendedBootstrap4_layout.html.twig index 06e3cdd5..08fda2a9 100644 --- a/templates/Form/extendedBootstrap4_layout.html.twig +++ b/templates/Form/extendedBootstrap4_layout.html.twig @@ -7,11 +7,11 @@ {% block form_label_class -%} - col-3 + col-sm-3 {%- endblock form_label_class %} {% block form_group_class -%} - col-9 + col-sm-9 {%- endblock form_group_class %} {%- block choice_widget_options -%} diff --git a/templates/Parts/edit/_orderdetails.html.twig b/templates/Parts/edit/_orderdetails.html.twig index a6e85760..27bc3a45 100644 --- a/templates/Parts/edit/_orderdetails.html.twig +++ b/templates/Parts/edit/_orderdetails.html.twig @@ -1,6 +1,6 @@ {% form_theme form with ['Parts/edit/edit_form_styles.html.twig', "bootstrap_4_layout.html.twig"] %} - +
{% for detail in form.orderdetails %} {{ form_widget(detail, {'disable_delete' : not is_granted('orderdetails.delete', part)}) }} diff --git a/templates/Parts/info/_attachments_info.html.twig b/templates/Parts/info/_attachments_info.html.twig index 28e52ba9..9d9830e7 100644 --- a/templates/Parts/info/_attachments_info.html.twig +++ b/templates/Parts/info/_attachments_info.html.twig @@ -1,6 +1,6 @@ {% import "helper.twig" as helper %} -
+
diff --git a/templates/Parts/info/_extended_infos.html.twig b/templates/Parts/info/_extended_infos.html.twig index 74bfb88a..d84552c5 100644 --- a/templates/Parts/info/_extended_infos.html.twig +++ b/templates/Parts/info/_extended_infos.html.twig @@ -1,6 +1,6 @@ {% import "helper.twig" as helper %} -
+
{# Creation date #} diff --git a/templates/Parts/info/_main_infos.html.twig b/templates/Parts/info/_main_infos.html.twig index f363c84c..51564746 100644 --- a/templates/Parts/info/_main_infos.html.twig +++ b/templates/Parts/info/_main_infos.html.twig @@ -1,10 +1,10 @@ {% import "helper.twig" as helper %}
-
+
{% include "Parts/info/_picture.html.twig" %}
-
+
{% if part.manufacturer %} {% if part.manufacturer.id is not null %} diff --git a/templates/Parts/info/_order_infos.html.twig b/templates/Parts/info/_order_infos.html.twig index 4a018bea..2a26689c 100644 --- a/templates/Parts/info/_order_infos.html.twig +++ b/templates/Parts/info/_order_infos.html.twig @@ -1,5 +1,5 @@
-
{% trans %}createdAt{% endtrans %}
+
diff --git a/templates/Parts/info/_part_lots.html.twig b/templates/Parts/info/_part_lots.html.twig index 50ad67cb..ad1e43e6 100644 --- a/templates/Parts/info/_part_lots.html.twig +++ b/templates/Parts/info/_part_lots.html.twig @@ -1,13 +1,12 @@ {% import "helper.twig" as helper %} -
{% trans %}part.supplier.name{% endtrans %}
+
{# Tags row #} - diff --git a/templates/Parts/info/show_part_info.html.twig b/templates/Parts/info/show_part_info.html.twig index 4527db35..0a420a15 100644 --- a/templates/Parts/info/show_part_info.html.twig +++ b/templates/Parts/info/show_part_info.html.twig @@ -19,7 +19,7 @@ {% include "Parts/info/_main_infos.html.twig" %} -
+
{% include "Parts/info/_sidebar.html.twig" %}
diff --git a/templates/Users/_2fa_settings.html.twig b/templates/Users/_2fa_settings.html.twig index 56ac7255..0863904f 100644 --- a/templates/Users/_2fa_settings.html.twig +++ b/templates/Users/_2fa_settings.html.twig @@ -35,15 +35,15 @@ {{ form_start(google_form, { 'attr': google_form_attr}) }} {% if not tfa_google.enabled %} -
+
{% trans %}tfa_google.disabled_message{% endtrans %}
-
-
+
+
-
+
  1. {% trans %}tfa_google.step.download{% endtrans %}
  2. {% trans %}tfa_google.step.scan{% endtrans %}
    3. @@ -53,7 +53,7 @@
-
+
@@ -70,7 +70,7 @@ {{ form_row(google_form.google_confirmation) }} {% else %} -
+
{% trans %}tfa_google.enabled_message{% endtrans %}
{% endif %} @@ -79,7 +79,7 @@
{% if user.backupCodes is empty %} -
+
{% trans %}tfa_backup.disabled{% endtrans %}
{% trans %}tfa_backup.explanation{% endtrans %}
@@ -87,19 +87,19 @@ {% set backup_form_attr = { 'data-delete-form': true, 'data-title': 'tfa_backup.reset_codes.confirm_title' | trans, 'data-message': 'tfa_backup.reset_codes.confirm_message' | trans} %} {{ form_start(backup_form, { 'attr': backup_form_attr}) }} -
+
{% trans %}tfa_backup.enabled{% endtrans %}
{% trans %}tfa_backup.explanation{% endtrans %}
-
+

{% trans %}tfa_backup.remaining_tokens{% endtrans %}: {{ user.backupCodes | length }}

{% trans %}tfa_backup.generation_date{% endtrans %}: {{ user.backupCodesGenerationDate | format_datetime }}

-
+
{% trans %}tfa_backup.show_codes{% endtrans %}
-
+
{{ form_widget(backup_form.reset_codes) }}
{{ form_end(backup_form) }} diff --git a/templates/Users/user_info.html.twig b/templates/Users/user_info.html.twig index 8293bc18..42a2b663 100644 --- a/templates/Users/user_info.html.twig +++ b/templates/Users/user_info.html.twig @@ -8,8 +8,8 @@ {% block card_content %}
-
- User avatar +
+ User avatar
diff --git a/templates/_sidebar.html.twig b/templates/_sidebar.html.twig index 6a2ee22d..2ccabdc5 100644 --- a/templates/_sidebar.html.twig +++ b/templates/_sidebar.html.twig @@ -29,7 +29,7 @@
-
  • +
    • {% trans %}part_lots.description{% endtrans %} {% trans %}part_lots.storage_location{% endtrans %} {% trans %}part_lots.amount{% endtrans %}