Skip to content

Commit a8a1daf

Browse files
committed
Merge remote-tracking branch 'origin/v-next' into feat/integrate-reply-form
2 parents ea636b4 + 3b84118 commit a8a1daf

Some content is hidden

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

57 files changed

+1833
-2511
lines changed

.changeset/chatty-papayas-juggle.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@cloudfour/patterns': minor
3+
---
4+
5+
Add Input Group object

.changeset/fuzzy-llamas-retire.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@cloudfour/patterns': minor
3+
---
4+
5+
Updated and expanded feature images

.changeset/spotty-olives-watch.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@cloudfour/patterns': minor
3+
---
4+
5+
Add Logo Group object.

.github/workflows/ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
8+
- v-next
49

510
jobs:
611
lint:

gulpfile.js/tasks/build-sass.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
const { src, dest } = require('gulp');
22
const outDir = 'dist';
33

4-
const sass = require('gulp-sass');
4+
const sass = require('gulp-sass')(require('sass'));
55
const rename = require('gulp-rename');
66
const postcss = require('gulp-postcss');
77
const cssnano = require('cssnano');
88
sass.compiler = require('sass');
99

10-
const buildSass = () => {
11-
return src('./src/index.scss')
10+
const buildSass = () =>
11+
src('./src/index.scss')
1212
.pipe(
1313
sass({
1414
importer: [require('../../glob-sass-importer')],
@@ -20,6 +20,5 @@ const buildSass = () => {
2020
.pipe(postcss([cssnano()]))
2121
.pipe(rename({ extname: '.min.css' }))
2222
.pipe(dest(outDir));
23-
};
2423

2524
module.exports = buildSass;

gulpfile.js/tasks/build-tokens.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
const run = require('gulp-run');
22

3-
const buildTokens = () => {
4-
return run('npm run preprocess:tokens').exec();
5-
};
3+
const buildTokens = () => run('npm run preprocess:tokens').exec();
64

75
module.exports = buildTokens;

0 commit comments

Comments
 (0)