Skip to content

Commit f937a7e

Browse files
mchapmanmchapman
committed
WIP
1 parent 2961456 commit f937a7e

18 files changed

+12066
-12653
lines changed

‎website/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
# Playwright
3+
node_modules/
4+
/test-results/
5+
/playwright-report/
6+
/blob-report/
7+
/playwright/.cache/

‎website/Gruntfile.js

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ module.exports = function (grunt) {
1515
express: 'grunt-express-server',
1616
useminPrepare: 'grunt-usemin',
1717
ngtemplates: 'grunt-angular-templates',
18-
protractor: 'grunt-protractor-runner',
1918
buildcontrol: 'grunt-build-control'
2019
});
2120

@@ -191,7 +190,8 @@ module.exports = function (grunt) {
191190
less: {
192191
dist: {
193192
options: {
194-
compile: true
193+
compile: true,
194+
math: 'always'
195195
},
196196
files: {
197197
'<%= yeoman.app %>/styles/main-bs2.css': ['<%= yeoman.app %>/styles/demo-bs2.less'],
@@ -465,19 +465,6 @@ module.exports = function (grunt) {
465465
src: ['server/**/*.spec.js', 'test/server/**/*.spec.js']
466466
},
467467

468-
protractor: {
469-
options: {
470-
configFile: 'test/e2e/protractor-chrome.conf.js'
471-
},
472-
firefox: {
473-
options: {
474-
args: {
475-
browser: 'chrome'
476-
}
477-
}
478-
}
479-
},
480-
481468
env: {
482469
test: {
483470
NODE_ENV: 'test'
@@ -646,7 +633,7 @@ module.exports = function (grunt) {
646633
// 'wiredep',
647634
'autoprefixer',
648635
'express:dev',
649-
'protractor'
636+
'npx playwright test stdalone-$j*.spec.ts --project=chromium --workers 1'
650637
]);
651638
}
652639

‎website/app/styles/main-bs2.css

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5756,7 +5756,8 @@ input[type="checkbox"].ng-invalid::after {
57565756
}
57575757
/* Delayed Absolute Center Spinner */
57585758
/* Absolute Center Spinner */
5759-
.loading {
5759+
.loading,
5760+
.spinner {
57605761
position: fixed;
57615762
z-index: 999;
57625763
height: 2em;
@@ -5767,11 +5768,18 @@ input[type="checkbox"].ng-invalid::after {
57675768
left: 0;
57685769
bottom: 0;
57695770
right: 0;
5771+
}
5772+
.loading {
57705773
-webkit-animation: lds-ring-fadein 3.4s;
57715774
animation: lds-ring-fadein 3.4s;
57725775
}
5776+
.spinner {
5777+
-webkit-animation: lds-ring-fadein 0.4s;
5778+
animation: lds-ring-fadein 0.4s;
5779+
}
57735780
/* Transparent Overlay */
5774-
.loading:before {
5781+
.loading:before,
5782+
.spinner:before {
57755783
content: '';
57765784
display: block;
57775785
position: fixed;
@@ -5782,15 +5790,17 @@ input[type="checkbox"].ng-invalid::after {
57825790
background-color: rgba(0, 0, 0, 0.3);
57835791
}
57845792
/* :not(:required) hides these rules from IE9 and below */
5785-
.loading:not(:required) {
5793+
.loading:not(:required),
5794+
.spinner:not(:required) {
57865795
/* hide "loading..." text */
57875796
font: 0/0 a;
57885797
color: transparent;
57895798
text-shadow: none;
57905799
background-color: transparent;
57915800
border: 0;
57925801
}
5793-
.loading:not(:required):after {
5802+
.loading:not(:required):after,
5803+
.spinner:not(:required):after {
57945804
content: '';
57955805
display: block;
57965806
font-size: 10px;

‎website/app/styles/main-bs3.css

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7172,7 +7172,8 @@ input[type="checkbox"].ng-invalid::after {
71727172
}
71737173
/* Delayed Absolute Center Spinner */
71747174
/* Absolute Center Spinner */
7175-
.loading {
7175+
.loading,
7176+
.spinner {
71767177
position: fixed;
71777178
z-index: 999;
71787179
height: 2em;
@@ -7183,11 +7184,18 @@ input[type="checkbox"].ng-invalid::after {
71837184
left: 0;
71847185
bottom: 0;
71857186
right: 0;
7187+
}
7188+
.loading {
71867189
-webkit-animation: lds-ring-fadein 3.4s;
71877190
animation: lds-ring-fadein 3.4s;
71887191
}
7192+
.spinner {
7193+
-webkit-animation: lds-ring-fadein 0.4s;
7194+
animation: lds-ring-fadein 0.4s;
7195+
}
71897196
/* Transparent Overlay */
7190-
.loading:before {
7197+
.loading:before,
7198+
.spinner:before {
71917199
content: '';
71927200
display: block;
71937201
position: fixed;
@@ -7198,15 +7206,17 @@ input[type="checkbox"].ng-invalid::after {
71987206
background-color: rgba(0, 0, 0, 0.3);
71997207
}
72007208
/* :not(:required) hides these rules from IE9 and below */
7201-
.loading:not(:required) {
7209+
.loading:not(:required),
7210+
.spinner:not(:required) {
72027211
/* hide "loading..." text */
72037212
font: 0/0 a;
72047213
color: transparent;
72057214
text-shadow: none;
72067215
background-color: transparent;
72077216
border: 0;
72087217
}
7209-
.loading:not(:required):after {
7218+
.loading:not(:required):after,
7219+
.spinner:not(:required):after {
72107220
content: '';
72117221
display: block;
72127222
font-size: 10px;

0 commit comments

Comments
 (0)