Teo Dragovic commited on
Commit
24403cf
·
1 Parent(s): cce1e72

Resolve merge conflicts

Browse files
config/webpack.config.demo.js CHANGED
@@ -47,6 +47,13 @@ module.exports = {
47
  loader: 'css-loader',
48
  options: { url: false },
49
  },
 
 
 
 
 
 
 
50
  'sass-loader',
51
  ]),
52
  },
 
47
  loader: 'css-loader',
48
  options: { url: false },
49
  },
50
+ {
51
+ loader: 'postcss-loader',
52
+ options: {
53
+ ident: 'postcss',
54
+ plugins: [require('autoprefixer')()], // eslint-disable-line global-require
55
+ },
56
+ },
57
  'sass-loader',
58
  ]),
59
  },
config/webpack.config.prod.js CHANGED
@@ -40,6 +40,13 @@ module.exports = {
40
  loader: 'css-loader',
41
  options: { url: false },
42
  },
 
 
 
 
 
 
 
43
  'sass-loader',
44
  ]),
45
  },
 
40
  loader: 'css-loader',
41
  options: { url: false },
42
  },
43
+ {
44
+ loader: 'postcss-loader',
45
+ options: {
46
+ ident: 'postcss',
47
+ plugins: [require('autoprefixer')()], // eslint-disable-line global-require
48
+ },
49
+ },
50
  'sass-loader',
51
  ]),
52
  },
dist/driver.min.css CHANGED
@@ -1 +1 @@
1
- div#driver-popover-item{display:none;position:absolute;background:#fff;color:#2d2d2d;margin:0;padding:15px;border-radius:5px;min-width:250px;max-width:300px;box-shadow:0 1px 10px rgba(0,0,0,.4);z-index:1000000000}div#driver-popover-item .driver-popover-tip{border:5px solid #fff;content:"";position:absolute}div#driver-popover-item .driver-popover-tip.bottom{bottom:-10px;border-color:#fff transparent transparent}div#driver-popover-item .driver-popover-tip.bottom.position-center{left:49%}div#driver-popover-item .driver-popover-tip.bottom.position-right{right:20px}div#driver-popover-item .driver-popover-tip.left{left:-10px;top:10px;border-color:transparent #fff transparent transparent}div#driver-popover-item .driver-popover-tip.left.position-center{top:46%}div#driver-popover-item .driver-popover-tip.left.position-bottom{top:auto;bottom:20px}div#driver-popover-item .driver-popover-tip.right{right:-10px;top:10px;border-color:transparent transparent transparent #fff}div#driver-popover-item .driver-popover-tip.right.position-center{top:46%}div#driver-popover-item .driver-popover-tip.right.position-bottom{top:auto;bottom:20px}div#driver-popover-item .driver-popover-tip.top{top:-10px;border-color:transparent transparent #fff}div#driver-popover-item .driver-popover-tip.top.position-center{left:49%}div#driver-popover-item .driver-popover-tip.top.position-right{right:20px}div#driver-popover-item .driver-popover-tip.mid-center{display:none}div#driver-popover-item .driver-popover-footer{display:block;margin-top:10px}div#driver-popover-item .driver-popover-footer button{display:inline-block;padding:3px 10px;border:1px solid #d4d4d4;text-decoration:none;text-shadow:1px 1px 0 #fff;color:#2d2d2d;font:11px/normal sans-serif;cursor:pointer;outline:0;background-color:#f1f1f1;border-radius:2px;zoom:1;line-height:1.3}div#driver-popover-item .driver-popover-footer button.driver-disabled{color:grey;cursor:default;pointer-events:none}div#driver-popover-item .driver-popover-footer .driver-close-btn{float:left}div#driver-popover-item .driver-popover-footer .driver-btn-group,div#driver-popover-item .driver-popover-footer .driver-close-only-btn{float:right}div#driver-popover-item .driver-popover-title{font:19px/normal sans-serif;margin:0 0 5px;font-weight:700;display:block;position:relative;line-height:1.5;zoom:1}div#driver-popover-item .driver-popover-description{margin-bottom:0;font:14px/normal sans-serif;line-height:1.5;color:#2d2d2d;font-weight:400;zoom:1}.driver-clearfix:after,.driver-clearfix:before{content:"";display:table}.driver-clearfix:after{clear:both}.driver-stage-no-animation{-webkit-transition:none!important;-moz-transition:none!important;-ms-transition:none!important;-o-transition:none!important;transition:none!important;background:transparent!important;outline:5000px solid rgba(0,0,0,.75)}div#driver-page-overlay{background:#000;position:fixed;bottom:0;right:0;display:block;width:100%;height:100%;zoom:1;filter:alpha(opacity=75);opacity:.75;z-index:100002!important}div#driver-highlighted-element-stage,div#driver-page-overlay{top:0;left:0;-webkit-transition:all .3s;-moz-transition:all .3s;-ms-transition:all .3s;-o-transition:all .3s;transition:all .3s}div#driver-highlighted-element-stage{position:absolute;height:50px;width:300px;background:#fff;z-index:100003!important;display:none;border-radius:2px}.driver-highlighted-element{z-index:100004!important}.driver-position-relative{position:relative!important}.driver-fix-stacking{z-index:auto!important;opacity:1!important;-webkit-transform:none!important;-moz-transform:none!important;-ms-transform:none!important;-o-transform:none!important;transform:none!important;-webkit-filter:none!important;-moz-filter:none!important;-ms-filter:none!important;-o-filter:none!important;filter:none!important;-webkit-perspective:none!important;-moz-perspective:none!important;-ms-perspective:none!important;-o-perspective:none!important;perspective:none!important;-webkit-transform-style:flat!important;-moz-transform-style:flat!important;-ms-transform-style:flat!important;transform-style:flat!important;-webkit-transform-box:border-box!important;-moz-transform-box:border-box!important;-ms-transform-box:border-box!important;-o-transform-box:border-box!important;transform-box:border-box!important;will-change:unset!important}
 
