Skip to content

Commit

Permalink
Post-10.6 tweaks round 2 (#663)
Browse files Browse the repository at this point in the history
* Proper node-pl pa11y url

* Generator js name

* Update generator to not export demo twig/yaml within index.js

* Fix extra block region in article.twig

* Move svg to non-printing module

* Update dependency stylelint-scss to ^3.13.0 (#654)

* 10.6.2 tweaks (#653)

* Proper node-pl pa11y url

* Generator js name

* Update generator to not export demo twig/yaml within index.js

* Fix extra block region in article.twig

* Update dependency stylelint-scss to ^3.13.0

* Update dependency eslint to ^6.7.1 (#659)

* 10.6.2 tweaks (#653)

* Proper node-pl pa11y url

* Generator js name

* Update generator to not export demo twig/yaml within index.js

* Fix extra block region in article.twig

* Update dependency core-js to ^3.4.2

* Update dependency @pattern-lab/uikit-workshop to ^5.3.3

* Update babel monorepo to ^7.7.4

* Update dependency eslint to ^6.7.1

* Update dependency url-loader to ^2.3.0 (#656)

* 10.6.2 tweaks (#653)

* Proper node-pl pa11y url

* Generator js name

* Update generator to not export demo twig/yaml within index.js

* Fix extra block region in article.twig

* Update dependency url-loader to ^2.3.0

* Dep updates for november

* Use spread instead of object.assign in new component

* Simplified demo export syntax

* Update minor deps, footer comments
  • Loading branch information
illepic committed Nov 27, 2019
1 parent f2158c6 commit 93da6bb
Show file tree
Hide file tree
Showing 31 changed files with 5,570 additions and 1,846 deletions.
27 changes: 9 additions & 18 deletions apps/node-pl/pattern-lab/_patterns/00-protons-demo/index.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
import borders from './borders.twig';
import breakpoints from './breakpoints.twig';
import colors from './colors.twig';
import demoBlock from './_demo-block.twig';
import spacing from './spacing.twig';
import tables from './tables.twig';
import type from './type.twig';
import welcome from './welcome.twig';
import './borders.twig';
import './breakpoints.twig';
import './colors.twig';
import './_demo-block.twig';
import './spacing.twig';
import './tables.twig';
import './type.twig';
import './welcome.twig';


export default {
borders,
breakpoints,
colors,
demoBlock,
spacing,
tables,
type,
welcome,
};
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import twig from './alerts.twig';
import yaml from './alerts.yml';

export default {
twig,
yaml,
};
import './alerts.twig';
import './alerts.yml';
12 changes: 3 additions & 9 deletions apps/node-pl/pattern-lab/_patterns/01-atoms-demo/badge/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import twig from './badges.twig';
import markdown from './badges.md';
import yaml from './badges.yml';

export default {
twig,
markdown,
yaml,
};
import './badges.twig';
import './badges.md';
import './badges.yml';
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
import twig from './brandings.twig';

export default {
twig,
};
import './brandings.twig';
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import twig from './breadcrumbs.twig';
import yaml from './breadcrumbs.yml';

export default {
twig,
yaml,
};
import './breadcrumbs.twig';
import './breadcrumbs.yml';
12 changes: 3 additions & 9 deletions apps/node-pl/pattern-lab/_patterns/01-atoms-demo/button/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import twig from './buttons.twig';
import markdown from './buttons.md';
import yaml from './buttons.yml';

export default {
twig,
markdown,
yaml,
};
import './buttons.twig';
import './buttons.md';
import './buttons.yml';
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import twig from './dropdowns.twig';
import markdown from './dropdowns.md';
import yaml from './dropdowns.yml';

export default {
twig,
markdown,
yaml,
};
import './dropdowns.twig';
import './dropdowns.md';
import './dropdowns.yml';
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import gridDemo from './grid-demo.twig';
import layoutDemo from './layout-demo.twig';

export default {
gridDemo,
layoutDemo,
};
import './grid-demo.twig';
import './layout-demo.twig';
12 changes: 3 additions & 9 deletions apps/node-pl/pattern-lab/_patterns/01-atoms-demo/image/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ import 'holderjs';
import './astrogoat.png';

// Import demo assets
import twig from './images.twig';
import yaml from './images.yml';
import markdown from './images.md';

export default {
twig,
yaml,
markdown,
};
import './images.twig';
import './images.yml';
import './images.md';
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import twig from './list-groups.twig';
import markdown from './list-groups.md';
import yaml from './list-groups.yml';

export default {
twig,
markdown,
yaml,
};
import './list-groups.twig';
import './list-groups.md';
import './list-groups.yml';
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@use '~tokens/sass/utils';
@use '~atoms/svg/svg';
@use '~atoms/svg/scss/utils' as svg;

.svgicon-demo--particle-mixin-chevron-right {
@include svg.sprite('chevron-right');
height: rem-calc(40px);
width: rem-calc(40px);
height: utils.f-rem-calc(40px);
width: utils.f-rem-calc(40px);
}

.svgicon-demo--particle-mixin-person {
Expand All @@ -14,6 +14,6 @@
color: utils.bs-theme-color('primary'),
)
);
width: rem-calc(40px);
height: rem-calc(40px);
width: utils.f-rem-calc(40px);
height: utils.f-rem-calc(40px);
}
12 changes: 3 additions & 9 deletions apps/node-pl/pattern-lab/_patterns/01-atoms-demo/svg/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ import 'atoms/svg';
import './_svg--icon-demo.scss';

// Import demo assets
import twig from './svgs.twig';
import yaml from './svgs.yml';
import markdown from './svgs.md';

export default {
twig,
yaml,
markdown,
};
import './svgs.twig';
import './svgs.yml';
import './svgs.md';
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import twig from './cards.twig';
import yaml from './cards.yml';

export default {
twig,
yaml,
};
import './cards.twig';
import './cards.yml';
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import twig from './carousels.twig';
import yaml from './carousels.yml';

export default {
twig,
yaml,
};
import './carousels.twig';
import './carousels.yml';
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import twig from './jumbotrons.twig';
import yaml from './jumbotrons.yml';

export default {
twig,
yaml,
};
import './jumbotrons.twig';
import './jumbotrons.yml';
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import twig from './navs.twig';
import markdown from './navs.md';
import yaml from './navs.yml';

export default {
twig,
markdown,
yaml,
};
import './navs.twig';
import './navs.md';
import './navs.yml';
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import twig from './paginations.twig';
import yaml from './paginations.yml';

export default {
twig,
yaml,
};
import './paginations.twig';
import './paginations.yml';
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Vue from 'vue';

// Demo twig
import twig from './vue-widgets.twig';
import './vue-widgets.twig';

import VueInputExample from './vue-html-example.vue';

Expand Down Expand Up @@ -30,7 +30,3 @@ if (document.getElementById('vue-input-text-component')) {
render: h => h(VueInputExample),
}))();
}

export default {
twig,
};
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import twig from './accordions.twig';
import yaml from './accordions.yml';

export default {
twig,
yaml,
};
import './accordions.twig';
import './accordions.yml';
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
import twig from './articles.twig';

export default {
twig,
};
import './articles.twig';
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
import twig from './card-grids.twig';
import yaml from './card-grids.yml';

export default {
twig,
yaml,
};
import './card-grids.twig';
import './card-grids.yml';
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@
import 'organisms/footer';

// Import demo assets
import twig from './footers.twig';
import yaml from './footers.yml';
import markdown from './footers.md';

export default {
twig,
yaml,
markdown,
};
import './footers.twig';
import './footers.yml';
import './footers.md';
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import twig from './navbars.twig';
import markdown from './navbars.md';
import yaml from './navbars.yml';

export default {
twig,
markdown,
yaml,
};
import './navbars.twig';
import './navbars.md';
import './navbars.yml';
2 changes: 1 addition & 1 deletion apps/node-pl/scss/_scss2json.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@use 'sass:map';
// Custom
@use '~tokens/sass/utils';
@use '~atoms/svg/svg';
@use '~atoms/svg/scss/utils' as svg;

$font-families-demo: (
'$font-family-sans-serif': utils.$bs-font-family-sans-serif,
Expand Down
Loading

0 comments on commit 93da6bb

Please sign in to comment.