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

chore: replace all svgs with pngs #1779

Merged
merged 2 commits into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
882 changes: 469 additions & 413 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"karma-webpack": "^5.0.0",
"minimist": "^1.2.6",
"node-fetch": "^3.3.0",
"node-gyp": "^9.4.0",
"node-gyp": "^10.0.1",
"outline-i18n": "Jigsaw-Code/outline-i18n#v0.0.7",
"postcss": "^7.0.39",
"postcss-rtl": "^1.7.3",
Expand Down
Binary file added src/www/assets/icons/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/icons/add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/icons/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/icons/change_language.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/icons/contact.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/icons/feedback.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/icons/help.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/icons/menu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/icons/outline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/icons/quit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/jigsaw-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/www/assets/outline-client-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/www/ui_components/about-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Polymer({
></div>
<div id="footer">
<a href="https://jigsaw.google.com">
<img id="jigsaw-logo" src$="[[rootPath]]assets/jigsaw-logo.svg" />
<img id="jigsaw-logo" src$="[[rootPath]]assets/jigsaw-logo.png" />
</a>
</div>
</div>
Expand Down
104 changes: 62 additions & 42 deletions src/www/ui_components/app-root.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
margin-top: 2px;
}

app-toolbar paper-icon-button {
app-toolbar paper-button {
/* make the ink color (used for tap animations) actually visible */
--paper-icon-button-ink-color: #eff;
padding: var(--app-toolbar-button-gutter);
Expand Down Expand Up @@ -133,7 +133,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
}

/* rtl:begin:ignore */
#drawer-nav paper-icon-item {
#drawer-nav paper-item {
cursor: pointer;
font-size: 16px;
--paper-item-selected: {
Expand All @@ -143,8 +143,8 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
}
}

#drawer-nav paper-icon-item:focus::before,
#drawer-nav paper-icon-item:focus::after {
#drawer-nav paper-item:focus::before,
#drawer-nav paper-item:focus::after {
color: var(--medium-green);
background-color: var(--light-gray);
}
Expand Down Expand Up @@ -175,16 +175,21 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
border-width: 0px;
}

#drawer-nav paper-icon-item .item-label {
#drawer-nav paper-item .item-label {
float: left;
}

#drawer-nav paper-icon-item:not(.iron-selected) {
#drawer-nav paper-item:not(.iron-selected) {
opacity: 0.8;
}

#drawer-nav paper-item {
min-height: 32px;
text-transform: capitalize;
}

.first-menu-item {
margin-top: 12px;
}

.last-menu-item {
Expand All @@ -197,13 +202,25 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
}

paper-item > :first-child {
color: rgba(0, 0, 0, 0.54);
font-size: 14px;
text-decoration: none;
width: 100%;
cursor: pointer;
}

paper-item > img {
height: 24px;
width: 24px;
margin-right: 10px;
}

paper-item > a {
color: inherit;
text-decoration: none;
}

paper-button {
min-width: 0;
margin: 0;
}

