Skip to content

Commit 1cb6da1

Browse files
committed
Improved lin3s-css-grid integration and enabled parsley
1 parent 4000e4d commit 1cb6da1

6 files changed

Lines changed: 12 additions & 118 deletions

File tree

src/LIN3S/AdminBundle/Resources/private/js/app.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*/
1212

1313
import {onDomReady} from 'lin3s-event-bus';
14+
import {initParsley} from 'lin3s-front-foundation';
1415
import FastClick from 'fastclick';
1516

1617
import './components/Filter';
@@ -20,6 +21,7 @@ import './components/Panel';
2021
import './polyfills';
2122

2223
const onReady = () => {
24+
initParsley();
2325
new FastClick(document.body);
2426
};
2527

src/LIN3S/AdminBundle/Resources/private/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"dependencies": {
2222
"array-from": "^2.1.1",
2323
"fastclick": "^1.0.6",
24-
"jquery": "^3.2.1",
2524
"lin3s-css-grid": "^0.3.0",
2625
"lin3s-event-bus": "^0.6.0",
2726
"lin3s-front-foundation": "^0.5.0"
@@ -44,7 +43,6 @@
4443
"extract-text-webpack-plugin": "^3.0.0",
4544
"modernizr-webpack-plugin": "^1.0.6",
4645
"node-sass": "^4.5.0",
47-
"npm-run-all": "^4.0.1",
4846
"postcss-loader": "^1.2.2",
4947
"precss": "^1.4.0",
5048
"sass-loader": "^6.0.3",

src/LIN3S/AdminBundle/Resources/private/scss/base/_reset.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ blockquote::before,
136136
blockquote::after,
137137
q::before,
138138
q::after {
139-
// scss-lint:disable DuplicateProperty
140139
content: '';
141140
content: none;
142141
}
Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,12 @@
11
// This file is part of the Admin Bundle.
22
//
3-
// Copyright (c) 2015-2016 LIN3S <info@lin3s.com>
3+
// Copyright (c) 2015-present LIN3S <info@lin3s.com>
44
//
55
// For the full copyright and license information, please view the LICENSE
66
// file that was distributed with this source code.
77
//
88
// @author Gorka Laucirica <gorka.lauzirika@gmail.com>
99
// @author Beñat Espiña <benatespina@gmail.com>
1010

11-
@import '../../node_modules/lin3s-css-grid/scss/functions';
12-
@import '../../node_modules/lin3s-css-grid/scss/mixins';
13-
@import '../../node_modules/lin3s-css-grid/scss/variables';
14-
15-
$grid-type: 'adaptive'; // also, it can be fluid
16-
17-
$row-padding: 15px;
18-
$row-width: 1290;
19-
20-
$column-count: 12;
21-
$column-gutter: 30px;
22-
23-
$small-cols: 6, 12;
24-
$medium-cols: 4, 6, 12;
25-
$large-cols: 3, 4, 6, 8, 10, 12;
26-
$xlarge-cols: 12;
27-
28-
$small-breakpoint: 640;
29-
$medium-breakpoint: 1024;
30-
$large-breakpoint: 1279;
31-
$xlarge-breakpoint: 1440;
32-
11+
@import '../variables/grid';
3312
@import '../../node_modules/lin3s-css-grid/scss/row';

src/LIN3S/AdminBundle/Resources/private/scss/variables/_grid.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,9 @@
77
//
88
// @author Beñat Espiña <benatespina@gmail.com>
99

10+
$small-cols: 6, 12;
11+
$medium-cols: 4, 6, 12;
12+
$large-cols: 3, 4, 6, 8, 10, 12;
13+
$xlarge-cols: 12;
14+
1015
@import '../../node_modules/lin3s-css-grid/scss/variables';

src/LIN3S/AdminBundle/Resources/private/yarn.lock

Lines changed: 3 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,6 @@ arr-flatten@^1.0.1:
137137
version "1.0.1"
138138
resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
139139

140-
array-filter@~0.0.0:
141-
version "0.0.1"
142-
resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
143-
144140
array-find-index@^1.0.1:
145141
version "1.0.2"
146142
resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -149,14 +145,6 @@ array-from@^2.1.1:
149145
version "2.1.1"
150146
resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
151147

152-
array-map@~0.0.0:
153-
version "0.0.0"
154-
resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
155-
156-
array-reduce@~0.0.0:
157-
version "0.0.0"
158-
resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
159-
160148
array-union@^1.0.1:
161149
version "1.0.2"
162150
resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -1728,10 +1716,6 @@ dot-case@^1.1.0:
17281716
dependencies:
17291717
sentence-case "^1.1.2"
17301718

1731-
duplexer@~0.1.1:
1732-
version "0.1.1"
1733-
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
1734-
17351719
ecc-jsbn@~0.1.1:
17361720
version "0.1.1"
17371721
resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -1780,7 +1764,7 @@ error-ex@^1.2.0:
17801764
dependencies:
17811765
is-arrayish "^0.2.1"
17821766

1783-
es-abstract@^1.4.3, es-abstract@^1.7.0:
1767+
es-abstract@^1.7.0:
17841768
version "1.7.0"
17851769
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
17861770
dependencies:
@@ -1970,18 +1954,6 @@ event-emitter@~0.3.4:
19701954
d "~0.1.1"
19711955
es5-ext "~0.10.7"
19721956

1973-
event-stream@~3.3.0:
1974-
version "3.3.4"
1975-
resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
1976-
dependencies:
1977-
duplexer "~0.1.1"
1978-
from "~0"
1979-
map-stream "~0.1.0"
1980-
pause-stream "0.0.11"
1981-
split "0.3"
1982-
stream-combiner "~0.0.4"
1983-
through "~2.3.1"
1984-
19851957
events@^1.0.0:
19861958
version "1.1.1"
19871959
resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
@@ -2161,10 +2133,6 @@ form-data@~2.1.1:
21612133
combined-stream "^1.0.5"
21622134
mime-types "^2.1.12"
21632135

2164-
from@~0:
2165-
version "0.1.3"
2166-
resolved "https://registry.yarnpkg.com/from/-/from-0.1.3.tgz#ef63ac2062ac32acf7862e0d40b44b896f22f3bc"
2167-
21682136
fs-extra@^0.24.0:
21692137
version "0.24.0"
21702138
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
@@ -2764,7 +2732,7 @@ jodid25519@^1.0.0:
27642732
dependencies:
27652733
jsbn "~0.1.0"
27662734

2767-
jquery@>=1.8.0, jquery@^3.2.1:
2735+
jquery@>=1.8.0:
27682736
version "3.2.1"
27692737
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
27702738

@@ -3048,10 +3016,6 @@ map-obj@^1.0.0, map-obj@^1.0.1:
30483016
version "1.0.1"
30493017
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
30503018

3051-
map-stream@~0.1.0:
3052-
version "0.1.0"
3053-
resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
3054-
30553019
math-expression-evaluator@^1.2.14:
30563020
version "1.2.16"
30573021
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
@@ -3330,18 +3294,6 @@ normalize-url@^1.4.0:
33303294
query-string "^4.1.0"
33313295
sort-keys "^1.0.0"
33323296

3333-
npm-run-all@^4.0.1:
3334-
version "4.0.1"
3335-
resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.0.1.tgz#f10144d20b57ed9bbf6c36a8de9502e0b80f2b4e"
3336-
dependencies:
3337-
chalk "^1.1.3"
3338-
cross-spawn "^5.0.1"
3339-
minimatch "^3.0.2"
3340-
ps-tree "^1.0.1"
3341-
read-pkg "^2.0.0"
3342-
shell-quote "^1.6.1"
3343-
string.prototype.padend "^3.0.0"
3344-
33453297
npm-run-path@^2.0.0:
33463298
version "2.0.2"
33473299
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -3564,12 +3516,6 @@ path-type@^2.0.0:
35643516
dependencies:
35653517
pify "^2.0.0"
35663518

3567-
pause-stream@0.0.11:
3568-
version "0.0.11"
3569-
resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
3570-
dependencies:
3571-
through "~2.3"
3572-
35733519
pbkdf2@^3.0.3:
35743520
version "3.0.9"
35753521
resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693"
@@ -4109,12 +4055,6 @@ prr@~0.0.0:
41094055
version "0.0.0"
41104056
resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
41114057

4112-
ps-tree@^1.0.1:
4113-
version "1.1.0"
4114-
resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014"
4115-
dependencies:
4116-
event-stream "~3.3.0"
4117-
41184058
pseudomap@^1.0.1:
41194059
version "1.0.2"
41204060
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -4543,15 +4483,6 @@ shebang-regex@^1.0.0:
45434483
version "1.0.0"
45444484
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
45454485

4546-
shell-quote@^1.6.1:
4547-
version "1.6.1"
4548-
resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
4549-
dependencies:
4550-
array-filter "~0.0.0"
4551-
array-map "~0.0.0"
4552-
array-reduce "~0.0.0"
4553-
jsonify "~0.0.0"
4554-
45554486
shelljs@^0.7.5:
45564487
version "0.7.6"
45574488
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
@@ -4632,12 +4563,6 @@ specificity@^0.3.1:
46324563
version "0.3.1"
46334564
resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.1.tgz#f1b068424ce317ae07478d95de3c21cf85e8d567"
46344565

4635-
split@0.3:
4636-
version "0.3.3"
4637-
resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
4638-
dependencies:
4639-
through "2"
4640-
46414566
sprintf-js@~1.0.2:
46424567
version "1.0.3"
46434568
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -4670,12 +4595,6 @@ stream-browserify@^2.0.1:
46704595
inherits "~2.0.1"
46714596
readable-stream "^2.0.2"
46724597

4673-
stream-combiner@~0.0.4:
4674-
version "0.0.4"
4675-
resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
4676-
dependencies:
4677-
duplexer "~0.1.1"
4678-
46794598
stream-http@^2.3.1:
46804599
version "2.6.3"
46814600
resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.6.3.tgz#4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"
@@ -4716,14 +4635,6 @@ string-width@^2.1.0:
47164635
is-fullwidth-code-point "^2.0.0"
47174636
strip-ansi "^4.0.0"
47184637

4719-
string.prototype.padend@^3.0.0:
4720-
version "3.0.0"
4721-
resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
4722-
dependencies:
4723-
define-properties "^1.1.2"
4724-
es-abstract "^1.4.3"
4725-
function-bind "^1.0.2"
4726-
47274638
string_decoder@^0.10.25, string_decoder@~0.10.x:
47284639
version "0.10.31"
47294640
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -4960,7 +4871,7 @@ text-table@~0.2.0:
49604871
version "0.2.0"
49614872
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
49624873

4963-
through@2, through@^2.3.6, through@~2.3, through@~2.3.1:
4874+
through@^2.3.6:
49644875
version "2.3.8"
49654876
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
49664877

0 commit comments

Comments
 (0)