Skip to content

Move icons to single folder #144

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

Open
TowelBin wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Move icons to single folder #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e50d939
Move icons to single folder
Aug 19, 2019
44d4fe6
remove ../icons/ from icons.css
TowelBin Aug 24, 2019
c53e3ff
fix url in icons.css
TowelBin Aug 24, 2019
42bde35
remove extra new line in icons.css
TowelBin Aug 24, 2019
95e737a
Remove extra navbar.css
TowelBin Aug 24, 2019
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
4 changes: 2 additions & 2 deletions chrome/global/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
fill-opacity: 0 !important;

background-image:
url(circle.svg),
url(circle.svg) !important;
url(../icons/circle.svg),
url(../icons/circle.svg) !important;
background-size: 25% !important;
background-repeat: no-repeat !important;
background-position: center !important;
Expand Down
0 chrome/popup/checkmark-18dp.svg → chrome/icons/checkmark-18dp.svg
View file
Open in desktop
File renamed without changes
0 chrome/global/circle.svg → chrome/icons/circle.svg
View file
Open in desktop
File renamed without changes
0 chrome/tabbar/close-tab.svg → chrome/icons/close-tab.svg
View file
Open in desktop
File renamed without changes
0 chrome/navbar/connection-1x.svg → chrome/icons/connection-1x.svg
View file
Open in desktop
File renamed without changes
0 chrome/navbar/connection-2x.svg → chrome/icons/connection-2x.svg
View file
Open in desktop
File renamed without changes
0 chrome/navbar/connection-warning-1x.svg → chrome/icons/connection-warning-1x.svg
View file
Open in desktop
File renamed without changes
0 chrome/navbar/connection-warning-2x.svg → chrome/icons/connection-warning-2x.svg
View file
Open in desktop
File renamed without changes
0 chrome/navbar/go.svg → chrome/icons/go.svg
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion chrome/icons/icons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,4 +297,4 @@
{
list-style-image: url(library-2x.svg) !important;
}
}
}
0 chrome/navbar/identity-icons-brand.svg → chrome/icons/identity-icons-brand.svg
View file
Open in desktop
File renamed without changes
0 chrome/navbar/info-1x.svg → chrome/icons/info-1x.svg
View file
Open in desktop
File renamed without changes
0 chrome/navbar/info-2x.svg → chrome/icons/info-2x.svg
View file
Open in desktop
File renamed without changes
0 chrome/popup/menu-right-1x.svg → chrome/icons/menu-right-1x.svg
View file
Open in desktop
File renamed without changes
0 chrome/popup/menu-right-2x.svg → chrome/icons/menu-right-2x.svg
View file
Open in desktop
File renamed without changes
0 chrome/navbar/naughty-shield-1x.svg → chrome/icons/naughty-shield-1x.svg
View file
Open in desktop
File renamed without changes
0 chrome/navbar/naughty-shield-2x.svg → chrome/icons/naughty-shield-2x.svg
View file
Open in desktop
File renamed without changes
0 chrome/tabbar/spinner-busy.svg → chrome/icons/spinner-busy.svg
View file
Open in desktop
File renamed without changes
0 chrome/tabbar/spinner-progress.svg → chrome/icons/spinner-progress.svg
View file
Open in desktop
File renamed without changes
20 changes: 10 additions & 10 deletions chrome/navbar/navbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,23 +398,23 @@
/* icons */
#urlbar[pageproxystate=valid] > #identity-icon
{
list-style-image: url(info-1x.svg) !important;
list-style-image: url(../icons/info-1x.svg) !important;
}

#urlbar[pageproxystate=valid] > #identity-box:-moz-any(.verifiedDomain, .verifiedIdentity) > #identity-icon
{
list-style-image: url(connection-1x.svg) !important;
list-style-image: url(../icons/connection-1x.svg) !important;
}

#urlbar[pageproxystate=valid] > #identity-box.chromeUI > #identity-icon
{
list-style-image: url(identity-icons-brand.svg) !important;
list-style-image: url(../icons/identity-icons-brand.svg) !important;
}

/* no longer used as a connection icon */
#connection-icon
{
list-style-image: url(naughty-shield-1x.svg) !important;
list-style-image: url(../icons/naughty-shield-1x.svg) !important;
}

#urlbar[pageproxystate=valid] > #identity-box:-moz-any(
Expand All @@ -424,13 +424,13 @@
.insecureLoginForms
) > #identity-icon
{
list-style-image: url(connection-warning-1x.svg) !important;
list-style-image: url(../icons/connection-warning-1x.svg) !important;
}

