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

Feature/update #274

Open
wants to merge 190 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
190 commits
Select commit Hold shift + click to select a range
9410d7a
Update to new version
szafran89 May 22, 2020
a9bd4e5
Tailwind setup
szafran89 Jun 5, 2020
9298bb5
Simplify tailwind config
szafran89 Jun 18, 2020
d081538
Removed empty line
szafran89 Jun 18, 2020
a975e1a
Updated packages
szafran89 Jun 18, 2020
2961fdf
Moved legacy components to _src
szafran89 Jun 18, 2020
310a29d
Updated storybook configs, updated addons packages
szafran89 Jun 18, 2020
234ca5d
Commented codecov step from circleCI
szafran89 Jun 19, 2020
b8a72bd
Removed vue info package
szafran89 Jun 19, 2020
fd01373
Removed yarn codecov from circleCI
szafran89 Jun 19, 2020
8d8a509
update heading
ofrankowska Jun 19, 2020
934b423
update badge
ofrankowska Jun 19, 2020
3f4a439
update button
anqaka Jun 19, 2020
7aecc2c
update paragraph
ofrankowska Jun 19, 2020
ffa00df
formatting
ofrankowska Jun 19, 2020
5e110ff
remove storiesOf from badge
ofrankowska Jun 19, 2020
89fd386
update button component
anqaka Jun 19, 2020
a2a6ae0
reorganize classes, switch to css, rename modifier class
ofrankowska Jun 19, 2020
c4b242e
update stories, reorganize classes, switch to css
ofrankowska Jun 19, 2020
2be2a90
update paragraph stories, reorganize classes, switch to css
ofrankowska Jun 19, 2020
21e3581
mdx test
anqaka Jun 19, 2020
51d4067
modify tailwind config
Jul 3, 2020
a23378c
Revert "mdx test"
anqaka Jun 19, 2020
b828a12
Merge branch 'feature/update-button' into feature/update
anqaka Jul 3, 2020
e192889
update link
Jul 3, 2020
65ff668
switch from scss to css
Jul 3, 2020
3c0e2f7
update paragraph line height
ofrankowska Jul 3, 2020
11d975c
Update deps
szafran89 Jul 3, 2020
3f3b569
update heading font
ofrankowska Jul 3, 2020
2cb0658
Merge branch 'feature/update' into feature/update-heading
ofrankowska Jul 3, 2020
2d59978
Merge branch 'feature/update-badge' into feature/update
ofrankowska Jul 3, 2020
9085ad2
Merge branch 'feature/update-paragraph' into feature/update
ofrankowska Jul 3, 2020
0ff1e72
remove heading from _src
ofrankowska Jul 3, 2020
868ffe8
use tagName in heading tests
ofrankowska Jul 3, 2020
a7a6ab7
Merge branch 'feature/update' into feature/update-paragraph
ofrankowska Jul 3, 2020
a2f62f4
Merge branch 'feature/update' into feature/update-badge
ofrankowska Jul 3, 2020
a17899d
update css to match theme
Jul 3, 2020
918cd27
remove badge from _src & use tagName in tests
ofrankowska Jul 3, 2020
e6da400
remove paragraph from _src & use tagName in tests
ofrankowska Jul 3, 2020
90227af
Merge branch 'feature/update-badge' into feature/update
ofrankowska Jul 3, 2020
e97b017
Merge branch 'feature/update-paragraph' into feature/update
ofrankowska Jul 3, 2020
d16e44c
update label
Jul 3, 2020
edc552e
update button, remove from old _src
anqaka Jul 3, 2020
93664cc
remove label from _src
Jul 3, 2020
32b251c
remove link from _src
Jul 3, 2020
948c2bb
move blockquote to src
ofrankowska Jul 3, 2020
3a956b2
update blockquote
ofrankowska Jul 3, 2020
099e87c
update fieldset
ofrankowska Jul 17, 2020
c6aece4
update stories
Jul 17, 2020
f63fb8a
update stories
Jul 17, 2020
a45bc8a
update container
ofrankowska Jul 19, 2020
a8d32fb
fix console issue, remove language attr and empty line
ofrankowska Jul 31, 2020
2a3d5e0
remove language attr and empty line
ofrankowska Jul 31, 2020
47484a1
Merge branch 'feature/update-paragraph' into feature/update
ofrankowska Jul 31, 2020
1aef9b9
remove language attr and empty line
ofrankowska Jul 31, 2020
d59cbfd
Merge branch 'feature/update-badge' into feature/update
ofrankowska Jul 31, 2020
7aee9d4
remove language attr and empty line
ofrankowska Jul 31, 2020
89252fd
Merge branch 'feature/update-badge' into feature/update
ofrankowska Jul 31, 2020
c786202
remove language attr and empty line
ofrankowska Jul 31, 2020
80f01b3
remove language attr and empty line
ofrankowska Jul 31, 2020
182390b
fix fieldset test error
ofrankowska Jul 31, 2020
db28a14
CR
Jul 31, 2020
a7550ae
fix fieldset test error
ofrankowska Jul 31, 2020
f094993
remove unnecessary lines
ofrankowska Jul 31, 2020
cab6502
remove lang attr, empty line and tag selector
ofrankowska Jul 31, 2020
546a486
CR fixes
Jul 31, 2020
b5dcab4
#updated stylelint config
szafran89 Jul 31, 2020
02c0127
Merge branch 'feature/update' into feature/update-link
Jul 31, 2020
9cc7c10
fix tab space
ofrankowska Jul 31, 2020
56f1e5c
Merge branch 'feature/update-label' into feature/update
Jul 31, 2020
ea01e5d
Merge branch 'feature/update-blockquote' into feature/update
ofrankowska Jul 31, 2020
1b5c9db
Merge branch 'feature/update-heading' into feature/update
ofrankowska Jul 31, 2020
4e489bc
move price component to src
ofrankowska Jul 31, 2020
50b8154
update price
ofrankowska Jul 31, 2020
2345f77
Set proper markup and styles for Loader component
szafran89 Aug 14, 2020
511cc12
Merge branch 'feature/update' into feature/update-loader
szafran89 Aug 14, 2020
7b690bb
Fixed UT issue
szafran89 Aug 14, 2020
9466aff
remove scss, use css tailwind imports
anqaka Aug 14, 2020
afbac0b
Icon component update
szafran89 Aug 14, 2020
2422b5a
Fixed UT
szafran89 Aug 14, 2020
fc5f5ed
add purge for build and ignore build file
anqaka Aug 14, 2020
4e223a9
update loader color
anqaka Aug 14, 2020
d67bf14
Merge branch 'feature/update-icon' into feature/update
szafran89 Aug 14, 2020
1580631
Merge branch 'feature/update-loader' into feature/update
szafran89 Aug 14, 2020
3f1101b
Merge branch 'feature/update-price' into feature/update
ofrankowska Aug 28, 2020
d38e0f2
update deprecated link tests
Aug 28, 2020
ab2e28f
Merge branch 'feature/update-link' into feature/update
Aug 28, 2020
bfc3c2a
Merge branch 'feature/update-container' into feature/update
ofrankowska Sep 11, 2020
9654472
fix indentation
ofrankowska Sep 11, 2020
549ebe5
remove unnecessary selector
ofrankowska Sep 11, 2020
3f35c72
Merge branch 'feature/update-fieldset' into feature/update
ofrankowska Sep 11, 2020
0484795
move breadcrumbs to src
ofrankowska Sep 11, 2020
25a86f8
update breadcrumbs
ofrankowska Oct 9, 2020
e2b336e
remove unnecessary class
ofrankowska Oct 9, 2020
286d06a
refactor
ofrankowska Oct 9, 2020
cc53d13
Merge branch 'feature/update' into feature/update-price
ofrankowska Oct 9, 2020
9bee800
remove unnecessary aria-label
ofrankowska Oct 9, 2020
caee0d4
Merge branch 'feature/update-breadcrumbs' into feature/update
ofrankowska Oct 9, 2020
954646d
move price classes to html, update stories & UT
ofrankowska Oct 9, 2020
bae4cbe
fix pipeline
ofrankowska Oct 9, 2020
a2e827a
move price styles to props
ofrankowska Oct 23, 2020
f7e563c
add support for variants
ofrankowska Oct 23, 2020
b844550
add base styles
ofrankowska Oct 23, 2020
20dad7c
remove unnecessary variants, refactor
ofrankowska Oct 23, 2020
d460059
update button component
anqaka Nov 6, 2020
19d667f
add loop for multiple variants
anqaka Nov 6, 2020
c5be6af
Merge branch 'feature/update-button' into update-tailwindcss
szafran89 Nov 20, 2020
1b20c06
Updted price component
szafran89 Nov 20, 2020
6ce48a0
upgrade tailwindcss to ^2.0.2
anqaka Jan 29, 2021
d62ef3f
update storybook
ofrankowska Feb 12, 2021
1c8c43f
add storybook essential addons
ofrankowska Feb 12, 2021
a01fe8d
create config for styles, add get-class mixin, update Heading & Price
ofrankowska Feb 12, 2021
21f0a90
Merge branch 'update-tailwindcss' into update-heading
ofrankowska Feb 12, 2021
91047e5
move configs to component folders, generate one config during build p…
ofrankowska Feb 26, 2021
e1326b3
Merge branch 'update-tailwindcss' into feature/update
szafran89 Feb 26, 2021
6b62cec
Update yarn.lock
szafran89 Feb 26, 2021
550ef1f
remove unnecessary attr, fix typo
ofrankowska Mar 12, 2021
11c53c2
remove alias @utils
ofrankowska Mar 12, 2021
532d672
Merge branch 'config-classes' into feature/update
ofrankowska Mar 12, 2021
546b87a
update yarn.lock
ofrankowska Mar 12, 2021
657ae2e
remove code causing error in nuxt playground
ofrankowska Mar 12, 2021
0239a02
remove doubled variant prop
ofrankowska Mar 12, 2021
684e01d
Update badge
szafran89 Mar 12, 2021
6f485ab
use primary variant as default
ofrankowska Mar 12, 2021
69c8db0
Merge branch 'feature/update' into feature/update-breadcrumbs
ofrankowska Mar 12, 2021
d0f293e
Badge, Heading - moved config directly to the SFC
szafran89 Mar 12, 2021
3c755f8
Merge branch 'feature/update' into feature/update-badgev2
szafran89 Mar 12, 2021
0fef150
Removed badge config
szafran89 Mar 12, 2021
ce35b60
Heading, Price update
szafran89 Mar 12, 2021
e6cb465
update CI
ofrankowska Mar 25, 2021
9c3e676
Merge branch 'feature/update' into feature/update-button
anqaka Mar 26, 2021
450f757
Updated badge component
szafran89 Mar 26, 2021
4a8552f
Updated component name
szafran89 Mar 26, 2021
2cb1aba
Removed console log
szafran89 Mar 26, 2021
5aa35fa
Updated bg color
szafran89 Mar 26, 2021
1b0c997
update button
anqaka Mar 26, 2021
70c7336
update ci node version
anqaka Mar 26, 2021
86176a4
Updated circle node to lts
szafran89 Mar 26, 2021
f282376
Fixed tests
szafran89 Mar 26, 2021
3c07527
update tests
anqaka Mar 26, 2021
23edb8a
Merge pull request #300 from SnowdogApps/feature/update-badgev2
szafran89 Mar 26, 2021
14d3026
Merge branch 'feature/update' into feature/update-button
anqaka Mar 26, 2021
0a4f2c3
update test
anqaka Mar 26, 2021
c8054c6
Merge branch 'feature/update' into feature/update-breadcrumbs
ofrankowska Mar 26, 2021
22dd191
Merge branch 'feature/update-button' into feature/update
anqaka Mar 26, 2021
78403a6
update breadcrumbs component
ofrankowska Mar 26, 2021
6848145
keep only one heading story
ofrankowska Mar 26, 2021
d301369
use link component in breadcrumbs, move to molecules
ofrankowska Mar 26, 2021
81c54d7
remove args
ofrankowska Mar 26, 2021
3c17d8c
block variant 'none' styles from being pushed to classes
ofrankowska Mar 26, 2021
d095e80
Merge branch 'feature/update' into feature/update-breadcrumbs
ofrankowska Mar 26, 2021
18ea5c2
add @atoms, @molecules, @organisms & @mocks alias
ofrankowska Mar 27, 2021
86400b1
update breadcrumbs
ofrankowska Apr 9, 2021
b036fea
remove no longer used code
ofrankowska Apr 9, 2021
8c9e0ff
update colors
ofrankowska Apr 9, 2021
ac9e888
remove text control (it generates without configuration)
ofrankowska Apr 9, 2021
75394fc
update icon component
ofrankowska Mar 26, 2021
59b3c60
Update link (#299)
zuzannaszymanda May 21, 2021
9d3bda7
Merge branch 'feature/update' into feature/update-breadcrumbs
ofrankowska May 21, 2021
dddbc94
update readme
ofrankowska May 21, 2021
ea77947
Merge branch 'feature/update-breadcrumbs' into feature/update
ofrankowska May 21, 2021
7f37821
Merge branch 'feature/update' into feature/update-icon
ofrankowska May 21, 2021
5e6ce1e
Feature/update label (#312)
zuzannaszymanda May 21, 2021
58bbc95
update icon UT
ofrankowska May 21, 2021
ee9c07a
upgrade tailwindcss to ^2.2.4
ofrankowska Jul 1, 2021
b0e52d8
enable Just-in-Time Mode
ofrankowska Jul 1, 2021
848a58e
update colors (#317)
anqaka Jul 16, 2021
0e15bd6
Merge branch 'feature/update-icon' into feature/update
ofrankowska Jul 16, 2021
0173e68
update tailwind config
anqaka Jul 16, 2021
37ce13a
Feature/update list (#286)
zuzannaszymanda Jul 16, 2021
6e35d00
update tailwind, storybook deps and components
anqaka Jul 30, 2021
500edbd
update storybook main and preview
anqaka Jul 30, 2021
c8173c0
Merge branch 'feature/update' into feature/upgrade-tailwindcss
Jul 30, 2021
831e74f
move config to component options
Jul 30, 2021
606306b
fix price component errors
Jul 30, 2021
fc8d3e3
update container component
Jul 30, 2021
a8a3355
update paragraph component
Jul 30, 2021
0b5bdcd
update blockquote component
Jul 30, 2021
6588d05
update loader component
Jul 30, 2021
be527cc
eslint auto fixes
ofrankowska Aug 13, 2021
731188d
remove plugin
Aug 13, 2021
1eb22c6
fix jest preprocessor error
Aug 13, 2021
2c6cbf3
update fonts
ofrankowska Aug 13, 2021
8875746
cr changes
Aug 13, 2021
8978513
fix stylelint error
ofrankowska Aug 13, 2021
1e543cc
fieldset sr-only, getClass fix
Aug 13, 2021
ae5da3c
fieldset tests update
Aug 13, 2021
8115c23
Merge branch 'feature/upgrade-tailwindcss' into feature/update-fonts
ofrankowska Aug 13, 2021
56ba307
Feature/upgrade tailwindcss (#319)
anqaka Aug 13, 2021
82c18b2
Merge branch 'feature/update-fonts' into feature/update
ofrankowska Aug 13, 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
7 changes: 7 additions & 0 deletions src/atoms/badge/Badge.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<component
:is="tag"
:class="getClass('badge')"
>
<!-- @slot Slot for badge content -->
<slot />
</component>
37 changes: 37 additions & 0 deletions src/atoms/badge/Badge.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import getClass from '../../../utils/helpers/get-class.js'

export default {
mixins: [getClass],
props: {
/**
* To use another tag instead of `div`
*/
tag: {
type: String,
default: 'div'
}
},
data () {
return {
config: {
base: {
badge: [
'inline-flex', 'justify-center',
'px-3',
'font-bold', 'text-xs', 'leading-snug', 'uppercase'
]
},
primary: {
badge: [
'text-white', 'bg-dark'
]
},
secondary: {
badge: [
'text-primary', 'bg-white'
]
}
}
}
}
}
50 changes: 4 additions & 46 deletions src/atoms/badge/Badge.vue
Original file line number Diff line number Diff line change
@@ -1,52 +1,10 @@
<template>
<component
:is="tag"
:class="getClass('badge')"
>
<!-- @slot Slot for badge content -->
<slot />
</component>
</template>
<template src="./Badge.html" />

<script>
import getClass from '../../../utils/helpers/get-class.js'
import ABadge from './Badge.js'

export default {
name: 'AlpacaBadge',
mixins: [getClass],
props: {
/**
* To use another tag instead of `div`
*/
tag: {
type: String,
default: 'div'
},
/**
* Config for component classes
*/
config: {
type: Object,
default: () => ({
base: {
badge: [
'inline-flex', 'justify-center',
'px-3',
'font-bold', 'text-xs', 'leading-snug', 'uppercase'
]
},
primary: {
badge: [
'text-white', 'bg-dark'
]
},
secondary: {
badge: [
'text-primary', 'bg-white'
]
}
})
}
}
name: 'AlpacaPrice',
mixins: [ABadge]
}
</script>
29 changes: 0 additions & 29 deletions src/atoms/heading/Heading.config.js

This file was deleted.

3 changes: 3 additions & 0 deletions src/atoms/heading/Heading.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,9 @@ import getClass from '../../../utils/helpers/get-class.js'
export default {
mixins: [getClass],
props: {
/**
* To define tag for component
*/
tag: {
type: String,
required: true
16 changes: 0 additions & 16 deletions src/atoms/price/Price.config.js

This file was deleted.