1
+ div#driver-popover-item{display:none;position:absolute;background:#fff;color:#2d2d2d;margin:0;padding:15px;border-radius:5px;min-width:250px;max-width:300px;box-shadow:0 1px 10px rgba(0,0,0,.4);z-index:1000000000}div#driver-popover-item .driver-popover-tip{border:5px solid #fff;content:"";position:absolute}div#driver-popover-item .driver-popover-tip.bottom{bottom:-10px;border-color:#fff transparent transparent}div#driver-popover-item .driver-popover-tip.bottom.position-center{left:49%}div#driver-popover-item .driver-popover-tip.bottom.position-right{right:20px}div#driver-popover-item .driver-popover-tip.left{left:-10px;top:10px;border-color:transparent #fff transparent transparent}div#driver-popover-item .driver-popover-tip.left.position-center{top:46%}div#driver-popover-item .driver-popover-tip.left.position-bottom{top:auto;bottom:20px}div#driver-popover-item .driver-popover-tip.right{right:-10px;top:10px;border-color:transparent transparent transparent #fff}div#driver-popover-item .driver-popover-tip.right.position-center{top:46%}div#driver-popover-item .driver-popover-tip.right.position-bottom{top:auto;bottom:20px}div#driver-popover-item .driver-popover-tip.top{top:-10px;border-color:transparent transparent #fff}div#driver-popover-item .driver-popover-tip.top.position-center{left:49%}div#driver-popover-item .driver-popover-tip.top.position-right{right:20px}div#driver-popover-item .driver-popover-tip.mid-center{display:none}div#driver-popover-item .driver-popover-footer{display:block;margin-top:10px}div#driver-popover-item .driver-popover-footer button{display:inline-block;padding:3px 10px;border:1px solid #d4d4d4;text-decoration:none;text-shadow:1px 1px 0 #fff;color:#2d2d2d;font:11px/normal sans-serif;cursor:pointer;outline:0;background-color:#f1f1f1;border-radius:2px;zoom:1;line-height:1.3}div#driver-popover-item .driver-popover-footer button.driver-disabled{color:grey;cursor:default;pointer-events:none}div#driver-popover-item .driver-popover-footer .driver-close-btn{float:left}div#driver-popover-item .driver-popover-footer .driver-btn-group,div#driver-popover-item .driver-popover-footer .driver-close-only-btn{float:right}div#driver-popover-item .driver-popover-title{font:19px/normal sans-serif;margin:0 0 5px;font-weight:700;display:block;position:relative;line-height:1.5;zoom:1}div#driver-popover-item .driver-popover-description{margin-bottom:0;font:14px/normal sans-serif;line-height:1.5;color:#2d2d2d;font-weight:400;zoom:1}.driver-clearfix:after,.driver-clearfix:before{content:"";display:table}.driver-clearfix:after{clear:both}.driver-stage-no-animation{transition:none!important;background:transparent!important;outline:5000px solid rgba(0,0,0,.75)}div#driver-page-overlay{background:#000;position:fixed;top:0;left:0;bottom:0;right:0;display:block;width:100%;height:100%;zoom:1;filter:alpha(opacity=75);opacity:.75;z-index:100002!important;transition:all .3s}div#driver-highlighted-element-stage{position:absolute;top:0;left:0;height:50px;width:300px;background:#fff;z-index:100003!important;display:none;border-radius:2px;transition:all .3s}.driver-highlighted-element{z-index:100004!important}.driver-position-relative{position:relative!important}.driver-fix-stacking{z-index:auto!important;opacity:1!important;transform:none!important;-webkit-filter:none!important;filter:none!important;perspective:none!important;transform-style:flat!important;transform-box:border-box!important;will-change:unset!important}
package.json CHANGED
@@ -21,6 +21,7 @@
21
  "@babel/core": "^7.4.5",
