Skip to content

Commit bd4f161

Browse files
yurabakhtinyurabakhtin
committed
Update grunt
1 parent 9c869b3 commit bd4f161

58 files changed

Lines changed: 3944 additions & 941 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package-lock.json‎

Lines changed: 3458 additions & 468 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@
88
"url": "https://github.com/b2evolution/b2evolution.git"
99
},
1010
"devDependencies": {
11-
"grunt": "^1.0.3",
11+
"grunt": "^1.0.4",
1212
"grunt-autoprefixer": "^3.0.3",
1313
"grunt-contrib-concat": "^1.0.1",
1414
"grunt-contrib-cssmin": "^3.0.0",
1515
"grunt-contrib-less": "^2.0.0",
1616
"grunt-contrib-sass": "^1.0.0",
17-
"grunt-contrib-uglify": "^4.0.0",
17+
"grunt-contrib-uglify": "^4.0.1",
1818
"grunt-contrib-watch": "^1.1.0",
1919
"grunt-markdown": "^0.7.0",
2020
"grunt-sass": "^3.0.2"
21+
},
22+
"dependencies": {
23+
"npm": "^6.9.0"
2124
}
2225
}

‎plugins/tinymce_plugin/js/evo_view_shortcodes.bmin.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rsc/build/b2evo_base.bmin.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rsc/build/b2evo_base.bundle.css‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,14 @@ img.round,
156156
.leftmargin {
157157
float: left;
158158
margin-right: 1ex;
159-
margin-top: .2ex;
160-
margin-bottom: .2ex;
159+
margin-top: 0.2ex;
160+
margin-bottom: 0.2ex;
161161
}
162162
.rightmargin {
163163
float: right;
164164
margin-left: 1ex;
165-
margin-top: .2ex;
166-
margin-bottom: .2ex;
165+
margin-top: 0.2ex;
166+
margin-bottom: 0.2ex;
167167
}
168168
.clear {
169169
clear: both;
@@ -364,43 +364,43 @@ input.loader_img {
364364
}
365365
@keyframes evo_rest_api_loader {
366366
0% {
367-
box-shadow: #ff8866 -14px -14px 0 7px, #ffcc66 14px -14px 0 7px, #66dd77 14px 14px 0 7px, #44aaee -14px 14px 0 7px;
367+
box-shadow: #f86 -14px -14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
368368
}
369369
8.33% {
370-
box-shadow: #ff8866 14px -14px 0 7px, #ffcc66 14px -14px 0 7px, #66dd77 14px 14px 0 7px, #44aaee -14px 14px 0 7px;
370+
box-shadow: #f86 14px -14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
371371
}
372372
16.67% {
373-
box-shadow: #ff8866 14px 14px 0 7px, #ffcc66 14px 14px 0 7px, #66dd77 14px 14px 0 7px, #44aaee -14px 14px 0 7px;
373+
box-shadow: #f86 14px 14px 0 7px, #fc6 14px 14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
374374
}
375375
25% {
376-
box-shadow: #ff8866 -14px 14px 0 7px, #ffcc66 -14px 14px 0 7px, #66dd77 -14px 14px 0 7px, #44aaee -14px 14px 0 7px;
376+
box-shadow: #f86 -14px 14px 0 7px, #fc6 -14px 14px 0 7px, #6d7 -14px 14px 0 7px, #4ae -14px 14px 0 7px;
377377
}
378378
33.33% {
379-
box-shadow: #ff8866 -14px -14px 0 7px, #ffcc66 -14px 14px 0 7px, #66dd77 -14px -14px 0 7px, #44aaee -14px -14px 0 7px;
379+
box-shadow: #f86 -14px -14px 0 7px, #fc6 -14px 14px 0 7px, #6d7 -14px -14px 0 7px, #4ae -14px -14px 0 7px;
380380
}
381381
41.67% {
382-
box-shadow: #ff8866 14px -14px 0 7px, #ffcc66 -14px 14px 0 7px, #66dd77 -14px -14px 0 7px, #44aaee 14px -14px 0 7px;
382+
box-shadow: #f86 14px -14px 0 7px, #fc6 -14px 14px 0 7px, #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
383383
}
384384
50% {
385-
box-shadow: #ff8866 14px 14px 0 7px, #ffcc66 -14px 14px 0 7px, #66dd77 -14px -14px 0 7px, #44aaee 14px -14px 0 7px;
385+
box-shadow: #f86 14px 14px 0 7px, #fc6 -14px 14px 0 7px, #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
386386
}
387387
58.33% {
388-
box-shadow: #ff8866 -14px 14px 0 7px, #ffcc66 -14px 14px 0 7px, #66dd77 -14px -14px 0 7px, #44aaee 14px -14px 0 7px;
388+
box-shadow: #f86 -14px 14px 0 7px, #fc6 -14px 14px 0 7px, #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
389389
}
390390
66.67% {
391-
box-shadow: #ff8866 -14px -14px 0 7px, #ffcc66 -14px -14px 0 7px, #66dd77 -14px -14px 0 7px, #44aaee 14px -14px 0 7px;
391+
box-shadow: #f86 -14px -14px 0 7px, #fc6 -14px -14px 0 7px, #6d7 -14px -14px 0 7px, #4ae 14px -14px 0 7px;
392392
}
393393
75% {
394-
box-shadow: #ff8866 14px -14px 0 7px, #ffcc66 14px -14px 0 7px, #66dd77 14px -14px 0 7px, #44aaee 14px -14px 0 7px;
394+
box-shadow: #f86 14px -14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px -14px 0 7px, #4ae 14px -14px 0 7px;
395395
}
396396
83.33% {
397-
box-shadow: #ff8866 14px 14px 0 7px, #ffcc66 14px -14px 0 7px, #66dd77 14px 14px 0 7px, #44aaee 14px 14px 0 7px;
397+
box-shadow: #f86 14px 14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae 14px 14px 0 7px;
398398
}
399399
91.67% {
400-
box-shadow: #ff8866 -14px 14px 0 7px, #ffcc66 14px -14px 0 7px, #66dd77 14px 14px 0 7px, #44aaee -14px 14px 0 7px;
400+
box-shadow: #f86 -14px 14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
401401
}
402402
100% {
403-
box-shadow: #ff8866 -14px -14px 0 7px, #ffcc66 14px -14px 0 7px, #66dd77 14px 14px 0 7px, #44aaee -14px 14px 0 7px;
403+
box-shadow: #f86 -14px -14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
404404
}
405405
}
406406
/* :not(:required) hides this rule from IE9 and below */
@@ -413,37 +413,37 @@ input.loader_img {
413413
height: 7px;
414414
background: transparent;
415415
border-radius: 100%;
416-
box-shadow: #ff8866 -14px -14px 0 7px, #ffcc66 14px -14px 0 7px, #66dd77 14px 14px 0 7px, #44aaee -14px 14px 0 7px;
416+
box-shadow: #f86 -14px -14px 0 7px, #fc6 14px -14px 0 7px, #6d7 14px 14px 0 7px, #4ae -14px 14px 0 7px;
417417
animation: evo_rest_api_loader 5s infinite ease-in-out;
418418
-ms-transform-origin: 50% 50%;
419419
transform-origin: 50% 50%;
420420
}
421421
.status_color_draft {
422-
color: #ffff99;
422+
color: #ff9;
423423
}
424424
.status_color_review {
425-
color: #cc0099;
425+
color: #CC0099;
426426
}
427427
.status_color_community {
428-
color: #2e8bb9;
428+
color: #2E8BB9;
429429
}
430430
.status_color_protected {
431-
color: #ff9c2a;
431+
color: #FF9C2A;
432432
}
433433
.status_color_private {
434-
color: #dc143c;
434+
color: #DC143C;
435435
}
436436
.status_color_published {
437-
color: #99ee44;
437+
color: #99EE44;
438438
}
439439
.status_color_deprecated {
440-
color: #000000;
440+
color: #000;
441441
}
442442
.status_color_redirected {
443443
color: #663399;
444444
}
445445
.status_color_trash {
446-
color: #ff6666;
446+
color: #f66;
447447
}
448448
.status_color_meta {
449449
color: #5bc0de;
@@ -453,7 +453,7 @@ input.loader_img {
453453
}
454454
.btn-status-draft {
455455
color: #000;
456-
background-color: #ffff99;
456+
background-color: #ff9;
457457
border-color: #dfdfdf;
458458
}
459459
.btn-status-draft:hover {
@@ -462,39 +462,39 @@ input.loader_img {
462462
}
463463
.btn-status-review {
464464
color: #fff;
465-
background-color: #cc0099;
465+
background-color: #CC0099;
466466
}
467467
.btn-status-review:hover {
468468
color: #fff;
469469
background-color: #c20092;
470470
}
471471
.btn-status-community {
472472
color: #fff;
473-
background-color: #2e8bb9;
473+
background-color: #2E8BB9;
474474
}
475475
.btn-status-community:hover {
476476
color: #fff;
477477
background-color: #2c84b0;
478478
}
479479
.btn-status-protected {
480480
color: #fff;
481-
background-color: #ff9c2a;
481+
background-color: #FF9C2A;
482482
}
483483
.btn-status-protected:hover {
484484
color: #fff;
485485
background-color: #f39528;
486486
}
487487
.btn-status-private {
488488
color: #fff;
489-
background-color: #dc143c;
489+
background-color: #DC143C;
490490
}
491491
.btn-status-private:hover {
492492
color: #fff;
493493
background-color: #d21339;
494494
}
495495
.btn-status-published {
496496
color: #000;
497-
background-color: #99ee44;
497+
background-color: #99EE44;
498498
}
499499
.btn-status-published .glyphicon {
500500
color: inherit !important;
@@ -505,11 +505,11 @@ input.loader_img {
505505
}
506506
.btn-status-deprecated {
507507
color: #fff;
508-
background-color: #000000;
508+
background-color: #000;
509509
}
510510
.btn-status-deprecated:hover {
511511
color: #fff;
512-
background-color: #333333;
512+
background-color: #333;
513513
}
514514
.btn-status-redirected {
515515
color: #fff;
@@ -521,11 +521,11 @@ input.loader_img {
521521
}
522522
.btn-status-trash {
523523
color: #fff;
524-
background-color: #ff6666;
524+
background-color: #f66;
525525
}
526526
.btn-status-trash:hover {
527527
color: #fff;
528-
background-color: #ff4444;
528+
background-color: #f44;
529529
}
530530
.ufld_yahooim.ufld__textcolor,
531531
.ufld_yahooim.ufld__hovertextcolor:hover {
@@ -1736,11 +1736,11 @@ div#evo_toolbar .actions_right {
17361736
}
17371737
.evobar-menu a.disabled,
17381738
.evobar-menu a.disabled:hover {
1739-
color: #999999;
1739+
color: #999;
17401740
}
17411741
.evobar-menu a.active,
17421742
.evobar-menu a.active:hover {
1743-
background-color: #ffffcc;
1743+
background-color: #ffc;
17441744
border-radius: 4px;
17451745
padding-top: 5px;
17461746
padding-bottom: 5px;
@@ -1806,7 +1806,7 @@ div#evo_toolbar .actions_right {
18061806
left: 0;
18071807
width: 100%;
18081808
text-align: center;
1809-
text-shadow: -1px -1px #000000, -2px 0 #000000, -1px 1px #000000, 0 2px #000000, 1px 1px #000000, 2px 0 #000000, 1px -1px #000000, 0 -2px #000000;
1809+
text-shadow: -1px -1px #000, -2px 0 #000, -1px 1px #000, 0 2px #000, 1px 1px #000, 2px 0 #000, 1px -1px #000, 0 -2px #000;
18101810
color: #FFF;
18111811
font-weight: bold;
18121812
}
@@ -2382,7 +2382,7 @@ label.radiooption {
23822382
margin: 0 0 1ex 0;
23832383
background-color: #fff;
23842384
/* dh> change to "transparent"? */
2385-
padding: .5ex 1ex;
2385+
padding: 0.5ex 1ex;
23862386
}
23872387
legend {
23882388
font-weight: bold;
@@ -2404,7 +2404,7 @@ legend {
24042404
text-align: right;
24052405
font-weight: bold;
24062406
margin: 0;
2407-
padding-top: .5ex;
2407+
padding-top: 0.5ex;
24082408
}
24092409
.fform fieldset.field_wide div.label,
24102410
.fform fieldset.field_inline div.label {
@@ -2432,7 +2432,7 @@ legend {
24322432
}
24332433
.fform div.info {
24342434
margin: 0 0 0 25%;
2435-
padding-top: .5ex;
2435+
padding-top: 0.5ex;
24362436
}
24372437
.fform fieldset.info_full div.info {
24382438
margin-left: 5px;
@@ -3228,7 +3228,7 @@ div.widget_core_user_avatars.evo_layout_flow .widget_flow_blocks > div img {
32283228
}
32293229
.widget_core_org_members {
32303230
margin: 5em 0 30px;
3231-
color: #333333;
3231+
color: #333;
32323232
}
32333233
.widget_core_org_members div.widget_rwd_content {
32343234
text-align: center;
@@ -3264,7 +3264,7 @@ div.widget_core_user_avatars.evo_layout_flow .widget_flow_blocks > div img {
32643264
font-size: 18px;
32653265
}
32663266
.widget_core_org_members a.user_link {
3267-
color: #000000;
3267+
color: #000;
32683268
}
32693269
.widget_core_org_members a.user_link:hover {
32703270
color: #23527c;
@@ -3427,12 +3427,12 @@ div.average_rating span.average_rating_score {
34273427
background-position: 0 -208px;
34283428
}
34293429
.evo_stars {
3430-
color: #ff9900;
3430+
color: #F90;
34313431
white-space: nowrap;
34323432
}
34333433
.evo_stars .evo_star_empty,
34343434
.evo_stars .evo_star_percent {
3435-
color: #999999;
3435+
color: #999;
34363436
}
34373437
.evo_stars .evo_star_percent {
34383438
position: relative;
@@ -3441,7 +3441,7 @@ div.average_rating span.average_rating_score {
34413441
position: absolute;
34423442
left: 0;
34433443
overflow: hidden;
3444-
color: #ff9900;
3444+
color: #F90;
34453445
}
34463446
*[class^="listnav_distance_"],
34473447
*[class*=" listnav_distance_"] {
@@ -3518,12 +3518,12 @@ td#prev,
35183518
td#next {
35193519
font-weight: bold;
35203520
font-size: 105%;
3521-
padding: .5ex;
3521+
padding: 0.5ex;
35223522
white-space: nowrap;
35233523
}
35243524
td#prev a,
35253525
td#next a {
3526-
padding: .5ex;
3526+
padding: 0.5ex;
35273527
}
35283528
td#prev {
35293529
text-align: left;
@@ -3835,12 +3835,12 @@ table.catselect {
38353835
border: 1px solid #bbb;
38363836
}
38373837
table.catselect th {
3838-
padding: .3ex 1ex;
3838+
padding: 0.3ex 1ex;
38393839
background-color: #ddd;
38403840
border-bottom: 1px solid #bbb;
38413841
}
38423842
table.catselect td {
3843-
padding: .2ex 1ex;
3843+
padding: 0.2ex 1ex;
38443844
}
38453845
table.catselect th,
38463846
table.catselect td {
@@ -4385,13 +4385,13 @@ div.other_profile_pictures img {
43854385
font-weight: bold;
43864386
line-height: 1;
43874387
color: #000;
4388-
opacity: .2;
4388+
opacity: 0.2;
43894389
}
43904390
.close:hover {
43914391
color: #000;
43924392
text-decoration: none;
43934393
cursor: pointer;
4394-
opacity: .5;
4394+
opacity: 0.5;
43954395
}
43964396
button.close {
43974397
-webkit-appearance: none;
@@ -4415,11 +4415,11 @@ pre.codeblock {
44154415
background-color: #F2F1F0;
44164416
border: 1px solid #CCCCCC;
44174417
border-radius: 2px 2px 2px 2px;
4418-
padding: 0 .5ex;
4418+
padding: 0 0.5ex;
44194419
}
44204420
pre.codeblock {
44214421
overflow: auto;
4422-
padding: .5ex 2ex;
4422+
padding: 0.5ex 2ex;
44234423
}
44244424
pre.codeblock code {
44254425
display: block;

‎rsc/build/bootstrap-b2evo_base.bmin.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)