Skip to content

Commit

Permalink
update dependencies and build
Browse files Browse the repository at this point in the history
  • Loading branch information
jessepollak committed Jul 26, 2020
1 parent acffc92 commit 37e7e04
Show file tree
Hide file tree
Showing 8 changed files with 1,142 additions and 1,058 deletions.
2 changes: 1 addition & 1 deletion dist/card.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/card.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jquery.card.js

Large diffs are not rendered by default.

2,107 changes: 1,097 additions & 1,010 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
"css-loader": "^0.23.1",
"event-stream": "^3.3.1",
"glob": "^7.0.5",
"jquery": "~3.4.1",
"node-sass": "^4.14.0",
"nodemon": "~1.9.2",
"jquery": "^3.5.1",
"node-sass": "^4.14.1",
"nodemon": "^2.0.4",
"replace": "^1.2.0",
"rimraf": "^2.5.4",
"run-sequence": "~1.2.1",
Expand All @@ -49,7 +49,7 @@
"vinyl-source-stream": "^1.1.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.2.1",
"webpack-dev-server": "^3.1.14"
"webpack-dev-server": "^3.11.0"
},
"dependencies": {
"node.extend": "~1.1.3",
Expand Down
17 changes: 9 additions & 8 deletions src/scss/card.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "bourbon/app/assets/stylesheets/bourbon";
@import "mixins";
@import "mixins";

// browser specific hacks
@import "browsers/safari";
Expand Down Expand Up @@ -64,7 +64,7 @@
left: 0;
overflow: hidden;
border-radius: $card-border-radius;
background: #DDD;
background: #ddd;

&:before {
@include shape();
Expand Down Expand Up @@ -92,7 +92,8 @@
opacity: 1;
font-weight: 700;

&.valid {}
&.valid {
}
}
}

Expand All @@ -102,7 +103,7 @@
}

.jp-card-shiny {
$color: #CCC;
$color: #ccc;
$radius: 5px;
width: 50px;
height: 35px;
Expand Down Expand Up @@ -139,7 +140,7 @@
position: absolute;
left: (100% - $width) / 2;
bottom: 30px;
@media only screen and (max-width : 480px) {
@media only screen and (max-width: 480px) {
width: 90%;
left: 5%;
}
Expand Down Expand Up @@ -227,7 +228,7 @@

&:after {
@include shape();
@include linear-gradient(#FFF, #FFF);
@include linear-gradient(#fff, #fff);
width: 80%;
height: $signature-height;
position: absolute;
Expand Down Expand Up @@ -261,7 +262,7 @@
}

&.jp-card-identified {
box-shadow: 0 0 20px rgba(0,0,0,0.3);
box-shadow: 0 0 20px rgba(0, 0, 0, 0.3);

.jp-card-back,
.jp-card-front {
Expand Down Expand Up @@ -289,4 +290,4 @@
}
}
}
}
}
7 changes: 4 additions & 3 deletions src/scss/cards/_card.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
$card-width: 350px;
$card-height: 200px;
$card-border-radius: 10px;
$card-fill-color: #3399CC;
$card-fill-color: #3399cc;
$card-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
$card-monospace-font-family: "Bitstream Vera Sans Mono", Consolas, Courier, monospace;
$card-monospace-font-family: "Bitstream Vera Sans Mono", Consolas, Courier,
monospace;
$card-font-color: white;
$card-transition-time: 400ms;
$card-transition-time: 400ms;
55 changes: 25 additions & 30 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,52 +1,47 @@
var webpack = require('webpack')
var _ = require('underscore')
var webpack = require("webpack");
var _ = require("underscore");

var baseConfig = {
mode: 'production',
mode: "production",
resolve: {
extensions: [
'.js',
'.coffee',
'.scss'
]
extensions: [".js", ".coffee", ".scss"],
},
entry: './src/coffee/card.coffee',
entry: "./src/coffee/card.coffee",
output: {
path: __dirname + '/dist/',
filename: 'card.js',
library: 'card',
libraryTarget: 'var',
path: __dirname + "/dist/",
filename: "card.js",
library: "card",
libraryTarget: "var",
},
module: {
rules: [
{
test: /\.scss/,
use: [
"style-loader", "css-loader", "sass-loader?outputStyle=compressed"
"style-loader",
"css-loader",
"sass-loader?outputStyle=compressed",
],
},
{ test: /\.coffee$/, loader: "coffee-loader" }
]
}
}
{ test: /\.coffee$/, loader: "coffee-loader" },
],
},
};

var jQueryConfig = _.defaults(
{
entry: './src/coffee/jquery.card.coffee',
entry: "./src/coffee/jquery.card.coffee",
output: {
path: __dirname + '/dist/',
filename: 'jquery.card.js',
library: 'card',
libraryTarget: 'var',
path: __dirname + "/dist/",
filename: "jquery.card.js",
library: "card",
libraryTarget: "var",
},
externals: {
"jquery": "jQuery"
}
jquery: "jQuery",
},
},
baseConfig
)
);

module.exports = [
baseConfig,
jQueryConfig
]
module.exports = [baseConfig, jQueryConfig];

0 comments on commit 37e7e04

Please sign in to comment.