22
  "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
23
  "@babel/preset-env": "^7.4.5",
 
24
  "babel-eslint": "^10.0.1",
25
  "babel-loader": "^8.0.6",
26
  "copy-webpack-plugin": "^5.0.3",
@@ -46,5 +47,8 @@
46
  "webpack-cli": "^3.3.4",
47
  "webpack-dev-server": "^3.7.1"
48
  },
49
- "dependencies": {}
 
 
 
50
  }
 
21
  "@babel/core": "^7.4.5",
22
  "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
23
  "@babel/preset-env": "^7.4.5",
24
+ "autoprefixer": "^9.7.4",
25
  "babel-eslint": "^10.0.1",
26
  "babel-loader": "^8.0.6",
27
  "copy-webpack-plugin": "^5.0.3",
 
47
  "webpack-cli": "^3.3.4",
48
  "webpack-dev-server": "^3.7.1"
49
  },
50
+ "dependencies": {},
51
+ "browserslist": [
52
+ "defaults"
53
+ ]
54
  }
src/driver.scss CHANGED
@@ -176,10 +176,6 @@ div#driver-popover-item {
176
  }
177
 
178
  .driver-stage-no-animation {
179
- -webkit-transition: none !important;
180
- -moz-transition: none !important;
181
- -ms-transition: none !important;
182
- -o-transition: none !important;
183
  transition: none !important;
184
 
185
  background: transparent !important;
@@ -201,10 +197,6 @@ div#driver-page-overlay {
201
  opacity: 0.75;
202
  z-index: $overlay-z-index !important;
203
 
204
- -webkit-transition: all $animation-sec;
205
- -moz-transition: all $animation-sec;
206
- -ms-transition: all $animation-sec;
207
- -o-transition: all $animation-sec;
208
  transition: all $animation-sec;
209
  }
210
 
@@ -219,10 +211,6 @@ div#driver-highlighted-element-stage {
219
  display: none;
220
  border-radius: 2px;
221
 
222
- -webkit-transition: all $animation-sec;
223
- -moz-transition: all $animation-sec;
224
- -ms-transition: all $animation-sec;
225
- -o-transition: all $animation-sec;
226
  transition: all $animation-sec;
227
  }
228
 
@@ -237,29 +225,10 @@ div#driver-highlighted-element-stage {
237
  .driver-fix-stacking {
238
  z-index: auto !important;
239
  opacity: 1.0 !important;
240
- -webkit-transform: none !important;
241
- -moz-transform: none !important;
242
- -ms-transform: none !important;
243
- -o-transform: none !important;
244
  transform: none !important;
245
- -webkit-filter: none !important;
246
- -moz-filter: none !important;
247
- -ms-filter: none !important;
248
- -o-filter: none !important;
249
  filter: none !important;
250
- -webkit-perspective: none !important;
251
- -moz-perspective: none !important;
252
- -ms-perspective: none !important;
253
- -o-perspective: none !important;
254
  perspective: none !important;
255
- -webkit-transform-style: flat !important;
256
- -moz-transform-style: flat !important;
257
- -ms-transform-style: flat !important;
258
  transform-style: flat !important;
259
- -webkit-transform-box: border-box !important;
260
- -moz-transform-box: border-box !important;
261
- -ms-transform-box: border-box !important;
262
- -o-transform-box: border-box !important;
263
  transform-box: border-box !important;
264
  will-change: unset !important;
265
  }
 
176
  }
177
 
178
  .driver-stage-no-animation {
 
 
 
 
179
  transition: none !important;
180
 
181
  background: transparent !important;
 
197
  opacity: 0.75;
198
  z-index: $overlay-z-index !important;
199
 
 
 
 
 
200
  transition: all $animation-sec;
201
  }
202
 
 
211
  display: none;
212
  border-radius: 2px;
213
 
 
 
 
 
214
  transition: all $animation-sec;
215
  }
216
 
 
225
  .driver-fix-stacking {
226
  z-index: auto !important;
227
  opacity: 1.0 !important;
 
 
 
 
228
  transform: none !important;
 
 
 
 
229
  filter: none !important;
 
 
 
 
230
  perspective: none !important;
 
 
 
231
  transform-style: flat !important;
 
 
 
 
232
  transform-box: border-box !important;
233
  will-change: unset !important;
234
  }
yarn.lock CHANGED
The diff for this file is too large to render. See raw diff