Skip to content

Commit e490b0e

Browse files
authored
Merge pull request #4115 from salesforce-ux/chore/224-spring20__touchStylesheet
chore(infra): Add "touch" stylesheet functionality
2 parents 4f02cea + 6849f04 commit e490b0e

File tree

68 files changed

+1359
-872
lines changed

Some content is hidden

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

68 files changed

+1359
-872
lines changed

.storybook/config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import loadStories from './stories';
66
import sldsTheme from './sldsTheme';
77

88
import '../ui/index.scss'; // load slds css
9+
import '../ui/touch.scss'; // load touch stylesheet
910
import './scss/ui/index.scss'; // Our custom Storybook presentation styles
1011
import '../shared/styles/doc.scss'; // docs styles
1112

.storybook/webpack.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ module.exports = async ({ config, mode }) => {
6161
},
6262
{
6363
loader: 'sass-loader',
64-
options: { sourceMap: true, outputStyle: 'compressed' }
64+
options: {
65+
sassOptions: { sourceMap: true, outputStyle: 'compressed' }
66+
}
6567
},
6668
// Reads Sass vars from files or inlined in the options property
6769
// needed to reset the asset paths for webpack to load them, as we

gulpfile.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,17 @@ gulp.task('sanitized:componentSass', sanitized.writeSanitizedComponentCss);
200200
*/
201201

202202
gulp.task('styles:sass', styles.sass);
203+
gulp.task('styles:sassTouch', styles.sassTouch);
203204
gulp.task('styles:test', styles.sassTest);
204205
gulp.task('styles:formFactors', styles.sassFormFactors);
205206
gulp.task(
206207
'styles',
207208
gulp.series(
208209
gulp.parallel(
209-
withName('styles:sass')(styles.sass),
210-
withName('styles:test')(styles.sassTest),
211-
withName('styles:formFactors')(styles.sassFormFactors)
210+
'styles:sass',
211+
'styles:sassTouch',
212+
'styles:test',
213+
'styles:formFactors'
212214
)
213215
)
214216
);
@@ -272,6 +274,7 @@ export const watch = () =>
272274

273275
// Framework
274276
gulp.task('dist:sass:framework', dist.sass);
277+
gulp.task('dist:sass:frameworkTouch', dist.sassTouch);
275278

276279
// Components
277280
gulp.task('dist:sass:components:generate', dist.generateComponentSass);
@@ -281,6 +284,7 @@ gulp.task(
281284
'dist:sass',
282285
gulp.series(
283286
'dist:sass:framework',
287+
'dist:sass:frameworkTouch',
284288
'dist:sass:components:generate',
285289
'dist:sass:components:common'
286290
)

0 commit comments

Comments
 (0)