Skip to content

Commit a36db37

Browse files
committed
Added xs and xl sizes for each component. Sizes are now entirely configurable. inkline#47
1 parent 4106319 commit a36db37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+323
-479
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "inkline",
3-
"version": "1.14.7",
3+
"version": "1.15.0",
44
"description": "Inkline is a modern UI/UX framework for Vue.js, designed for creating flawless content-rich responsive web applications",
55
"main": "dist/inkline.js",
66
"authors": [

package.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Package.describe({
44
name: "inkline:inkline",
5-
version: "1.14.7",
5+
version: "1.15.0",
66
summary:
77
"Inkline is a modern UI/UX framework for Vue.js, designed for creating flawless content-rich responsive web applications",
88
git: "https://github.com/inkline/inkline.git",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@inkline/inkline",
3-
"version": "1.14.7",
3+
"version": "1.15.0",
44
"description": "Inkline is a modern UI/UX framework for Vue.js, designed for creating flawless content-rich responsive web applications",
55
"author": "Alex Grozav <alex@grozav.com>",
66
"scripts": {

src/components/Alert/css/_sizes.styl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
//
22
// Alert sizes
33
//
4-
for size in (sm md lg)
5-
.alert.-{size}
6-
border-radius: --alert-border-radius[size]
7-
font-size: --alert-font-size[size]
4+
for --size in --sizes
5+
.alert.-{--size}
6+
border-radius: --alert-border-radius[--size]
7+
font-size: --alert-font-size[--size]
88

99
> .content
10-
padding: --alert-padding[size]
10+
padding: --alert-padding[--size]
1111

1212
> .title
13-
margin-bottom: --alert-padding[size]
13+
margin-bottom: --alert-padding[--size]
1414

1515
> .link + .link
16-
margin-left: --alert-padding[size]
16+
margin-left: --alert-padding[--size]
1717

1818
> .dismiss
19-
padding: (--alert-padding[size] / 2)
20-
margin-right: (--alert-padding[size] / 2)
21-
margin-left: (--alert-padding[size] / 2)
19+
padding: (--alert-padding[--size] / 2)
20+
margin-right: (--alert-padding[--size] / 2)
21+
margin-left: (--alert-padding[--size] / 2)
2222

2323
> .icon
24-
padding-left: --alert-padding[size]
25-
padding-right: --alert-padding[size]
24+
padding-left: --alert-padding[--size]
25+
padding-right: --alert-padding[--size]

src/components/Alert/css/_variables.styl

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,8 @@
88
--alert-border-width := --border-width
99
--alert-border-radius := --border-radius
1010

11-
--alert-padding-sm := --spacers['1'] * --size-percentages['sm']
12-
--alert-padding-md := --spacers['1'] * --size-percentages['md']
13-
--alert-padding-lg := --spacers['1'] * --size-percentages['lg']
14-
--alert-padding := {
15-
'sm': --alert-padding-sm
16-
'md': --alert-padding-md
17-
'lg': --alert-padding-lg
18-
}
11+
--alert-padding-base := --spacers['1']
12+
--alert-padding := -size-map(--alert-padding-base, --sizes, --size-multipliers)
1913

2014
--alert-dismiss-size := 1rem
2115

@@ -29,4 +23,4 @@
2923
--alert-variant-color-light := --variant-color-light
3024
--alert-variant-color-dark := --variant-color-dark
3125

32-
--variants['alert'] = -add-variant(--alert-variants, { color: --color-groups })
26+
--variants['alert'] = -add-variant(--alert-variants, { color: --color-groups })

src/components/Badge/css/_sizes.styl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//
22
// Badge sizes
33
//
4-
for size in (sm md lg)
5-
.badge.-{size}
6-
border-radius: --badge-border-radius[size]
7-
font-size: --badge-font-size[size]
8-
padding: --badge-padding[size]
4+
for --size in --sizes
5+
.badge.-{--size}
6+
border-radius: --badge-border-radius[--size]
7+
font-size: --badge-font-size[--size]
8+
padding: --badge-padding[--size]
99

1010
&.-pill
11-
padding: --badge-padding[size]
11+
padding: --badge-padding[--size]

src/components/Badge/css/_variables.styl

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,8 @@
1212
--badge-border-width := --border-width
1313
--badge-border-radius := --border-radius
1414

15-
--badge-padding-sm := --spacers['1/2'] * --size-percentages['sm'] --spacers['2/3'] * --size-percentages['sm']
16-
--badge-padding-md := --spacers['1/2'] * --size-percentages['md'] --spacers['2/3'] * --size-percentages['md']
17-
--badge-padding-lg := --spacers['1/2'] * --size-percentages['lg'] --spacers['2/3'] * --size-percentages['lg']
18-
--badge-padding := {
19-
'sm': --badge-padding-sm
20-
'md': --badge-padding-md
21-
'lg': --badge-padding-lg
22-
}
15+
--badge-padding-base := --spacers['1/2'] --spacers['2/3']
16+
--badge-padding := -size-map(--badge-padding-base, --sizes, --size-multipliers)
2317

2418
--badge-pill-border-radius := 10rem
2519

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// Breadcrumb sizes
33
//
4-
for size in (sm md lg)
5-
.breadcrumb.-{size}
6-
border-radius: --breadcrumb-border-radius[size]
7-
font-size: --breadcrumb-font-size[size]
4+
for --size in --sizes
5+
.breadcrumb.-{--size}
6+
border-radius: --breadcrumb-border-radius[--size]
7+
font-size: --breadcrumb-font-size[--size]

src/components/Breadcrumb/css/_variables.styl

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@
55

66
--breadcrumb-border-radius := --border-radius
77

8-
--breadcrumb-padding-sm := --spacers['1/2'] * --size-percentages['sm'] --spacers['1'] * --size-percentages['sm']
9-
--breadcrumb-padding-md := --spacers['1/2'] * --size-percentages['md'] --spacers['1'] * --size-percentages['md']
10-
--breadcrumb-padding-lg := --spacers['1/2'] * --size-percentages['lg'] --spacers['1'] * --size-percentages['lg']
11-
--breadcrumb-padding := {
12-
'sm': --breadcrumb-padding-sm
13-
'md': --breadcrumb-padding-md
14-
'lg': --breadcrumb-padding-lg
15-
}
8+
--breadcrumb-padding-base := --spacers['1/2'] --spacers['1']
9+
--breadcrumb-padding := -size-map(--breadcrumb-padding-base, --sizes, --size-multipliers)
1610

1711
--breadcrumb-margin-bottom := --spacer
1812

@@ -28,4 +22,4 @@
2822
--breadcrumb-variant-color-light := --variant-color-light
2923
--breadcrumb-variant-color-dark := --variant-color-dark
3024

31-
--variants['breadcrumb'] = -add-variant(--breadcrumb-variants, { color: --color-groups })
25+
--variants['breadcrumb'] = -add-variant(--breadcrumb-variants, { color: --color-groups })
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//
22
// Breadcrumb sizes
33
//
4-
for size in (sm md lg)
5-
.breadcrumb.-{size}
4+
for --size in --sizes
5+
.breadcrumb.-{--size}
66
> .item
7-
padding-left: --breadcrumb-item-padding[size]
7+
padding-left: --breadcrumb-item-padding[--size]
88

99
+ .item
1010
&::before
11-
padding-right: --breadcrumb-item-padding[size]
11+
padding-right: --breadcrumb-item-padding[--size]

0 commit comments

Comments
 (0)