Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/icons-sprite #652

Merged
merged 4 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion abstract/SolutionBlock.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { uploaderBlockCtx } from './CTX.js';
import svgIconsSprite from '../blocks/themes/lr-basic/svg-sprite.js';
import { Block } from './Block.js';

export class SolutionBlock extends Block {
Expand All @@ -7,7 +8,7 @@ export class SolutionBlock extends Block {
_template = null;

static set template(value) {
this._template = value + /** HTML */ `<slot></slot>`;
this._template = svgIconsSprite + value + /** HTML */ `<slot></slot>`;
}

static get template() {
Expand Down
2 changes: 1 addition & 1 deletion blocks/CloudImageEditor/src/EditorButtonControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ export class EditorButtonControl extends Block {

EditorButtonControl.template = /* HTML */ `
<div class="before"></div>
<lr-icon size="20" set="@name: icon;"></lr-icon>
<lr-icon set="@name: icon;"></lr-icon>
<div class="title" ref="title-el">{{title}}</div>
`;
2 changes: 1 addition & 1 deletion blocks/CloudImageEditor/src/EditorFilterControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
initCallback() {
super.initCallback();

this.$['on.click'] = (e) => {

Check warning on line 76 in blocks/CloudImageEditor/src/EditorFilterControl.js

View workflow job for this annotation

GitHub Actions / build

'e' is defined but never used
if (!this.$.active) {
this.$['*sliderEl'].setOperation(this._operation, this._filter);
this.$['*sliderEl'].apply();
Expand Down Expand Up @@ -150,5 +150,5 @@
EditorFilterControl.template = /* HTML */ `
<div class="before"></div>
<div class="preview" ref="preview-el"></div>
<lr-icon size="40" ref="icon-el" set="@name: icon; @size: iconSize;"></lr-icon>
<lr-icon ref="icon-el" set="@name: icon; @size: iconSize;"></lr-icon>
`;
30 changes: 30 additions & 0 deletions blocks/CloudImageEditor/src/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ lr-editor-operation-control {
position: relative;
display: grid;
grid-template-columns: var(--l-base-min-width) auto;
grid-template-rows: 100%;
align-items: center;
height: var(--l-base-height);
color: rgba(var(--idle-color-rgb));
Expand All @@ -408,6 +409,18 @@ lr-editor-operation-control {
transition: var(--l-width-transition);
}

:where(lr-editor-button-control, lr-editor-crop-button-control, lr-editor-filter-control, lr-editor-operation-control)
> lr-icon
> svg {
width: 20px;
height: 20px;
}

lr-editor-filter-control > lr-icon.original-icon > svg {
width: 100%;
height: 100%;
}

lr-editor-button-control.active,
lr-editor-operation-control.active,
lr-editor-crop-button-control.active,
Expand Down Expand Up @@ -727,6 +740,23 @@ lr-editor-toolbar > .toolbar-container > .sub-toolbar > .controls-row > .tab-tog
display: none;
}

lr-editor-toolbar > .toolbar-container > .sub-toolbar > .controls-row > .tab-toggles > .tab-toggle > lr-btn-ui {
width: 40px;
}

lr-editor-toolbar
> .toolbar-container
> .sub-toolbar
> .controls-row
> .tab-toggles
> .tab-toggle
> lr-btn-ui
> lr-icon
> svg {
width: 100%;
height: 100%;
}

lr-editor-toolbar > .toolbar-container > .sub-toolbar > .tab-content-row > .tab-content .controls-list_align {
display: grid;
grid-template-areas: '. inner .';
Expand Down
131 changes: 0 additions & 131 deletions blocks/CloudImageEditor/src/css/icons.css
Original file line number Diff line number Diff line change
@@ -1,138 +1,7 @@
/* stylelint-disable string-no-newline */
:host(.lr-cloud-image-editor) lr-icon,
.lr-cloud-image-editor lr-icon {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
}

:host(.lr-cloud-image-editor) lr-icon svg,
.lr-cloud-image-editor lr-icon svg {
width: unset;
height: unset;
}

:host(.lr-cloud-image-editor) lr-icon:not([raw]) path,
.lr-cloud-image-editor lr-icon:not([raw]) path {
stroke-linejoin: round;
fill: none;
stroke: currentColor;
stroke-width: 1.2;
}

:host(.lr-cloud-image-editor),
.lr-cloud-image-editor {
--icon-rotate: 'M13.5.399902L12 1.9999l1.5 1.6M12.0234 2H14.4C16.3882 2 18 3.61178 18 5.6V8M4 17h9c.5523 0 1-.4477 1-1V7c0-.55228-.4477-1-1-1H4c-.55228 0-1 .44771-1 1v9c0 .5523.44771 1 1 1z';
--icon-mirror: 'M5.00042.399902l-1.5 1.599998 1.5 1.6M15.0004.399902l1.5 1.599998-1.5 1.6M3.51995 2H16.477M8.50042 16.7V6.04604c0-.30141-.39466-.41459-.5544-.159L1.28729 16.541c-.12488.1998.01877.459.2544.459h6.65873c.16568 0 .3-.1343.3-.3zm2.99998 0V6.04604c0-.30141.3947-.41459.5544-.159L18.7135 16.541c.1249.1998-.0187.459-.2544.459h-6.6587c-.1657 0-.3-.1343-.3-.3z';
--icon-flip: 'M19.6001 4.99993l-1.6-1.5-1.6 1.5m3.2 9.99997l-1.6 1.5-1.6-1.5M18 3.52337V16.4765M3.3 8.49993h10.654c.3014 0 .4146-.39466.159-.5544L3.459 1.2868C3.25919 1.16192 3 1.30557 3 1.5412v6.65873c0 .16568.13432.3.3.3zm0 2.99997h10.654c.3014 0 .4146.3947.159.5544L3.459 18.7131c-.19981.1248-.459-.0188-.459-.2544v-6.6588c0-.1657.13432-.3.3-.3z';
--icon-sad: 'M2 17c4.41828-4 11.5817-4 16 0M16.5 5c0 .55228-.4477 1-1 1s-1-.44772-1-1 .4477-1 1-1 1 .44772 1 1zm-11 0c0 .55228-.44772 1-1 1s-1-.44772-1-1 .44772-1 1-1 1 .44772 1 1z';
--icon-closeMax: 'M3 3l14 14m0-14L3 17';
--icon-crop: 'M20 14H7.00513C6.45001 14 6 13.55 6 12.9949V0M0 6h13.0667c.5154 0 .9333.41787.9333.93333V20M14.5.399902L13 1.9999l1.5 1.6M13 2h2c1.6569 0 3 1.34315 3 3v2M5.5 19.5999l1.5-1.6-1.5-1.6M7 18H5c-1.65685 0-3-1.3431-3-3v-2';
--icon-tuning: 'M8 10h11M1 10h4M1 4.5h11m3 0h4m-18 11h11m3 0h4M12 4.5a1.5 1.5 0 103 0 1.5 1.5 0 10-3 0M5 10a1.5 1.5 0 103 0 1.5 1.5 0 10-3 0M12 15.5a1.5 1.5 0 103 0 1.5 1.5 0 10-3 0';
--icon-filters: 'M4.5 6.5a5.5 5.5 0 1011 0 5.5 5.5 0 10-11 0m-3.5 6a5.5 5.5 0 1011 0 5.5 5.5 0 10-11 0m7 0a5.5 5.5 0 1011 0 5.5 5.5 0 10-11 0';
--icon-done: 'M1 10.6316l5.68421 5.6842L19 4';
--icon-original: 'M0 40L40-.00000133';
--icon-slider: 'M0 10h11m0 0c0 1.1046.8954 2 2 2s2-.8954 2-2m-4 0c0-1.10457.8954-2 2-2s2 .89543 2 2m0 0h5';

--icon-exposure: 'M10 20v-3M2.92946 2.92897l2.12132 2.12132M0 10h3m-.07054 7.071l2.12132-2.1213M10 0v3m7.0705 14.071l-2.1213-2.1213M20 10h-3m.0705-7.07103l-2.1213 2.12132M5 10a5 5 0 1010 0 5 5 0 10-10 0';
--icon-contrast: 'M2 10a8 8 0 1016 0 8 8 0 10-16 0m8-8v16m8-8h-8m7.5977 2.5H10m6.24 2.5H10m7.6-7.5H10M16.2422 5H10';
--icon-brightness: 'M15 10c0 2.7614-2.2386 5-5 5m5-5c0-2.76142-2.2386-5-5-5m5 5h-5m0 5c-2.76142 0-5-2.2386-5-5 0-2.76142 2.23858-5 5-5m0 10V5m0 15v-3M2.92946 2.92897l2.12132 2.12132M0 10h3m-.07054 7.071l2.12132-2.1213M10 0v3m7.0705 14.071l-2.1213-2.1213M20 10h-3m.0705-7.07103l-2.1213 2.12132M14.3242 7.5H10m4.3242 5H10';
--icon-gamma: 'M17 3C9 6 2.5 11.5 2.5 17.5m0 0h1m-1 0v-1m14 1h1m-3 0h1m-3 0h1m-3 0h1m-3 0h1m-3 0h1m-3 0h1m-3-14v-1m0 3v-1m0 3v-1m0 3v-1m0 3v-1m0 3v-1m0 3v-1';
--icon-enhance: 'M19 13h-2m0 0c-2.2091 0-4-1.7909-4-4m4 4c-2.2091 0-4 1.7909-4 4m0-8V7m0 2c0 2.2091-1.7909 4-4 4m-2 0h2m0 0c2.2091 0 4 1.7909 4 4m0 0v2M8 8.5H6.5m0 0c-1.10457 0-2-.89543-2-2m2 2c-1.10457 0-2 .89543-2 2m0-4V5m0 1.5c0 1.10457-.89543 2-2 2M1 8.5h1.5m0 0c1.10457 0 2 .89543 2 2m0 0V12M12 3h-1m0 0c-.5523 0-1-.44772-1-1m1 1c-.5523 0-1 .44772-1 1m0-2V1m0 1c0 .55228-.44772 1-1 1M8 3h1m0 0c.55228 0 1 .44772 1 1m0 0v1';
--icon-saturation: '\
<circle cx="10.0006" cy="10.0001" r="9" transform="rotate(90 10.0006 10.0001)" fill="url(#paint0_linear)"/> \
<defs> \
<linearGradient id="paint0_linear" x1="10.0006" y1="1.00009" x2="10.0006" y2="19.0001" gradientUnits="userSpaceOnUse"> \
<stop stop-color="#DE15FF"/> \
<stop offset=".203125" stop-color="#0029FF"/> \
<stop offset=".479167" stop-color="#2AE4F0"/> \
<stop offset=".604167" stop-color="#15EF11"/> \
<stop offset=".75" stop-color="#FAE528"/> \
<stop offset="1" stop-color="#EB2A2A"/> \
</linearGradient> \
</defs>\
';
--icon-warmth: '\
<path d="M7.5 13.0505l.42854.4199.17146-.1749v-.245h-.6zm5 0h-.6v.245l.1715.1749.4285-.4199zM8.1 3.5c0-1.04934.85066-1.9 1.9-1.9V.4C8.28792.4 6.9 1.78792 6.9 3.5h1.2zm0 9.5505V3.5H6.9v9.5505h1.2zM7.1 15.5c0-.7904.31539-1.5059.82854-2.0296l-.85708-.8398C6.34742 13.3694 5.9 14.3831 5.9 15.5h1.2zm2.9 2.9c-1.60163 0-2.9-1.2984-2.9-2.9H5.9c0 2.2644 1.83563 4.1 4.1 4.1v-1.2zm2.9-2.9c0 1.6016-1.2984 2.9-2.9 2.9v1.2c2.2644 0 4.1-1.8356 4.1-4.1h-1.2zm-.8285-2.0296c.5131.5237.8285 1.2392.8285 2.0296h1.2c0-1.1169-.4474-2.1306-1.1715-2.8694l-.857.8398zM11.9 3.5v9.5505h1.2V3.5h-1.2zM10 1.6c1.0493 0 1.9.85066 1.9 1.9h1.2c0-1.71208-1.3879-3.1-3.1-3.1v1.2z" fill="currentColor"/>\
<path d="M10 14V8" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/>\
<path d="M14 3h3m-3 3h3m-3 3h3m-8 6.5a1 1 0 102 0 1 1 0 10-2 0" stroke="currentColor" stroke-width="1.2"/>\
';
--icon-vibrance: '\
<path d="M2.125 5.6407c-.71643 1.29152-1.12439 2.77782-1.12439 4.3594 0 1.5816.40796 3.0679 1.12439 4.3594V5.6407z" fill="url(#paint0_linear)"/>\
<path d="M2.875 15.4986V4.5016c.50222-.64987 1.09136-1.22915 1.75-1.72041V17.219c-.65864-.4912-1.24778-1.0705-1.75-1.7204z" fill="url(#paint1_linear)"/>\
<path d="M5.375 17.722c.54811.3291 1.13415.6014 1.75.8089V1.46929c-.61585.20751-1.20189.47984-1.75.80888V17.722z" fill="url(#paint2_linear)"/>\
<path d="M7.875 1.25258V18.7476c.56442.1367 1.14962.2202 1.75.2448V1.0078c-.60038.02465-1.18558.10811-1.75.24478z" fill="url(#paint3_linear)"/>\
<path d="M10.375 1.00775V18.9925c.6004-.0246 1.1856-.108 1.75-.2446V1.25228c-.5644-.13658-1.1496-.21996-1.75-.24453z" fill="url(#paint4_linear)"/>\
<path d="M12.875 1.46887V18.5313c.6158-.2074 1.2019-.4796 1.75-.8085V2.27744c-.5481-.32893-1.1342-.60115-1.75-.80857z" fill="url(#paint5_linear)"/>\
<path d="M15.375 2.78028V17.2199c.6586-.491 1.2477-1.0701 1.75-1.7197V4.50002c-.5023-.64963-1.0914-1.22868-1.75-1.71974z" fill="url(#paint6_linear)"/>\
<path d="M17.875 5.6385v8.7232c.7172-1.292 1.1256-2.7791 1.1256-4.3616 0-1.58248-.4084-3.06956-1.1256-4.3616z" fill="url(#paint7_linear)"/>\
<defs>\
<linearGradient id="paint0_linear" x1="19.0006" y1="10.0001" x2="1.00061" y2="10.0001" gradientUnits="userSpaceOnUse">\
<stop stop-color="#DE15FF"/>\
<stop offset=".203125" stop-color="#0029FF"/>\
<stop offset=".479167" stop-color="#2AE4F0"/>\
<stop offset=".604167" stop-color="#15EF11"/>\
<stop offset=".75" stop-color="#FAE528"/>\
<stop offset="1" stop-color="#EB2A2A"/>\
</linearGradient>\
<linearGradient id="paint1_linear" x1="19.0006" y1="10.0001" x2="1.00061" y2="10.0001" gradientUnits="userSpaceOnUse">\
<stop stop-color="#DE15FF"/>\
<stop offset=".203125" stop-color="#0029FF"/>\
<stop offset=".479167" stop-color="#2AE4F0"/>\
<stop offset=".604167" stop-color="#15EF11"/>\
<stop offset=".75" stop-color="#FAE528"/>\
<stop offset="1" stop-color="#EB2A2A"/>\
</linearGradient>\
<linearGradient id="paint2_linear" x1="19.0006" y1="10.0001" x2="1.00061" y2="10.0001" gradientUnits="userSpaceOnUse">\
<stop stop-color="#DE15FF"/>\
<stop offset=".203125" stop-color="#0029FF"/>\
<stop offset=".479167" stop-color="#2AE4F0"/>\
<stop offset=".604167" stop-color="#15EF11"/>\
<stop offset=".75" stop-color="#FAE528"/>\
<stop offset="1" stop-color="#EB2A2A"/>\
</linearGradient>\
<linearGradient id="paint3_linear" x1="19.0006" y1="10.0001" x2="1.00061" y2="10.0001" gradientUnits="userSpaceOnUse">\
<stop stop-color="#DE15FF"/>\
<stop offset=".203125" stop-color="#0029FF"/>\
<stop offset=".479167" stop-color="#2AE4F0"/>\
<stop offset=".604167" stop-color="#15EF11"/>\
<stop offset=".75" stop-color="#FAE528"/>\
<stop offset="1" stop-color="#EB2A2A"/>\
</linearGradient>\
<linearGradient id="paint4_linear" x1="19.0006" y1="10.0001" x2="1.00061" y2="10.0001" gradientUnits="userSpaceOnUse">\
<stop stop-color="#DE15FF"/>\
<stop offset=".203125" stop-color="#0029FF"/>\
<stop offset=".479167" stop-color="#2AE4F0"/>\
<stop offset=".604167" stop-color="#15EF11"/>\
<stop offset=".75" stop-color="#FAE528"/>\
<stop offset="1" stop-color="#EB2A2A"/>\
</linearGradient>\
<linearGradient id="paint5_linear" x1="19.0006" y1="10.0001" x2="1.00061" y2="10.0001" gradientUnits="userSpaceOnUse">\
<stop stop-color="#DE15FF"/>\
<stop offset=".203125" stop-color="#0029FF"/>\
<stop offset=".479167" stop-color="#2AE4F0"/>\
<stop offset=".604167" stop-color="#15EF11"/>\
<stop offset=".75" stop-color="#FAE528"/>\
<stop offset="1" stop-color="#EB2A2A"/>\
</linearGradient>\
<linearGradient id="paint6_linear" x1="19.0006" y1="10.0001" x2="1.00061" y2="10.0001" gradientUnits="userSpaceOnUse">\
<stop stop-color="#DE15FF"/>\
<stop offset=".203125" stop-color="#0029FF"/>\
<stop offset=".479167" stop-color="#2AE4F0"/>\
<stop offset=".604167" stop-color="#15EF11"/>\
<stop offset=".75" stop-color="#FAE528"/>\
<stop offset="1" stop-color="#EB2A2A"/>\
</linearGradient>\
<linearGradient id="paint7_linear" x1="19.0006" y1="10.0001" x2="1.00061" y2="10.0001" gradientUnits="userSpaceOnUse">\
<stop stop-color="#DE15FF"/>\
<stop offset=".203125" stop-color="#0029FF"/>\
<stop offset=".479167" stop-color="#2AE4F0"/>\
<stop offset=".604167" stop-color="#15EF11"/>\
<stop offset=".75" stop-color="#FAE528"/>\
<stop offset="1" stop-color="#EB2A2A"/>\
</linearGradient>\
</defs>\
';
}
2 changes: 1 addition & 1 deletion blocks/CloudImageEditor/src/css/index.css
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import url('icons.css');
@import url('common.css');
@import url('icons.css');
2 changes: 1 addition & 1 deletion blocks/CloudImageEditor/src/elements/button/LrBtnUi.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
}
});

this.sub('text', (txt) => {

Check warning on line 53 in blocks/CloudImageEditor/src/elements/button/LrBtnUi.js

View workflow job for this annotation

GitHub Actions / build

'txt' is defined but never used
this._iconSingle = false;
});

Expand All @@ -76,6 +76,6 @@
LrBtnUi.bindAttributes({ text: 'text', icon: 'icon', reverse: 'reverse', theme: 'theme' });

LrBtnUi.template = /* HTML */ `
<lr-icon size="20" set="className: iconCss; @name: icon;"></lr-icon>
<lr-icon set="className: iconCss; @name: icon; @hidden: !icon"></lr-icon>
<div class="text">{{text}}</div>
`;
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/brightness.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/closeMax.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/contrast.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/crop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/done.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/enhance.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/exposure.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/filters.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/flip.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/gamma.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/mirror.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/original.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/rotate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/sad.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions blocks/CloudImageEditor/src/icons/saturation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions blocks/CloudImageEditor/src/icons/slider.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading