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.

Sign up for GitHub

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

feat(ui): Change to default rounded look #4395

Merged
merged 2 commits into from
May 22, 2020
Merged

feat(ui): Change to default rounded look #4395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a24eee
feat(ui): Change to default rounded look
iamareebjamal May 22, 2020
665bb24
fix
iamareebjamal May 22, 2020
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
14 changes: 14 additions & 0 deletions app/styles/partials/utils.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,17 @@
.hidden-item {
display: none !important;
}

.rounded-none {
border-radius: 0 !important;
}

.rounded-r-none {
border-bottom-right-radius: 0 !important;
border-top-right-radius: 0 !important;
}

.rounded-l-none {
border-bottom-left-radius: 0 !important;
border-top-left-radius: 0 !important;
}
4 changes: 2 additions & 2 deletions app/templates/components/event-card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="{{if this.isWide 'event wide ui grid row'}}">
{{#if this.isWide}}
{{#unless this.device.isMobile}}
<div class="ui card three wide computer six wide tablet column">
<div class="ui card rounded-r-none three wide computer six wide tablet column">
<a class="image" href="{{href-to (if this.isCFS 'public.cfs' 'public') this.event.identifier}}">
<Widgets::SafeImage
@src={{if this.event.thumbnailImageUrl this.event.thumbnailImageUrl this.event.originalImageUrl}} />
Expand All @@ -10,7 +10,7 @@
{{/unless}}
{{/if}}
<div
class="ui card {{unless this.isWide 'event fluid' 'thirteen wide computer ten wide tablet sixteen wide mobile column'}}">
class="ui card {{unless this.isWide 'event fluid' 'thirteen wide computer ten wide tablet sixteen wide mobile column'}} {{unless this.device.isMobile 'rounded-l-none' }}">
{{#unless this.isWide}}
<a class="image" href="{{href-to (if this.isCFS 'public.cfs' 'public') this.event.identifier}}">
<Widgets::SafeImage
Expand Down
16 changes: 4 additions & 12 deletions app/templates/components/forms/login-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,10 @@
<div class="field">
<div class="ui left icon input">
<i class="lock icon"></i>
{{#if this.showPass}}
<Input @type="text" @name="password" placeholder={{t "Password"}} @value={{this.password}} />
{{else}}
<Input @type="password" @name="password" placeholder={{t "Password"}} @value={{this.password}} />
{{/if}}
<div class="ui small basic icon buttons">
<button type="button" class="ui button" id="eye1" {{action 'showPassword'}}>
{{#if this.showPass}}
<i class="hide basic icon"></i>
{{else}}
<i class="unhide basic icon"></i>
{{/if}}
<Input class="rounded-r-none" @type="{{if this.showPass 'text' 'password'}}" @name="password" placeholder={{t "Password"}} @value={{this.password}} />
<div class="ui small basic icon buttons rounded-l-none">
<button type="button" class="ui button" {{action 'showPassword'}}>
<i class="{{if this.showPass 'hide' 'unhide'}} basic icon"></i>
</button>
</div>
</div>
Expand Down
32 changes: 8 additions & 24 deletions app/templates/components/forms/register-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,21 @@
<div class="field required">
<div class="ui left icon input">
<i class="lock icon"></i>
{{#if this.showSignupPass}}
<Input @type="text" @name="password" placeholder={{t "Password"}} @value={{this.data.password}} />
{{else}}
<Input @type="password" @name="password" placeholder={{t "Password"}} @value={{this.data.password}} />
{{/if}}
<div class="ui small basic icon buttons">
<button type="button" class="ui button" id="eye2" {{ action 'showSignupPassword'}}>
{{#if this.showSignupPass}}
<i class="hide basic icon"></i>
{{else}}
<i class="unhide basic icon"></i>
{{/if}}
<Input class="rounded-r-none" @type="{{if this.showSignupPass 'text' 'password'}}" @name="password" placeholder={{t "Password"}} @value={{this.data.password}} />
<div class="ui small basic icon buttons rounded-l-none">
<button type="button" class="ui button" {{action 'showSignupPassword'}}>
<i class="{{if this.showSignupPass 'hide' 'unhide'}} basic icon"></i>
</button>
</div>
</div>
</div>
<div class="field required">
<div class="ui left icon input">
<i class="lock icon"></i>
{{#if this.showConfirmPass}}
<Input @type="text" @name="password_repeat" placeholder={{t "Re-enter Password"}} @value={{this.password_repeat}} />
{{else}}
<Input @type="password" @name="password_repeat" placeholder={{t "Re-enter Password"}} @value={{this.password_repeat}} />
{{/if}}
<div class="ui small basic icon buttons">
<button type="button" class="ui button" id="eye3" {{ action 'showConfirmPassword'}}>
{{#if this.showConfirmPass}}
<i class="hide basic icon"></i>
{{else}}
<i class="unhide basic icon"></i>
{{/if}}
<Input class="rounded-r-none" @type="{{if this.showConfirmPass 'text' 'password'}}" @name="password_repeat" placeholder={{t "Re-enter Password"}} @value={{this.data.password_repeat}} />
<div class="ui small basic icon buttons rounded-l-none">
<button type="button" class="ui button" {{action 'showConfirmPassword'}}>
<i class="{{if this.showConfirmPass 'hide' 'unhide'}} basic icon"></i>
</button>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions app/templates/components/quick-filter.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
{{#unless this.device.isMobile }}
<div class="ui input">
<Widgets::Forms::PlacesAutocomplete
class="rounded-none"
@name="location"
@value={{this.dummyLocation}}
@type="text"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@ember/optional-features": "^1.3.0",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"@open-event/theme": "0.2.1",
"@open-event/theme": "0.2.1-rounded",
"@sentry/browser": "^5.15.5",
"@sentry/integrations": "^5.15.5",
"@sentry/node": "^5.15.5",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,10 +1306,10 @@
"@nodelib/fs.scandir" "2.1.3"
fastq "^1.6.0"

"@open-event/[email protected]":
version "0.2.1"
resolved "https://registry.yarnpkg.com/@open-event/theme/-/theme-0.2.1.tgz#bedc865dbd6310f241cd7033e25228d23d669360"
integrity sha512-ZNfoU3v1eIuILOg/IZ9dvU3XdrHsFjQoWQYnZtlymg41Y7o6tWBCdHv3crQjjLCsYSg6AW5Y/q2+ygj1ZvjE5w==
"@open-event/[email protected]-rounded":
version "0.2.1-rounded"
resolved "https://registry.yarnpkg.com/@open-event/theme/-/theme-0.2.1-rounded.tgz#841d711fbbc1837c6ff009c1ed1288c2371a02a6"
integrity sha512-Kcanx/LjRkJrf6Y46Tb7nk3GIc11kSUJY6DqUN22PmiP+LSutAv0Xxhs400CXT7mST3H/mrMq+CgZC9zc2YHDw==

"@sentry/[email protected]":
version "5.15.5"
Expand Down