From 91b61f8bed49685f8bdb73d67e8dd885a4c851df Mon Sep 17 00:00:00 2001 From: iamareebjamal Date: Sun, 26 Apr 2020 09:26:46 +0530 Subject: [PATCH 1/5] chore: Upgrade to Semantic UI 2.4.2 --- app/styles/partials/icons.scss | 2 +- app/templates/components/public/ticket-list.hbs | 12 ++++++------ package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/styles/partials/icons.scss b/app/styles/partials/icons.scss index 8ceb8631a21..86f4b7e192b 100644 --- a/app/styles/partials/icons.scss +++ b/app/styles/partials/icons.scss @@ -4,7 +4,7 @@ .colored { &:not(.inverted) { - &.american.express { + &.cc.amex { color: #002663; } diff --git a/app/templates/components/public/ticket-list.hbs b/app/templates/components/public/ticket-list.hbs index 3c7aefbec36..6feb010dc65 100644 --- a/app/templates/components/public/ticket-list.hbs +++ b/app/templates/components/public/ticket-list.hbs @@ -170,13 +170,13 @@
- + - - - - - + + + + +
{{#if this.session.startsAt}} -
{{this.session.microlocation.name}}
+
{{this.session.microlocation.name}}
{{moment-format this.session.startsAt 'hh:mm a / DD-MM-YYYY'}}
{{/if}}
diff --git a/app/templates/components/widgets/forms/location-input.hbs b/app/templates/components/widgets/forms/location-input.hbs index 0b34dab7311..4606394675b 100644 --- a/app/templates/components/widgets/forms/location-input.hbs +++ b/app/templates/components/widgets/forms/location-input.hbs @@ -73,7 +73,7 @@ @type="text" @placeholder={{this.placeholder}} />
diff --git a/app/templates/public.hbs b/app/templates/public.hbs index 455ce0d98b2..be9f98ce77c 100644 --- a/app/templates/public.hbs +++ b/app/templates/public.hbs @@ -16,7 +16,7 @@
{{t 'To'}} {{header-date this.model.endsAt this.model.timezone}}
{{/if}}

{{this.model.name}}

-

{{this.model.locationName}}

+

{{this.model.locationName}}

From c71dbc39be094517260c0c73b97b85b0b682e0ef Mon Sep 17 00:00:00 2001 From: iamareebjamal Date: Fri, 1 May 2020 13:53:24 +0530 Subject: [PATCH 3/5] chore: Change ambiguous and conflicing CSS class --- app/styles/partials/overrides.scss | 6 +++--- app/templates/admin/permissions/system-roles.hbs | 2 +- app/templates/components/errors/forbidden-error.hbs | 2 +- app/templates/components/errors/generic-error.hbs | 2 +- app/templates/components/errors/not-found.hbs | 2 +- app/templates/components/errors/server-error.hbs | 2 +- .../events/view/export/download-common.hbs | 2 +- .../components/events/view/export/download-zip.hbs | 2 +- .../events/view/overview/event-setup-checklist.hbs | 12 ++++++------ app/templates/components/footer-main.hbs | 2 +- app/templates/components/forms/login-form.hbs | 2 +- app/templates/components/forms/register-form.hbs | 2 +- .../components/forms/reset-password-form.hbs | 2 +- app/templates/components/notification-dropdown.hbs | 2 +- app/templates/components/public/speaker-item.hbs | 4 ++-- app/templates/components/public/ticket-list.hbs | 6 +++--- app/templates/components/tables/default.hbs | 2 +- .../components/tables/utilities/pagination.hbs | 2 +- .../components/ui-table/simple-pagination.hbs | 2 +- .../components/widgets/forms/file-upload.hbs | 2 +- 20 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/styles/partials/overrides.scss b/app/styles/partials/overrides.scss index 4fdc25a30d3..65ef4d81129 100644 --- a/app/styles/partials/overrides.scss +++ b/app/styles/partials/overrides.scss @@ -42,15 +42,15 @@ body.dimmable.undetached.dimmed { } .ui { - &[class*='less margin'] { + &[class*='no margin'] { margin: 0 !important; } - &[class*='less padding'] { + &[class*='no padding'] { padding: 0 !important; } - &.less { + &.no { &[class*='right margin'] { margin-right: 0 !important; } diff --git a/app/templates/admin/permissions/system-roles.hbs b/app/templates/admin/permissions/system-roles.hbs index 85523d4e241..387759ef792 100644 --- a/app/templates/admin/permissions/system-roles.hbs +++ b/app/templates/admin/permissions/system-roles.hbs @@ -1,4 +1,4 @@ -
+
diff --git a/app/templates/components/errors/forbidden-error.hbs b/app/templates/components/errors/forbidden-error.hbs index 0e5a37368d3..45a8e65e73c 100644 --- a/app/templates/components/errors/forbidden-error.hbs +++ b/app/templates/components/errors/forbidden-error.hbs @@ -1,5 +1,5 @@
-

403 {{t 'Forbidden'}}

+

403 {{t 'Forbidden'}}

{{t 'Oops, you don\'t have the permission'}}
{{t 'to access this page'}} diff --git a/app/templates/components/errors/generic-error.hbs b/app/templates/components/errors/generic-error.hbs index 80629f74c8e..c035733f287 100644 --- a/app/templates/components/errors/generic-error.hbs +++ b/app/templates/components/errors/generic-error.hbs @@ -1,5 +1,5 @@
-

{{t 'An unexpected error has occurred.'}}

+

{{t 'An unexpected error has occurred.'}}

{{t 'Oops, the page you were trying'}}
{{t 'to access'}}
{{t 'has caused an error. '}}.

{{t 'This, may or may not be a server issue. We are looking into it. You may want to head back to the home page.'}}
diff --git a/app/templates/components/errors/not-found.hbs b/app/templates/components/errors/not-found.hbs index ad70f668179..f98bcfb4c82 100644 --- a/app/templates/components/errors/not-found.hbs +++ b/app/templates/components/errors/not-found.hbs @@ -1,5 +1,5 @@
-

404 {{t 'Not Found'}}

+

404 {{t 'Not Found'}}

{{t 'Oops, the page you are'}}
{{t 'looking for does not'}}
{{t 'exist'}}.

{{t 'You may want to head back to the home page.'}}
diff --git a/app/templates/components/errors/server-error.hbs b/app/templates/components/errors/server-error.hbs index 1ab78fae0a6..0fa8ccf4b17 100644 --- a/app/templates/components/errors/server-error.hbs +++ b/app/templates/components/errors/server-error.hbs @@ -1,5 +1,5 @@
-

500 {{t 'Internal Server Error'}}

+

500 {{t 'Internal Server Error'}}

{{t 'Oops, the page you are'}}
{{t 'looking for caused an error'}}
diff --git a/app/templates/components/events/view/export/download-common.hbs b/app/templates/components/events/view/export/download-common.hbs index f833b918624..4d7fc5d5988 100644 --- a/app/templates/components/events/view/export/download-common.hbs +++ b/app/templates/components/events/view/export/download-common.hbs @@ -11,7 +11,7 @@
{{this.displayUrl}}

{{t 'Alternatively, you can download the'}} {{this.downloadType}} {{t ' here'}} -
+
{{t 'Download '}}{{this.downloadType}} diff --git a/app/templates/components/events/view/export/download-zip.hbs b/app/templates/components/events/view/export/download-zip.hbs index 810dbd9274a..1a4402a1ad5 100644 --- a/app/templates/components/events/view/export/download-zip.hbs +++ b/app/templates/components/events/view/export/download-zip.hbs @@ -21,7 +21,7 @@
-
+
diff --git a/app/templates/components/events/view/overview/event-setup-checklist.hbs b/app/templates/components/events/view/overview/event-setup-checklist.hbs index 7e30924c543..2013bbb9998 100644 --- a/app/templates/components/events/view/overview/event-setup-checklist.hbs +++ b/app/templates/components/events/view/overview/event-setup-checklist.hbs @@ -3,7 +3,7 @@
- +
@@ -18,7 +18,7 @@
- +
@@ -33,7 +33,7 @@
- +
@@ -48,7 +48,7 @@
- +
@@ -63,7 +63,7 @@
- +
@@ -78,7 +78,7 @@
- +
diff --git a/app/templates/components/footer-main.hbs b/app/templates/components/footer-main.hbs index d6f7bd2cbd3..d535c1b92fb 100644 --- a/app/templates/components/footer-main.hbs +++ b/app/templates/components/footer-main.hbs @@ -72,7 +72,7 @@
-