Skip to content

Commit 3518357

Browse files
committed
kept paths relative and replaced them in prod env
1 parent 400ca90 commit 3518357

File tree

7 files changed

+52
-54
lines changed

7 files changed

+52
-54
lines changed

Gruntfile.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ module.exports = function(grunt) {
241241
'frontend/express/public/javascripts/dom/drop/drop-theme-countly.min.css',
242242
'frontend/express/public/javascripts/utils/tooltipster/tooltipster.bundle.min.css',
243243
'frontend/express/public/stylesheets/bulma/bulma-custom.css',
244-
'frontend/express/public/stylesheets/styles/manifest.css',
244+
'frontend/express/public/stylesheets/styles/manifest2.css',
245245
'frontend/express/public/stylesheets/vue/element-tiptap.css',
246246
]
247247
}
@@ -324,27 +324,25 @@ module.exports = function(grunt) {
324324

325325
grunt.registerTask('default', ['mochaTest']);
326326

327-
grunt.registerTask('replace-paths', 'Replace image paths in dev and prod CSS files', function() {
327+
grunt.registerTask('replace-paths', 'Replace image paths in prod CSS files', function() {
328328
var cssFiles = [
329329
{
330330
filepath: 'frontend/express/public/stylesheets/styles/manifest.css',
331-
replacement: '../../images'
332-
},
333-
{
334-
filepath: 'frontend/express/public/stylesheets/main.min.css',
335-
replacement: '../images'
331+
lookup: '../../images',
332+
replacement: '../images',
333+
newPath: 'frontend/express/public/stylesheets/styles/manifest2.css'
336334
}
337335
];
338336

339337
cssFiles.forEach(function(file) {
340338
var content = grunt.file.read(file.filepath);
341-
var newContent = content.replace(/\/images/g, file.replacement);
342-
grunt.file.write(file.filepath, newContent);
339+
var newContent = content.replace(/\.\.\/\.\.\/images/g, file.replacement);
340+
grunt.file.write(file.newPath, newContent);
343341
grunt.log.writeln('Processed file: ' + file.filepath);
344342
});
345343
});
346344

347-
grunt.registerTask('dist', ['sass', 'concat', 'uglify', 'cssmin', 'replace-paths']);
345+
grunt.registerTask('dist', ['sass', 'concat', 'uglify', 'replace-paths', 'cssmin']);
348346

349347
grunt.registerTask('plugins', 'Minify plugin JS / CSS files and copy images', function() {
350348
var js = [], css = [], img = [], fs = require('fs'), path = require('path');

frontend/express/public/core/events/stylesheets/_main.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
&--image {
9090
width: 242px;
9191
height: 242px;
92-
background-image: url('/images/dashboard/events-overview-noevents.svg');
92+
background-image: url('../../images/dashboard/events-overview-noevents.svg');
9393
}
9494
}
9595
&--text{

frontend/express/public/core/onboarding/stylesheets/_main.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.setup-logo { margin-top: 38px; margin-left: 72px; width:165px; height:50px; background-image:url('/images/pre-login/countly-logo-dark.svg'); background-repeat: no-repeat; background-size: contain;position: fixed; left: 0px; top: 0px; }
1+
.setup-logo { margin-top: 38px; margin-left: 72px; width:165px; height:50px; background-image:url('../../images/pre-login/countly-logo-dark.svg'); background-repeat: no-repeat; background-size: contain;position: fixed; left: 0px; top: 0px; }
22

33
.centered-content {
44
min-height: 100vh;
@@ -63,23 +63,23 @@
6363
}
6464

6565
.setup-radio-icon {
66-
background-image: url('/images/dashboard/onboarding/box.svg');
66+
background-image: url('../../images/dashboard/onboarding/box.svg');
6767
background-position: center;
6868
background-repeat: no-repeat;
6969
width: 100%;
7070
height: 100%;
7171
}
7272

7373
.setup-radio-icon--app-type-mobile {
74-
background-image: url('/images/dashboard/onboarding/app-type-mobile.svg');
74+
background-image: url('../../images/dashboard/onboarding/app-type-mobile.svg');
7575
}
7676

7777
.setup-radio-icon--app-type-web {
78-
background-image: url('/images/dashboard/onboarding/app-type-web.svg');
78+
background-image: url('../../images/dashboard/onboarding/app-type-web.svg');
7979
}
8080

8181
.setup-radio-icon--app-type-desktop {
82-
background-image: url('/images/dashboard/onboarding/app-type-desktop.svg');
82+
background-image: url('../../images/dashboard/onboarding/app-type-desktop.svg');
8383
}
8484

8585
.is-checked .setup-radio-icon {

frontend/express/public/stylesheets/styles/base/_icons.scss

+15-15
Original file line numberDiff line numberDiff line change
@@ -28,54 +28,54 @@
2828

2929
.cly-icon- {
3030
&zoom {
31-
background-image: url("/images/icons/zoom-icon.svg");
31+
background-image: url("../../images/icons/zoom-icon.svg");
3232
}
3333

3434
&arrow-down {
35-
background-image: url("/images/icons/arrow_drop_down.svg");
35+
background-image: url("../../images/icons/arrow_drop_down.svg");
3636
}
3737

3838
&arrow-up {
39-
background-image: url("/images/icons/arrow_drop_up.svg");
39+
background-image: url("../../images/icons/arrow_drop_up.svg");
4040
}
4141

4242
&menu {
43-
background-image: url("/images/icons/menu.svg");
43+
background-image: url("../../images/icons/menu.svg");
4444
}
4545

4646
&date {
47-
background-image: url("/images/icons/date.svg");
47+
background-image: url("../../images/icons/date.svg");
4848
}
4949

5050
&download {
51-
background-image: url("/images/icons/download-icon.svg");
51+
background-image: url("../../images/icons/download-icon.svg");
5252
}
5353

5454
&save {
55-
background-image: url("/images/icons/save.svg");
55+
background-image: url("../../images/icons/save.svg");
5656
}
5757

5858
&load {
59-
background-image: url("/images/icons/load.svg");
59+
background-image: url("../../images/icons/load.svg");
6060
}
6161

6262
&upload {
63-
background-image: url("/images/icons/upload.svg");
63+
background-image: url("../../images/icons/upload.svg");
6464
}
6565

6666
&arrow_forward-circled {
67-
background-image: url("/images/icons/arrow_forward-circled.svg");
67+
background-image: url("../../images/icons/arrow_forward-circled.svg");
6868
}
6969

7070
&copy {
71-
background-image: url("/images/icons/copy.svg");
71+
background-image: url("../../images/icons/copy.svg");
7272
}
7373

7474
&copy_interactive{
75-
background-image: url("/images/icons/copy_inactive.svg");
75+
background-image: url("../../images/icons/copy_inactive.svg");
7676
}
7777
&copy_interactive:hover{
78-
background-image: url("/images/icons/copy.svg");
78+
background-image: url("../../images/icons/copy.svg");
7979
}
8080
}
8181

@@ -94,13 +94,13 @@
9494
.cly-countly-icon-solid {
9595
width: 20px;
9696
height: 20px;
97-
background-image: url("/images/icons/countly-icon-solid.svg");
97+
background-image: url("../../images/icons/countly-icon-solid.svg");
9898
}
9999

100100
.cly-countly-icon-outline {
101101
width: 20px;
102102
height: 20px;
103-
background-image: url("/images/icons/countly-icon-outline.svg");
103+
background-image: url("../../images/icons/countly-icon-outline.svg");
104104
}
105105

106106
.cly-countly-icon-outline-{

frontend/express/public/stylesheets/styles/blocks/_helpers.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
border: 1px solid #E2E4E8;
124124
background-color: #F8FAFD;
125125
border-radius:8px;
126-
background-image: url('/images/icons/empty-background.svg');
126+
background-image: url('../../images/icons/empty-background.svg');
127127
background-position: 100% 100%;
128128
background-repeat: no-repeat;
129129
}

frontend/express/public/stylesheets/styles/blocks/_sidebar.scss

+21-21
Original file line numberDiff line numberDiff line change
@@ -383,103 +383,103 @@ $bg-color: #24292e;
383383
.cly-icon {
384384
&-sidebar{
385385
&-app {
386-
background-image: url("/images/sidebar/default/app.svg");
386+
background-image: url("../../images/sidebar/default/app.svg");
387387
height: 24px;
388388
width: 24px;
389389
}
390390

391391
&-analytics {
392-
background-image: url("/images/sidebar/default/analytics-icon.svg");
392+
background-image: url("../../images/sidebar/default/analytics-icon.svg");
393393
height: 20px;
394394
width: 20px;
395395

396396
&:hover {
397-
background-image: url("/images/sidebar/hover/analytics-icon.svg");
397+
background-image: url("../../images/sidebar/hover/analytics-icon.svg");
398398
}
399399

400400
&.cly-vue-sidebar__menu-option--selected {
401-
background-image: url("/images/sidebar/selected/analytics-icon.svg");
401+
background-image: url("../../images/sidebar/selected/analytics-icon.svg");
402402
}
403403
}
404404

405405
&-dashboards {
406-
background-image: url("/images/sidebar/default/dashboards-icon.svg");
406+
background-image: url("../../images/sidebar/default/dashboards-icon.svg");
407407
height: 20px;
408408
width: 20px;
409409

410410
&:hover {
411-
background-image: url("/images/sidebar/hover/dashboards-icon.svg");
411+
background-image: url("../../images/sidebar/hover/dashboards-icon.svg");
412412
}
413413

414414
&.cly-vue-sidebar__menu-option--selected {
415-
background-image: url("/images/sidebar/selected/dashboards-icon.svg");
415+
background-image: url("../../images/sidebar/selected/dashboards-icon.svg");
416416
}
417417
}
418418

419419
&-divider {
420-
background-image: url("/images/sidebar/default/divider.svg");
420+
background-image: url("../../images/sidebar/default/divider.svg");
421421
width: 32px;
422422
height: 1px;
423423
}
424424

425425
&-management {
426-
background-image: url("/images/sidebar/default/management.svg");
426+
background-image: url("../../images/sidebar/default/management.svg");
427427
height: 20px;
428428
width: 20px;
429429

430430
&:hover {
431-
background-image: url("/images/sidebar/hover/management.svg");
431+
background-image: url("../../images/sidebar/hover/management.svg");
432432
}
433433

434434
&.cly-vue-sidebar__menu-option--selected {
435-
background-image: url("/images/sidebar/selected/management.svg");
435+
background-image: url("../../images/sidebar/selected/management.svg");
436436
}
437437
}
438438

439439
&-report-manager {
440-
background-image: url("/images/sidebar/default/report-manager.svg");
440+
background-image: url("../../images/sidebar/default/report-manager.svg");
441441
height: 18px;
442442
width: 20px;
443443

444444
&:hover {
445-
background-image: url("/images/sidebar/hover/report-manager.svg");
445+
background-image: url("../../images/sidebar/hover/report-manager.svg");
446446
}
447447

448448
&.cly-vue-sidebar__menu-option--selected {
449-
background-image: url("/images/sidebar/selected/report-manager.svg");
449+
background-image: url("../../images/sidebar/selected/report-manager.svg");
450450
}
451451
}
452452

453453
&-help-center {
454-
background-image: url("/images/sidebar/default/help-center.svg");
454+
background-image: url("../../images/sidebar/default/help-center.svg");
455455
height: 25px;
456456
width: 20px;
457457

458458
&:hover {
459-
background-image: url("/images/sidebar/hover/help-center.svg");
459+
background-image: url("../../images/sidebar/hover/help-center.svg");
460460
}
461461

462462
&.cly-vue-sidebar__menu-option--selected {
463-
background-image: url("/images/sidebar/selected/help-center.svg");
463+
background-image: url("../../images/sidebar/selected/help-center.svg");
464464
}
465465
}
466466

467467
&-notifications {
468-
background-image: url("/images/sidebar/default/notifications.svg");
468+
background-image: url("../../images/sidebar/default/notifications.svg");
469469
height: 23px;
470470
width: 20px;
471471

472472
&:hover {
473-
background-image: url("/images/sidebar/hover/notifications.svg");
473+
background-image: url("../../images/sidebar/hover/notifications.svg");
474474
}
475475

476476
&.cly-vue-sidebar__menu-option--selected {
477-
background-image: url("/images/sidebar/selected/notifications.svg");
477+
background-image: url("../../images/sidebar/selected/notifications.svg");
478478
}
479479
}
480480

481481
&-toggle-left {
482-
background-image: url("/images/sidebar/default/toggle-left.svg");
482+
background-image: url("../../images/sidebar/default/toggle-left.svg");
483483
height: 15px;
484484
width: 11px;
485485
}

frontend/express/public/stylesheets/vue/clyvue.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@
367367
display: inline-block;
368368
width: 60px;
369369
height: 60px;
370-
background-image: url("/images/dashboard/graph-no-data.svg");
370+
background-image: url("../../images/dashboard/graph-no-data.svg");
371371
background-size: contain;
372372
margin-right: 20px;
373373
background-repeat: no-repeat;

0 commit comments

Comments
 (0)