Skip to content

Commit 57323a7

Browse files
committed
Merge branch 'develop' into project/bats2phpunit
2 parents 9ddb1b0 + 208b7bd commit 57323a7

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

.vortex/installer/tests/Fixtures/install/_baseline/web/themes/custom/star_wars/Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module.exports = function (grunt) {
8484
options: {
8585
implementation: require('sass'),
8686
sourceMap: true,
87-
outputStyle: 'expanded'
87+
style: 'expanded'
8888
}
8989
},
9090
prod: {
@@ -94,7 +94,7 @@ module.exports = function (grunt) {
9494
options: {
9595
implementation: require('sass'),
9696
sourceMap: false,
97-
outputStyle: 'compressed'
97+
style: 'compressed'
9898
}
9999
}
100100
},

.vortex/installer/tests/Fixtures/install/hosting_acquia/docroot/themes/custom/star_wars/Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module.exports = function (grunt) {
8484
options: {
8585
implementation: require('sass'),
8686
sourceMap: true,
87-
outputStyle: 'expanded'
87+
style: 'expanded'
8888
}
8989
},
9090
prod: {
@@ -94,7 +94,7 @@ module.exports = function (grunt) {
9494
options: {
9595
implementation: require('sass'),
9696
sourceMap: false,
97-
outputStyle: 'compressed'
97+
style: 'compressed'
9898
}
9999
}
100100
},

.vortex/installer/tests/Fixtures/install/names/web/themes/custom/lightsaber/Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module.exports = function (grunt) {
8484
options: {
8585
implementation: require('sass'),
8686
sourceMap: true,
87-
outputStyle: 'expanded'
87+
style: 'expanded'
8888
}
8989
},
9090
prod: {
@@ -94,7 +94,7 @@ module.exports = function (grunt) {
9494
options: {
9595
implementation: require('sass'),
9696
sourceMap: false,
97-
outputStyle: 'compressed'
97+
style: 'compressed'
9898
}
9999
}
100100
},

.vortex/installer/tests/Fixtures/install/theme_custom/web/themes/custom/light_saber/Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module.exports = function (grunt) {
8484
options: {
8585
implementation: require('sass'),
8686
sourceMap: true,
87-
outputStyle: 'expanded'
87+
style: 'expanded'
8888
}
8989
},
9090
prod: {
@@ -94,7 +94,7 @@ module.exports = function (grunt) {
9494
options: {
9595
implementation: require('sass'),
9696
sourceMap: false,
97-
outputStyle: 'compressed'
97+
style: 'compressed'
9898
}
9999
}
100100
},

.vortex/tests/bats/_helper.workflow.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ assert_ahoy_fe() {
770770
sync_to_container
771771
ahoy fe
772772
sync_to_host
773-
assert_file_contains "${webroot}/themes/custom/star_wars/build/css/star_wars.min.css" "background: #7e57e2"
773+
assert_file_contains "${webroot}/themes/custom/star_wars/build/css/star_wars.min.css" "background:#7e57e2"
774774

775775
substep "Build FE assets for development"
776776
assert_file_not_contains "${webroot}/themes/custom/star_wars/build/css/star_wars.min.css" "#91ea5e"

web/themes/custom/your_site_theme/Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module.exports = function (grunt) {
8484
options: {
8585
implementation: require('sass'),
8686
sourceMap: true,
87-
outputStyle: 'expanded'
87+
style: 'expanded'
8888
}
8989
},
9090
prod: {

0 commit comments

Comments
 (0)