diff --git a/CHANGELOG.md b/CHANGELOG.md index 70a6b3e28..c4c4b6ad6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ - Fix a bug: in SSO configuration some valid endpoints were recognized as erroneous - Fix a bug: clicking on the text in stripe's payment modal, does not validate the checkbox - Fix a bug: move event reservation is not limited by admin settings (prior-delay & disable) +- Fix a bug: UI issues on small devices (dashboard + admin views) - [TODO DEPLOY] `rake fablab:es_build_availabilities_index` - [TODO DEPLOY] `rake fablab:es_add_event_filters` - [TODO DEPLOY] `rake db:migrate` diff --git a/app/assets/stylesheets/app.layout.scss b/app/assets/stylesheets/app.layout.scss index 069e748f4..bd693d343 100644 --- a/app/assets/stylesheets/app.layout.scss +++ b/app/assets/stylesheets/app.layout.scss @@ -88,7 +88,7 @@ color: black; } .heading-title { - overflow: hidden; + //overflow: hidden; height: 94px; h1 { margin: 0 0 0 15px; diff --git a/app/assets/stylesheets/app.utilities.scss b/app/assets/stylesheets/app.utilities.scss index eb25758e0..b9b692522 100644 --- a/app/assets/stylesheets/app.utilities.scss +++ b/app/assets/stylesheets/app.utilities.scss @@ -172,6 +172,7 @@ p, .widget p { } .r-n { border-radius: 0 0 0 0; } +.p-xs { padding: 5px;} .p-lg { padding: 30px; } .p-l { padding: 16px; } diff --git a/app/assets/templates/admin/coupons/edit.html.erb b/app/assets/templates/admin/coupons/edit.html.erb index 94b56aa69..b391f8dbc 100644 --- a/app/assets/templates/admin/coupons/edit.html.erb +++ b/app/assets/templates/admin/coupons/edit.html.erb @@ -5,13 +5,13 @@ -
+
-

{{ 'coupon' | translate }} {{ coupon.name }}

+

{{ 'coupon' | translate }} : {{ coupon.name }}

-
+
{{ 'cancel' }}
diff --git a/app/assets/templates/admin/members/members.html.erb b/app/assets/templates/admin/members/members.html.erb index b2a4d2f58..8da4bf427 100644 --- a/app/assets/templates/admin/members/members.html.erb +++ b/app/assets/templates/admin/members/members.html.erb @@ -27,10 +27,10 @@ {{ 'surname' | translate }} {{ 'first_name' | translate }} - {{ 'email' | translate }} - {{ 'phone' | translate }} - {{ 'user_type' | translate }} - {{ 'subscription' | translate }} + {{ 'email' | translate }} + {{ 'phone' | translate }} + {{ 'user_type' | translate }} + {{ 'subscription' | translate }} @@ -38,10 +38,10 @@ {{ m.profile.last_name }} {{ m.profile.first_name }} - {{ m.email }} - {{ m.profile.phone }} - {{ m.group.name }} - {{ m.subscribed_plan | humanReadablePlanName }} + {{ m.email }} + {{ m.profile.phone }} + {{ m.group.name }} + {{ m.subscribed_plan | humanReadablePlanName }}
diff --git a/app/assets/templates/admin/project_elements/licences.html.erb b/app/assets/templates/admin/project_elements/licences.html.erb index e0a16a221..78c8c82e7 100644 --- a/app/assets/templates/admin/project_elements/licences.html.erb +++ b/app/assets/templates/admin/project_elements/licences.html.erb @@ -15,7 +15,7 @@ {{ licence.name }} - +
{{ licence.description }}
diff --git a/app/assets/templates/admin/statistics/index.html.erb b/app/assets/templates/admin/statistics/index.html.erb index b6d78f68b..1226f531b 100644 --- a/app/assets/templates/admin/statistics/index.html.erb +++ b/app/assets/templates/admin/statistics/index.html.erb @@ -28,7 +28,7 @@
-
+
-
+
-
    +
    • {{ 'start' }}