Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade to Semantic UI 2.4.2 #4354

Merged
merged 5 commits into from
May 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/styles/partials/icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

.colored {
&:not(.inverted) {
&.american.express {
&.cc.amex {
color: #002663;
}

Expand Down
6 changes: 3 additions & 3 deletions app/styles/partials/overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions app/templates/admin/content/events.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
@content={{t "Delete"}}
@class="ui icon button"
@click={{action (confirm (t "Are you sure you would like to delete this event type?") (action "deleteEventProperty" eventType))}}>
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
</div>
</div>
Expand Down Expand Up @@ -84,7 +84,7 @@
@content={{t "Delete"}}
@class="ui icon button"
@click={{action (confirm (t "Are you sure you would like to delete this event topic?") (action "deleteEventProperty" eventTopic))}}>
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
</div>
</div>
Expand Down Expand Up @@ -147,7 +147,7 @@
@content={{t "Delete"}}
@class="ui icon button"
@click={{action (confirm (t "Are you sure you would like to delete this event sub topic?") (action "deleteEventProperty" subTopic))}}>
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/admin/permissions/system-roles.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="ui basic segment less padding">
<div class="ui basic segment no padding">
<div class="ui {{if this.isLoading 'active'}} inverted dimmer">
<div class="ui loader"></div>
</div>
Expand Down Expand Up @@ -56,7 +56,7 @@
<i class="edit icon"></i>
</UiPopup>
<UiPopup @content={{t "Delete"}} @class="ui icon button" @click={{action (confirm (t "Are you sure you would like to delete this role?") (action "deleteSystemRole" role))}}>
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/errors/forbidden-error.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<br>
<h1 class="text muted weight-300 less bottom margin">403 {{t 'Forbidden'}}</h1>
<h1 class="text muted weight-300 no bottom margin">403 {{t 'Forbidden'}}</h1>
<h1 class="weight-300 description">
{{t 'Oops, you don\'t have the permission'}}<br>
{{t 'to access this page'}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/errors/generic-error.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<br>
<h1 class="text muted weight-300 less bottom margin">{{t 'An unexpected error has occurred.'}}</h1>
<h1 class="text muted weight-300 no bottom margin">{{t 'An unexpected error has occurred.'}}</h1>
<h1 class="weight-300 description">{{t 'Oops, the page you were trying'}}<br> {{t 'to access'}}<br> {{t 'has caused an error. '}}.</h1>
<h3 class="weight-300">
{{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.'}}<br>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/errors/not-found.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<br>
<h1 class="text muted weight-300 less bottom margin">404 {{t 'Not Found'}}</h1>
<h1 class="text muted weight-300 no bottom margin">404 {{t 'Not Found'}}</h1>
<h1 class="weight-300 description">{{t 'Oops, the page you are'}}<br> {{t 'looking for does not'}}<br> {{t 'exist'}}.</h1>
<h3 class="weight-300">
{{t 'You may want to head back to the home page.'}}<br>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/errors/server-error.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<br>
<h1 class="text muted weight-300 less bottom margin">500 {{t 'Internal Server Error'}}</h1>
<h1 class="text muted weight-300 no bottom margin">500 {{t 'Internal Server Error'}}</h1>
<h1 class="weight-300 description">
{{t 'Oops, the page you are'}}<br>
{{t 'looking for caused an error'}}<br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<pre>{{this.displayUrl}}</pre>
</div>
<a class="ui link" href="#" onclick={{action 'startExportTask'}}> {{t 'Alternatively, you can download the'}} {{this.downloadType}} {{t ' here'}}</a>
<div class="ui basic segment less left padding">
<div class="ui basic segment no left padding">
<a href="{{this.eventDownloadUrl}}" class="ui blue button {{if this.isDownloadDisabled 'disabled' ''}} {{if this.isLoading 'loading'}}">
{{t 'Download '}}{{this.downloadType}}
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="field">
<UiCheckbox @class="toggle" @label={{t "Document"}} @checked={{this.data.document}} @onChange={{action (mut this.data.document)}} />
</div>
<div class="ui basic segment less left padding">
<div class="ui basic segment no left padding">
<button class="ui blue button" {{action this.startGeneration}}>
{{t 'Start'}}
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</div>
<div class= "content">
<div class="ui fluid segments">
<a href="{{href-to 'events.view.edit.basic-details'}}" class="ui segment {{unless this.data.event.name 'secondary'}} grid less margin">
<a href="{{href-to 'events.view.edit.basic-details'}}" class="ui segment {{unless this.data.event.name 'secondary'}} grid no margin">
<div class="ui row">
<div class="column one wide">
<i class="{{if this.data.event.name 'checkmark green' 'warning black'}} big icon"></i>
Expand All @@ -18,7 +18,7 @@
</div>
</div>
</a>
<a href="{{href-to 'events.view.edit.attendee'}}" class="ui segment {{unless this.data.event.isTicketFormEnabled 'secondary'}} grid less margin">
<a href="{{href-to 'events.view.edit.attendee'}}" class="ui segment {{unless this.data.event.isTicketFormEnabled 'secondary'}} grid no margin">
<div class="ui row">
<div class="column one wide">
<i class="{{if this.data.event.isTicketFormEnabled 'checkmark green' 'warning black'}} big icon"></i>
Expand All @@ -33,7 +33,7 @@
</div>
</div>
</a>
<a href="{{href-to 'events.view.edit.sponsors'}}" class="ui {{unless this.data.event.isSponsorsEnabled 'secondary'}} segment grid less margin">
<a href="{{href-to 'events.view.edit.sponsors'}}" class="ui {{unless this.data.event.isSponsorsEnabled 'secondary'}} segment grid no margin">
<div class="ui row">
<div class="column one wide">
<i class="{{if this.data.event.isSponsorsEnabled 'checkmark green' 'warning black'}} big icon"></i>
Expand All @@ -48,7 +48,7 @@
</div>
</div>
</a>
<a href="{{href-to 'events.view.edit.sessions-speakers'}}" class="ui {{unless this.data.event.isSessionsSpeakersEnabled 'secondary'}} segment grid less margin">
<a href="{{href-to 'events.view.edit.sessions-speakers'}}" class="ui {{unless this.data.event.isSessionsSpeakersEnabled 'secondary'}} segment grid no margin">
<div class="ui row">
<div class="column one wide">
<i class="{{if this.data.event.isSessionsSpeakersEnabled 'checkmark green' 'warning black'}} big icon"></i>
Expand All @@ -63,7 +63,7 @@
</div>
</div>
</a>
<a href="{{href-to 'events.view.edit.sessions-speakers'}}" class="ui {{unless this.data.event.speakersCall.announcement 'secondary'}} segment grid less margin">
<a href="{{href-to 'events.view.edit.sessions-speakers'}}" class="ui {{unless this.data.event.speakersCall.announcement 'secondary'}} segment grid no margin">
<div class="ui row">
<div class="column one wide">
<i class="{{if this.data.event.speakersCall.announcement 'checkmark green' 'warning black'}} big icon"></i>
Expand All @@ -78,7 +78,7 @@
</div>
</div>
</a>
<a href="{{href-to 'events.view.edit.sessions-speakers'}}" class="ui {{unless this.data.event.isSessionsSpeakersEnabled 'secondary'}} segment grid less margin">
<a href="{{href-to 'events.view.edit.sessions-speakers'}}" class="ui {{unless this.data.event.isSessionsSpeakersEnabled 'secondary'}} segment grid no margin">
<div class="ui row">
<div class="column one wide">
<i class="{{if this.data.event.isSessionsSpeakersEnabled 'checkmark green' 'warning black'}} big icon"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
@content={{t "Delete"}}
@class="ui icon button"
@click={{action (confirm (t "Are you sure you would like to delete this role?") (action "deleteUserRole" roleInvite))}}>
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
{{else}}
<UiPopup
@content={{t "Delete"}}
@class="ui icon button"
@click={{action (confirm (t "Are you sure you would like to cancel this invite?") (action "deleteUserRole" roleInvite))}}>
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
{{/if}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/footer-main.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<div class="ui inverted section divider"></div>
<div class="ui stackable grid">
<div class="thirteen wide computer twelve wide tablet column left aligned">
<div class="ui horizontal inverted small divided link list less top margin">
<div class="ui horizontal inverted small divided link list no top margin">
<span class="item">{{t 'Copyright'}} &copy; {{moment-format (now) 'YYYY'}} {{this.settings.appName}} </span>
{{#each this.footerPages as |page|}}
<LinkTo @route="pages" @model={{page.url}} class="item">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
@content={{t "Delete"}}
@class="ui icon button"
@click={{action (confirm (t "Are you sure you would like to remove this event fee?") (action "deleteTicket" ticketFee))}}>
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/forms/login-form.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="ui stackable {{unless this.noSocial 'three' 'one'}} column doubling centered grid">
<div class="column">
<form class="ui large form" autocomplete="off" {{action 'submit' on='submit'}}>
<div class="ui aligned segment basic less margin less padding">
<div class="ui aligned segment basic no margin no padding">
<h3 class="weight-400">{{t 'Login'}}</h3>
</div>
<div class="ui segments">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/forms/register-form.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<form class="ui large form" autocomplete="off" {{action 'submit' on='submit'}} novalidate>
<div class="ui aligned segment basic less margin less padding">
<div class="ui aligned segment basic no margin no padding">
<h3 class="weight-400">{{t 'Register'}}</h3>
</div>
<div class="ui segments">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/forms/reset-password-form.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="ui stackable three column doubling centered grid">
<div class="column">
<form class="ui large form" autocomplete="off" {{action 'submit' on='submit'}}>
<div class="ui aligned segment basic less margin less padding">
<div class="ui aligned segment basic no margin no padding">
<h3 class="weight-400">{{t 'Forgot Password'}}</h3>
</div>
<div class="ui segments">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/notification-dropdown.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<i class="mail outline icon {{unless this.unreadNotifications.length 'ui less right margin'}}"></i>
<i class="mail outline icon {{unless this.unreadNotifications.length 'ui no right margin'}}"></i>
{{#if this.unreadNotifications.length}}
<div class="floating ui teal circular mini label {{if this.device.isMobile 'tiny text'}}">{{this.unreadNotifications.length}}</div>
{{/if}}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/public/session-item.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{{#if this.hideImage}}
<div class="left floated twelve wide column">
{{#if this.session.startsAt}}
<div class=""><i class="marker icon"></i>{{this.session.microlocation.name}}</div>
<div class=""><i class="icon map marker alternate"></i>{{this.session.microlocation.name}}</div>
<div class="small text"><i class="wait icon"></i>{{general-date this.session.startsAt}} - {{general-date this.session.endsAt}}</div>
{{/if}}
</div>
Expand All @@ -28,7 +28,7 @@
</div>
<div class="right floated five wide column">
{{#if this.session.startsAt}}
<div class=""><i class="marker icon"></i>{{this.session.microlocation.name}}</div>
<div class=""><i class="icon map marker alternate"></i>{{this.session.microlocation.name}}</div>
<div class="small text"><i class="wait icon"></i>{{moment-format this.session.startsAt 'hh:mm a / DD-MM-YYYY'}}</div>
{{/if}}
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/public/speaker-item.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<div class="thumbnail-square">
<img alt="speaker" class="ui rounded image" src="{{if this.speaker.thumbnailImageUrl this.speaker.thumbnailImageUrl (if this.speaker.photoUrl this.speaker.photoUrl '/images/placeholders/avatar.png')}}">
</div>
<h3 class="ui centered header less margin">
<h3 class="ui centered header no margin">
{{this.speaker.name}}
</h3>
<p class="ui small centered disabled header less padding">
<p class="ui small centered disabled header no padding">
{{this.speaker.position}} {{this.speaker.organisation}}
</p>
</div>
Expand Down
18 changes: 9 additions & 9 deletions app/templates/components/public/ticket-list.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,17 @@
</div>
<div class="ui grid">
<div class="ui row stackable grid">
<div class="ui less padding thirteen wide computer twelve wide tablet column right aligned floated payment icons">
<i class="colored american express link icon"></i>
<div class="ui no padding thirteen wide computer twelve wide tablet column right aligned floated payment icons">
<i class="colored cc amex link icon"></i>
<i class="colored credit card alternative link icon"></i>
<i class="colored diners club link icon"></i>
<i class="colored discover link icon"></i>
<i class="colored mastercard link icon"></i>
<i class="colored paypal card link icon"></i>
<i class="colored visa link icon"></i>
<i class="colored cc diners club link icon"></i>
<i class="colored cc discover link icon"></i>
<i class="colored cc mastercard link icon"></i>
<i class="colored cc paypal card link icon"></i>
<i class="colored cc visa link icon"></i>
</div>
<div class="ui less padding three wide computer four wide tablet column right aligned floated">
<button id="total" class="ui primary small button less right margin" disabled={{this.shouldDisableOrderButton}} {{action this.placeOrder}}>
<div class="ui no padding three wide computer four wide tablet column right aligned floated">
<button id="total" class="ui primary small button no right margin" disabled={{this.shouldDisableOrderButton}} {{action this.placeOrder}}>
{{t 'Order Now'}}
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/tables/default.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="ui grid">
<div class="ui less bottom padding row">
<div class="ui no bottom padding row">
<div class="left aligned eight wide column">
<Tables::Utilities::PageSizeInput
@pageSize={{this.pageSize}} />
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/tables/utilities/pagination.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
<i class="angle double right icon"></i>
</a>
</div>
<div class="ui right floated less padding basic segment">
<div class="ui right floated no padding basic segment">
{{t 'Showing'}} {{this.currentRange}} {{t 'of'}} {{this.totalContentLength}} {{t 'entries'}}
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</UiPopup>
{{else}}
<UiPopup @content={{t "Delete"}} @click={{action (confirm (t "Are you sure you would like to delete this user?") (action this.deleteUser this.record))}} @class="ui icon button">
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
{{/if}}
{{/unless}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</UiPopup>
{{else}}
<UiPopup @content={{t "Delete"}} @click={{action (confirm (t "Are you sure you would like to delete this user?") (action this.props.actions.deleteUser this.extraRecords.id))}} @class="ui icon button">
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
{{/if}}
{{/unless}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/cell/cell-buttons.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</UiPopup>
{{else}}
<UiPopup @content={{t "Delete"}} @click={{action this.openDeleteEventModal this.record.identifier this.record.name}} @class="ui icon button" @position="left center">
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
{{/if}}
</div>
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/cell/cell-event.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</UiPopup>
{{else}}
<UiPopup @content={{t "Delete"}} @click={{action this.props.actions.openDeleteEventModal this.extraRecords.identifier this.record}} @class="ui icon button" @position="left center">
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
{{/if}}
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<i class="edit icon"></i>
</UiPopup>
<UiPopup @content={{t "Delete Session"}} @click={{action (confirm (t "Are you sure you would like to delete this Session?") (action this.props.actions.deleteSession this.record))}} @class="ui icon button" @position="left center">
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<i class="edit icon"></i>
</UiPopup>
<UiPopup @content={{t "Delete"}} @click={{action (confirm (t "Are you sure you would like to delete this Sponsor?") (action this.props.actions.deleteSponsor this.record))}} @class="ui icon button" @position="left center">
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
</div>
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{{this.record}}
<div class="hidden ui divider"></div>
<div class="ui horizontal compact basic buttons">
<UiPopup @content={{t "View Session"}} @class="{{if this.device.isMobile 'medium' 'huge'}} ui icon button" @click={{action this.props.actions.viewSession this.extraRecords.id}} @position="left center">
<UiPopup @content={{t "View Session"}} @class="ui icon button" @click={{action this.props.actions.viewSession this.extraRecords.id}} @position="left center">
<i class="unhide icon"></i>
</UiPopup>
{{#if (not this.extraRecords.isLocked)}}
<UiPopup @content={{t "Edit Session"}} @class="{{if this.device.isMobile 'medium' 'huge'}} ui icon button" @click={{action this.props.actions.editSession this.extraRecords.id this.extraRecords.event.id}} @position="left center">
<UiPopup @content={{t "Edit Session"}} @class="ui icon button" @click={{action this.props.actions.editSession this.extraRecords.id this.extraRecords.event.id}} @position="left center">
<i class="edit icon"></i>
</UiPopup>
{{/if}}
<UiPopup @content={{t "Delete Session"}} @click={{action (confirm (t "Are you sure you would like to delete this Session?") (action this.props.actions.deleteSession this.extraRecords.id))}} @class="{{if this.device.isMobile 'medium' 'huge'}} ui icon button" @position="left center">
<i class="trash outline icon"></i>
<UiPopup @content={{t "Delete Session"}} @click={{action (confirm (t "Are you sure you would like to delete this Session?") (action this.props.actions.deleteSession this.extraRecords.id))}} @class="ui icon button" @position="left center">
<i class="trash icon"></i>
</UiPopup>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<i class="edit icon"></i>
</UiPopup>
<UiPopup @content={{t "Delete"}} @click={{action (confirm (t "Are you sure you would like to delete this Speaker?") (action this.props.actions.deleteSpeaker this.record))}} @class="ui icon button" @position="left center">
<i class="trash outline icon"></i>
<i class="trash icon"></i>
</UiPopup>
</div>
Loading