Skip to content

Change card default border radius #124

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

Merged
merged 56 commits into from
Feb 26, 2021
Merged

Change card default border radius #124

Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
536637a
Merge pull request #27 from soramitsu/release/0.2.2
stefashkaa Jul 27, 2020
223f0d3
Merge branch 'develop' into release/0.2.3
stefashkaa Jul 30, 2020
189c505
Merge pull request #29 from soramitsu/release/0.2.3
stefashkaa Jul 30, 2020
a730e0b
Merge branch 'develop' into release/0.2.4
stefashkaa Jul 31, 2020
398ff98
Merge pull request #31 from soramitsu/release/0.2.4
stefashkaa Jul 31, 2020
8aa7c6a
Merge branch 'develop' into release/0.2.5
stefashkaa Aug 6, 2020
f3cc912
Merge pull request #38 from soramitsu/release/0.2.5
stefashkaa Aug 6, 2020
5a08c90
Merge branch 'develop' into release/0.2.6
stefashkaa Aug 6, 2020
16eeb8c
Merge pull request #40 from soramitsu/release/0.2.6
stefashkaa Aug 6, 2020
2e88e87
Merge branch 'develop' into release/0.2.7
stefashkaa Aug 7, 2020
615b4b5
Merge pull request #43 from soramitsu/release/0.2.7
stefashkaa Aug 7, 2020
23f6422
Merge branch 'develop' into release/0.2.8
stefashkaa Aug 25, 2020
186fe23
Merge pull request #47 from soramitsu/release/0.2.8
stefashkaa Aug 25, 2020
021b02f
Merge branch 'develop' into release/0.3.0
stefashkaa Aug 31, 2020
3a91a19
Merge pull request #49 from soramitsu/release/0.3.0
stefashkaa Aug 31, 2020
1ba39e6
Merge branch 'develop' into release/0.3.1
stefashkaa Sep 10, 2020
d780781
Merge pull request #52 from soramitsu/release/0.3.1
stefashkaa Sep 10, 2020
64c5a1e
Merge branch 'develop' into release/0.3.2
stefashkaa Sep 11, 2020
bdb226e
Merge pull request #54 from soramitsu/release/0.3.2
stefashkaa Sep 11, 2020
0c70af3
Merge branch 'develop' into release/0.3.3
stefashkaa Sep 17, 2020
684ef76
Merge pull request #56 from soramitsu/release/0.3.3
stefashkaa Sep 17, 2020
dc6399a
Merge branch 'develop' into release/0.3.4
stefashkaa Sep 21, 2020
054be66
Merge pull request #58 from soramitsu/release/0.3.4
stefashkaa Sep 22, 2020
018e631
Merge branch 'develop' into release/0.4.0
stefashkaa Oct 12, 2020
d981452
Merge pull request #61 from soramitsu/release/0.4.0
stefashkaa Oct 12, 2020
6f12f70
Merge branch 'develop' into release/0.4.1
stefashkaa Oct 13, 2020
162de2a
Merge pull request #66 from soramitsu/release/0.4.1
stefashkaa Oct 13, 2020
5eda80b
Merge branch 'dev' into release/0.4.3
stefashkaa Oct 22, 2020
9b06e12
Merge branch 'develop' into release/0.5.0
stefashkaa Oct 22, 2020
9f57056
Merge pull request #70 from soramitsu/release/0.4.3
stefashkaa Oct 22, 2020
2b1be07
Merge pull request #71 from soramitsu/release/0.5.0
stefashkaa Oct 22, 2020
f776e90
Release/0.5.1 (#75)
alexnatalia Oct 27, 2020
4e1af9b
Merge branch 'develop' into release/0.5.2
stefashkaa Oct 29, 2020
84bec37
Merge pull request #77 from soramitsu/release/0.5.2
stefashkaa Oct 29, 2020
5cf7530
Release 0.5.3 (#80)
Asmadek Oct 30, 2020
7035368
Release 0.5.4 (#82)
stefashkaa Nov 3, 2020
411d068
Release 0.5.5 (#84)
Asmadek Nov 6, 2020
55b57b5
Merge branch 'develop' of https://github.com/soramitsu/soramitsu-js-u…
Asmadek Nov 11, 2020
3e9c062
Merge pull request #87 from soramitsu/release/0.5.6
Asmadek Nov 11, 2020
8b221a9
Customization bug fix (#88) (#89)
alexnatalia Nov 11, 2020
2cf12d2
Release 0.5.8 (#91)
stefashkaa Nov 17, 2020
08c1a98
Release/0.6.0 (#92)
alexnatalia Nov 18, 2020
9b323d6
Release 0.6.1 (#94)
alexnatalia Dec 1, 2020
f62157e
Release 0.6.3 (#98)
stefashkaa Dec 8, 2020
c17ff84
Release 0.6.4 (#100)
stefashkaa Dec 8, 2020
7412c8b
Release/0.6.7 (#106)
alexnatalia Dec 17, 2020
d91119b
Release 0.6.8 (#108)
alexnatalia Dec 25, 2020
539ce08
Release 0.6.9 (#110)
stefashkaa Dec 30, 2020
d6330f6
Release 0.7.0 (#112)
stefashkaa Jan 5, 2021
2884955
Release 0.7.1 (#114)
stefashkaa Jan 6, 2021
b4584c3
Merge
Sociopacific Feb 16, 2021
26b6313
Merge branch 'develop' into release/0.7.2
Sociopacific Feb 16, 2021
1b13093
Merge pull request #121 from soramitsu/release/0.7.2
Sociopacific Feb 16, 2021
75b800f
Change card default border radius
Sociopacific Feb 18, 2021
494af17
Merge branch 'develop' into card-default-border-radius
Sociopacific Feb 26, 2021
d4416d0
Merge branch 'develop' into card-default-border-radius
Sociopacific Feb 26, 2021
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
3 changes: 3 additions & 0 deletions src/components/Card/SCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { Component, Mixins, Prop } from 'vue-property-decorator'

import BorderRadiusMixin from '../../mixins/BorderRadiusMixin'
import { CardShadow } from './consts'
import { BorderRadius } from '@/types'

@Component
export default class SCard extends Mixins(BorderRadiusMixin) {
Expand All @@ -42,6 +43,8 @@ export default class SCard extends Mixins(BorderRadiusMixin) {
*/
@Prop({ default: false, type: Boolean }) readonly clickable!: boolean

@Prop({ default: BorderRadius.MEDIUM }) borderRadius!: string

get computedClasses (): Array<string> {
const cssClasses: Array<string> = []
if (this.isStandardBorderRadius) {
Expand Down