From d5a1528b1cd62823bce2053eea0ec5813dd63d94 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Mon, 16 Oct 2023 06:21:57 +0300 Subject: [PATCH] [start page] connection svg sprites --- .gitignore | 2 +- common/loginpage/build/sprites/sprites.js | 38 ++++++++++++--------- common/loginpage/res/img/connect1-light.svg | 2 +- common/loginpage/res/img/connect2-light.svg | 2 +- common/loginpage/res/img/connect3-light.svg | 2 +- common/loginpage/src/index.html | 10 ++---- common/loginpage/src/index.html.deploy | 10 ++---- 7 files changed, 30 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index d9cbde007..39b0dfe4d 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ win-linux/package/linux/tar /common/loginpage/res/img/allconnect.svg /common/loginpage/res/img/allwelcome.svg -/common/loginpage/res/img/format.svg +/common/loginpage/res/img/formats.svg /common/loginpage/res/img/common.svg common/loginpage/build/plugins/* diff --git a/common/loginpage/build/sprites/sprites.js b/common/loginpage/build/sprites/sprites.js index de5e618b9..9ec69482f 100644 --- a/common/loginpage/build/sprites/sprites.js +++ b/common/loginpage/build/sprites/sprites.js @@ -6,26 +6,18 @@ module.exports = (grunt, rootpathprefix) => { options: { svg: { rootAttributes: { - //xmlns:'http://www.w3.org/2000/svg', + xmlns:'http://www.w3.org/2000/svg', + fill: 'none', }, }, shape: { id: { separator: "" }, - transform: [{ - svgo: { - plugins: [ - 'removeXMLNS', - { - name: "removeAttrs", - params: { - attrs: "(fill|stroke)" - } - }, - ] - }, - }] + transform: [], + dimension: { + attributes: true + } }, mode: { symbol: { @@ -43,7 +35,7 @@ module.exports = (grunt, rootpathprefix) => { sprite: `allconnect.svg`, }, }, - } + }, }, allwelcome: { src: [`${_path}res/img/welcome*.svg`], @@ -84,9 +76,23 @@ module.exports = (grunt, rootpathprefix) => { }, } }, + }, + replace_allconnect:{ + dist: { + files:[ { + src: [`${_path}res/img/allconnect.svg`], + dest: `${_path}res/img/`, + }], + options: { + replacements: [{ + pattern: ' fill="#fff"', + replacement: ' fill="white"', + }] + } + } } }); grunt.loadNpmTasks('grunt-svg-sprite'); - grunt.registerTask('generate-sprite', ['svg_sprite']); + grunt.registerTask('generate-sprite', ['svg_sprite', 'replace_allconnect']); } \ No newline at end of file diff --git a/common/loginpage/res/img/connect1-light.svg b/common/loginpage/res/img/connect1-light.svg index 4feda33ee..ca9f4ac30 100644 --- a/common/loginpage/res/img/connect1-light.svg +++ b/common/loginpage/res/img/connect1-light.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/common/loginpage/res/img/connect2-light.svg b/common/loginpage/res/img/connect2-light.svg index b44a274c7..709312859 100644 --- a/common/loginpage/res/img/connect2-light.svg +++ b/common/loginpage/res/img/connect2-light.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/common/loginpage/res/img/connect3-light.svg b/common/loginpage/res/img/connect3-light.svg index 2ad0df907..06d32d3fc 100644 --- a/common/loginpage/res/img/connect3-light.svg +++ b/common/loginpage/res/img/connect3-light.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/common/loginpage/src/index.html b/common/loginpage/src/index.html index a9a4735f2..cfa98adf8 100644 --- a/common/loginpage/src/index.html +++ b/common/loginpage/src/index.html @@ -125,14 +125,8 @@ - - - - - - - - + +