.urlbar-go-button,
.search-go-button
{
list-style-image: url(go.svg) !important;
list-style-image: url(../icons/go.svg) !important;
}

/* high DPI adjustments */
Expand All @@ -443,13 +443,13 @@

#urlbar[pageproxystate=valid] > #identity-box:-moz-any(.unknownIdentity, .notSecure) > #identity-icon
{
list-style-image: url(info-2x.svg) !important;
list-style-image: url(../icons/info-2x.svg) !important;
transform: translate(.5px, .5px) !important;
}

#urlbar[pageproxystate=valid] > #identity-box:-moz-any(.verifiedDomain, .verifiedIdentity) > #identity-icon
{
list-style-image: url(connection-2x.svg) !important;
list-style-image: url(../icons/connection-2x.svg) !important;
}

#urlbar[pageproxystate=valid] > #identity-box:-moz-any(
Expand All @@ -459,12 +459,12 @@
.insecureLoginForms
) > #identity-icon
{
list-style-image: url(connection-warning-2x.svg) !important;
list-style-image: url(../icons/connection-warning-2x.svg) !important;
}

#connection-icon
{
list-style-image: url(naughty-shield-2x.svg) !important;
list-style-image: url(../icons/naughty-shield-2x.svg) !important;
}

#identity-icon-labels,
Expand Down
12 changes: 6 additions & 6 deletions chrome/popup/popup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ menupopup .scrollbutton-down
-moz-appearance: none !important;
-moz-context-properties: fill !important;
fill: currentColor !important;
list-style-image: url(menu-right-2x.svg) !important;
list-style-image: url(../icons/menu-right-2x.svg) !important;
margin-inline-end: 0 !important;
margin-inline-start: 16px !important;
}
Expand All @@ -147,7 +147,7 @@ menuitem[type="radio"] > .menu-iconic-left > .menu-iconic-icon
menuitem[checked="true"] > .menu-iconic-left > .menu-iconic-icon
{
/* checkmark is 18px, not 16px, hence reduced padding */
list-style-image: url(checkmark-18dp.svg) !important;
list-style-image: url(../icons/checkmark-18dp.svg) !important;
}

#context-navigation
Expand Down Expand Up @@ -350,7 +350,7 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label
.PanelUI-subView .subviewbutton-nav::after
{
transform: none !important;
content: url(menu-right-1x.svg) !important;
content: url(../icons/menu-right-1x.svg) !important;
fill-opacity: 1 !important;
}

Expand Down Expand Up @@ -519,7 +519,7 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label
.identity-popup-content-blocking-category::after
{
transform: translateY(1px) !important;
content: url(menu-right-1x.svg) !important;
content: url(../icons/menu-right-1x.svg) !important;
margin: 0 !important;
}

Expand Down Expand Up @@ -776,7 +776,7 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label
.customization-lwtheme-menu-theme[active]::after,
.customization-uidensity-menuitem[active]::after
{
content: url(checkmark-18dp.svg) !important;
content: url(../icons/checkmark-18dp.svg) !important;
-moz-context-properties: fill, fill-opacity !important;
fill: currentColor !important;
display: -moz-box !important;
Expand Down Expand Up @@ -876,6 +876,6 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label
.PanelUI-subView .subviewbutton-nav::after,
.identity-popup-content-blocking-category::after
{
content: url(menu-right-2x.svg) !important;
content: url(../icons/menu-right-2x.svg) !important;
}
}
6 changes: 3 additions & 3 deletions chrome/tabbar/tabbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@

.tab-close-button
{
list-style-image: url(close-tab.svg) !important;
list-style-image: url(../icons/close-tab.svg) !important;
width: 16px !important;
height: 16px !important;
margin: 0 !important;
Expand Down Expand Up @@ -340,7 +340,7 @@
{
-moz-context-properties: fill !important;
fill: currentColor !important;
background-image: url(spinner-busy.svg) !important;
background-image: url(../icons/spinner-busy.svg) !important;
margin: 0 !important;
transform-origin: center !important;
animation: rotate-360 1.333s linear infinite reverse !important;
Expand All @@ -349,7 +349,7 @@

.tab-throbber[progress]
{
background-image: url(spinner-progress.svg) !important;
background-image: url(../icons/spinner-progress.svg) !important;
animation-direction: normal !important;
}

Expand Down