Skip to content

Commit

Permalink
Merge branch 'main' into floating-btns-box-shadow
Browse files Browse the repository at this point in the history
  • Loading branch information
jakearchibald authored Nov 4, 2021
2 parents 7363c82 + 97a7666 commit 1f32622
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 14 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ jobs:
- name: Install npm dependencies
run: npm ci

- name: Test
run: npm test
- name: Lint
run: npm run lint

- name: Build
run: npm run build

- name: Upload build files
uses: actions/upload-artifact@v2
Expand Down
6 changes: 2 additions & 4 deletions src/css/_main-layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,17 @@
}

.output-switcher {
filter: contrast(0) brightness(150%) saturate(100%);
opacity: 0;

&.transition {
transition: filter 0.5s ease-out 0.5s, opacity 0.5s ease-out 0.5s;
transition: opacity 0.5s ease-out 0.5s;

@media (min-width: 640px) and (max-width: 900px) {
transition: filter 0.5s ease-out 0.6s, opacity 0.5s ease-out 0.6s;
transition: opacity 0.5s ease-out 0.6s;
}
}

&.active {
opacity: 1;
filter: none;
}
}
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ <h1>SVGOMG</h1>
</div>
<div class="toolbar">
<div class="menu-toolbar-item">
<button class="unbutton menu-btn" type="button">
<button class="unbutton menu-btn" type="button" title="Menu">
{% include "partials/icons/menu.svg" %}
</button>
</div>
Expand Down
3 changes: 1 addition & 2 deletions src/js/page/ui/bg-fill-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ export default class BgFillButton extends FloatingActionButton {
title,
iconSvg:
// prettier-ignore
'<svg class="icon" viewBox="0 0 24 24">' +
`<title>${title}</title>` +
'<svg aria-hidden="true" class="icon" viewBox="0 0 24 24">' +
'<path d="M21.143 9.667c-.733-1.392-1.914-3.05-3.617-4.753C14.549 1.936 12.048 1 10.741 1c-.414 0-.708.094-.86.246L8.52 2.606c-1.899-.236-3.42.106-4.294.983-.876.875-1.164 2.159-.792 3.523.492 1.806 2.305 4.049 5.905 5.375.038.323.157.638.405.885.588.588 1.535.586 2.121 0s.588-1.533.002-2.119a1.5 1.5 0 0 0-2.123-.001l-.17.256c-2.031-.765-3.395-1.828-4.232-2.9l3.879-3.875c.496 2.73 6.432 8.676 9.178 9.178l-7.115 7.107c-.234.153-2.798-.316-6.156-3.675-3.393-3.393-3.175-5.271-3.027-5.498L3.96 9.989C3.521 9.63 3.035 8.886 2.819 8.3L.685 10.431C.24 10.877 0 11.495 0 12.251c0 1.634 1.121 3.915 3.713 6.506C6.477 21.521 9.293 23 11.145 23c.648 0 1.18-.195 1.547-.562l8.086-8.078c.91.874-.778 3.538-.778 4.648a2 2 0 0 0 4-.001c0-3.184-1.425-6.81-2.857-9.34zM4.934 4.296c.527-.53 1.471-.791 2.656-.761L4.381 6.741c-.236-.978-.049-1.845.553-2.445zm9.292 4.079-.03-.029C12.904 7.054 10.393 3.99 11.1 3.283c.715-.715 3.488 1.521 5.062 3.096.862.862 2.088 2.247 2.937 3.458-1.717-1.074-3.491-1.469-4.873-1.462z"/>' +
'</svg>',
});
Expand Down
3 changes: 1 addition & 2 deletions src/js/page/ui/copy-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ export default class CopyButton extends FloatingActionButton {
title,
iconSvg:
// prettier-ignore
'<svg class="icon" viewBox="0 0 24 24">' +
`<title>${title}</title>` +
'<svg aria-hidden="true" class="icon" viewBox="0 0 24 24">' +
'<path d="M16 1H4C3 1 2 2 2 3v14h2V3h12V1zm3 4H8C7 5 6 6 6 7v14c0 1 1 2 2 2h11c1 0 2-1 2-2V7c0-1-1-2-2-2zm0 16H8V7h11v14z"/>' +
'</svg>',
});
Expand Down
3 changes: 1 addition & 2 deletions src/js/page/ui/download-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ export default class DownloadButton extends FloatingActionButton {
href: './',
iconSvg:
// prettier-ignore
'<svg class="icon" viewBox="0 0 24 24">' +
`<title>${title}</title>` +
'<svg aria-hidden="true" class="icon" viewBox="0 0 24 24">' +
'<path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"/>' +
'</svg>',
major: true,
Expand Down
2 changes: 1 addition & 1 deletion src/partials/icons/menu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1f32622

Please sign in to comment.