From 16df210ae21f67a01ec8faec507165c0c7bc16b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20M=C3=BCller?= Date: Fri, 24 Jul 2020 10:42:58 +0200 Subject: [PATCH] New icons for COEP & COOP integration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds new icons to the medium sprite sheet. 'mediumicon-frame' 'mediumicon-frame-embedded' 'mediumicon-frame-opened' 'mediumicon-frame-embedded-blocked' 'mediumicon-elements-panel' 'mediumicon-network-panel' 'mediumicon-frame-top' Previously the 'frame' icon only existed in the large iconsprite although it's technically a medium icon. To make frame icons all the same size and thus easier to align, I've added it to the medium iconsprite as well. Before: https://imgur.com/a/u0ePuIF After: https://imgur.com/a/mfNAkna Change-Id: I9d12188a2181cbe34d58932d03b41dbea5bbefc3 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2310450 Commit-Queue: Peter Müller Reviewed-by: Sigurd Schneider --- front_end/Images/mediumIcons.svg | 2 +- front_end/Images/src/mediumIcons.svg | 243 ++++++++++++++++------- front_end/Images/src/optimize_svg.hashes | 10 +- front_end/ui/Icon.js | 7 + 4 files changed, 188 insertions(+), 74 deletions(-) diff --git a/front_end/Images/mediumIcons.svg b/front_end/Images/mediumIcons.svg index 308443b8ec..7c202fd45f 100644 --- a/front_end/Images/mediumIcons.svg +++ b/front_end/Images/mediumIcons.svg @@ -1 +1 @@ -1234abcd5eAB6f \ No newline at end of file +1234abcd5eAB6f \ No newline at end of file diff --git a/front_end/Images/src/mediumIcons.svg b/front_end/Images/src/mediumIcons.svg index 28c804113a..20a0f5129d 100644 --- a/front_end/Images/src/mediumIcons.svg +++ b/front_end/Images/src/mediumIcons.svg @@ -12,7 +12,7 @@ height="96" id="svg4775" version="1.1" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="1.0 (4035a4f, 2020-05-01)" sodipodi:docname="mediumIcons.svg" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -94,17 +94,21 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="2558" - inkscape:window-height="1378" + inkscape:window-width="2480" + inkscape:window-height="1395" id="namedview4913" showgrid="true" - inkscape:zoom="5.2149126" - inkscape:cx="-59.586191" - inkscape:cy="76.536441" - inkscape:window-x="39" - inkscape:window-y="26" + inkscape:zoom="15" + inkscape:cx="77.161373" + inkscape:cy="90.233633" + inkscape:window-x="80" + inkscape:window-y="23" inkscape:window-maximized="0" - inkscape:current-layer="svg4775"> + inkscape:current-layer="g237" + inkscape:document-rotation="0" + showguides="false" + inkscape:snap-grids="true" + inkscape:snap-page="false"> + transform="translate(1.2171069e-6,32)"> @@ -165,7 +169,7 @@ + style="fill-opacity:0.36" /> + style="fill-opacity:0.37" /> + style="fill-opacity:0.36" /> 1 2 3 a c d + transform="translate(32.000002,80)"> @@ -495,7 +499,7 @@ + transform="matrix(0.66666667,0,0,0.66666667,64.000002,32)"> 5 + transform="matrix(0.75,0,0,0.75,63.000002,15)"> + transform="matrix(0.75,0,0,0.75,47.000002,79)"> + transform="translate(48.000002,16)"> A B + transform="matrix(0.32,0,0,0.32,1.2171069e-6,16)"> + transform="matrix(0.66666667,0,0,0.66666667,17.333335,16.666667)"> @@ -809,12 +813,12 @@ id="rect4301" style="fill:#000000" /> 6 + transform="matrix(0.58333333,0,0,0.58333333,1.0000012,1.0000001)"> + transform="matrix(0.71794872,0,0,0.71794872,15.428207,-0.79487184)"> + transform="matrix(0.66666667,0,0,0.66666667,32.000002,0)"> + transform="matrix(0.66666667,0,0,0.66666667,48.000002,0)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/front_end/Images/src/optimize_svg.hashes b/front_end/Images/src/optimize_svg.hashes index ff64b1545e..185d7cad22 100644 --- a/front_end/Images/src/optimize_svg.hashes +++ b/front_end/Images/src/optimize_svg.hashes @@ -1,13 +1,13 @@ { "securityIcons.svg": "27676f7c1f1542659c7c49a8052259dc", - "largeIcons.svg": "7661039eafdefbeb6190069ff8594f8f", + "accelerometer-back.svg": "342973eb940ef43b409b28c2c6b0d520", "checkboxCheckmark.svg": "f039bf85cee42ad5c30ca3bfdce7912a", "errorWave.svg": "e183fa242a22ed4784a92f6becbc2c45", "smallIcons.svg": "73b56bbbefad2a744a3d22ea7c402e62", - "mediumIcons.svg": "a38149c68319d1ac8299ecc601b38eff", - "accelerometer-back.svg": "342973eb940ef43b409b28c2c6b0d520", - "lighthouse_logo.svg": "b889aaf8631e71e3427eb96d3433e319", + "mediumIcons.svg": "26627f34d67f8cf887f5931e161e681f", + "largeIcons.svg": "7661039eafdefbeb6190069ff8594f8f", + "treeoutlineTriangles.svg": "aa6c8f8df9ae7c50f14397131808e764", "chevrons.svg": "79b4b527771e30b6388ce664077b3409", "accelerometer-front.svg": "a4dcdac47131aa923346c15e01bc644a", - "treeoutlineTriangles.svg": "aa6c8f8df9ae7c50f14397131808e764" + "lighthouse_logo.svg": "b889aaf8631e71e3427eb96d3433e319" } \ No newline at end of file diff --git a/front_end/ui/Icon.js b/front_end/ui/Icon.js index ed58b1b427..6ceef9b620 100644 --- a/front_end/ui/Icon.js +++ b/front_end/ui/Icon.js @@ -179,6 +179,13 @@ export const Descriptors = { 'mediumicon-bell': {position: 'b6', spritesheet: 'mediumicons', isMask: true}, 'mediumicon-payment': {position: 'c6', spritesheet: 'mediumicons', isMask: true}, 'mediumicon-schedule': {position: 'd6', spritesheet: 'mediumicons', isMask: true}, + 'mediumicon-frame': {position: 'e6', spritesheet: 'mediumicons', isMask: true}, + 'mediumicon-frame-embedded': {position: 'f6', spritesheet: 'mediumicons', isMask: true}, + 'mediumicon-frame-opened': {position: 'f5', spritesheet: 'mediumicons', isMask: true}, + 'mediumicon-frame-embedded-blocked': {position: 'f4', spritesheet: 'mediumicons', isMask: true}, + 'mediumicon-elements-panel': {position: 'f3', spritesheet: 'mediumicons', isMask: true}, + 'mediumicon-network-panel': {position: 'f2', spritesheet: 'mediumicons', isMask: true}, + 'mediumicon-frame-top': {position: 'f1', spritesheet: 'mediumicons', isMask: true}, 'badge-navigator-file-sync': {position: 'a9', spritesheet: 'largeicons'}, 'largeicon-add': {position: 'a8', spritesheet: 'largeicons', isMask: true},