paper-toast {
--paper-toast-background-color: var(--dark-green);
align-items: center;
Expand All @@ -223,7 +240,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
:host {
--app-drawer-width: 250px;
}
#drawer-nav paper-icon-item {
#drawer-nav paper-item {
min-height: 42px;
}
}
Expand All @@ -250,30 +267,33 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
<app-header slot="header" fixed="">
<app-toolbar>
<div id="app-toolbar-left">
<paper-icon-button
<paper-button
id="menuBtn"
hidden$="[[shouldShowBackButton]]"
icon="menu"
on-tap="openDrawer"
></paper-icon-button>
<paper-icon-button
>
<img src$="[[rootPath]]assets/icons/menu.png" alt="menu" />
</paper-button>
<paper-button
id="backBtn"
hidden$="[[!shouldShowBackButton]]"
icon="arrow-back"
on-tap="_goBack"
></paper-icon-button>
>
<img src$="[[rootPath]]assets/icons/back.png" alt="back" />
</paper-button>
</div>
<div main-title="" class$="[[page]]">
<img src$="[[rootPath]]assets/outline-client-logo.svg" hidden$="[[!shouldShowAppLogo]]" />
<img src$="[[rootPath]]assets/outline-client-logo.png" hidden$="[[!shouldShowAppLogo]]" />
<div hidden$="[[shouldShowAppLogo]]">[[localize(pageTitleKey)]]</div>
</div>
<div id="app-toolbar-right">
<paper-icon-button
<paper-button
id="addBtn"
icon="add"
on-tap="promptAddServer"
hidden$="[[!shouldShowAddButton]]"
></paper-icon-button>
>
<img src$="[[rootPath]]assets/icons/add.png" alt="add" />
</paper-button>
</div>
</app-toolbar>
</app-header>
Expand Down Expand Up @@ -361,39 +381,39 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
</div>
<hr class="nav-hr" />
<paper-listbox id="drawer-nav" selected="{{routeData.page}}" attr-for-selected="name" on-tap="closeDrawer">
<paper-icon-item name="servers">
<iron-icon icon="outline-icons:outline" slot="item-icon"></iron-icon>
<paper-item name="servers" class="first-menu-item">
<img src$="[[rootPath]]assets/icons/outline.png" alt="outline" />
<span class="item-label">[[localize('servers-menu-item')]]</span>
</paper-icon-item>
</paper-item>
<template is="dom-if" if="{{contactViewFeatureFlag}}">
<paper-icon-item name="contact">
<iron-icon id="feedback-icon" icon="feedback" slot="item-icon"></iron-icon>
<paper-item name="contact">
<img src$="[[rootPath]]assets/icons/contact.png" alt="contact" />
[[localize('contact-page-title')]]
</paper-icon-item>
</paper-item>
</template>
<template is="dom-if" if="{{!contactViewFeatureFlag}}">
<paper-icon-item name="feedback">
<iron-icon id="feedback-icon" icon="feedback" slot="item-icon"></iron-icon>
<paper-item name="feedback">
<img src$="[[rootPath]]assets/icons/feedback.png" alt="feedback" />
[[localize('feedback-page-title')]]
</paper-icon-item>
</paper-item>
</template>
<paper-icon-item name="about">
<iron-icon icon="info" slot="item-icon"></iron-icon>
<paper-item name="about">
<img src$="[[rootPath]]assets/icons/about.png" alt="about" />
[[localize('about-page-title')]]
</paper-icon-item>
<paper-icon-item name="help">
</paper-item>
<paper-item name="help">
<a href="https://support.getoutline.org" id="helpAnchor" hidden=""></a>
<iron-icon icon="help" slot="item-icon"></iron-icon>
<img src$="[[rootPath]]assets/icons/help.png" alt="help" />
[[localize('help-page-title')]]
</paper-icon-item>
<paper-icon-item name="language" class$="[[_computeIsLastVisibleMenuItem(shouldShowQuitButton)]]">
<iron-icon icon="language" slot="item-icon"></iron-icon>
</paper-item>
<paper-item name="language" class$="[[_computeIsLastVisibleMenuItem(shouldShowQuitButton)]]">
<img src$="[[rootPath]]assets/icons/change_language.png" alt="change language" />
[[localize('change-language-page-title')]]
</paper-icon-item>
<paper-icon-item name="quit" class="last-menu-item" hidden$="[[!shouldShowQuitButton]]">
<iron-icon icon="cancel" slot="item-icon"></iron-icon>
</paper-item>
<paper-item name="quit" class="last-menu-item" hidden$="[[!shouldShowQuitButton]]">
<img src$="[[rootPath]]assets/icons/quit.png" alt="quit" />
[[localize('quit')]]
</paper-icon-item>
</paper-item>
<paper-item class="border-top">
<a href="https://www.google.com/policies/privacy/">[[localize('privacy')]]</a>
</paper-item>
Expand Down
Loading