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.

Sign up for GitHub

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 pngs with svgs now that we've moved to catalyst #1750

Merged
merged 4 commits into from
Oct 24, 2023
Merged

chore: replace all pngs with svgs now that we've moved to catalyst #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f61ee9
Revert "chore: replace all svgs with pngs to fix the ventura mac clie…
sbruens Oct 9, 2023
1756006
Remove more unused icons.
sbruens Oct 9, 2023
82ad7e5
Fix feedback icon.
sbruens Oct 9, 2023
a031107
Merge branch 'master' into sbruens/svgs
daniellacosse Oct 10, 2023
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
Binary file removed src/www/assets/icons/about.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/icons/add.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/icons/back.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/icons/change_language.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/icons/contact.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/icons/feedback.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/icons/help.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/icons/menu.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/icons/outline.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/icons/quit.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/jigsaw-logo.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/www/assets/outline-client-logo.png
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/www/ui_components/about-view.js
View file
Open in desktop
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.png" />
<img id="jigsaw-logo" src$="[[rootPath]]assets/jigsaw-logo.svg" />
</a>
</div>
</div>
Expand Down
104 changes: 42 additions & 62 deletions src/www/ui_components/app-root.js
View file
Open in desktop
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-button {
app-toolbar paper-icon-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-item {
#drawer-nav paper-icon-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-item:focus::before,
#drawer-nav paper-item:focus::after {
#drawer-nav paper-icon-item:focus::before,
#drawer-nav paper-icon-item:focus::after {
color: var(--medium-green);
background-color: var(--light-gray);
}
Expand Down Expand Up @@ -175,21 +175,16 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
border-width: 0px;
}

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

#drawer-nav paper-item:not(.iron-selected) {
#drawer-nav paper-icon-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 @@ -202,23 +197,11 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
}

paper-item > :first-child {
cursor: pointer;
}

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

paper-item > a {
color: inherit;
color: rgba(0, 0, 0, 0.54);
font-size: 14px;
text-decoration: none;
}

paper-button {
min-width: 0;
margin: 0;
width: 100%;
cursor: pointer;
}

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