Skip to content

Commit b873573

Browse files
MaikuolanMaikuolan
committed
Optimise assets.
1 parent e411283 commit b873573

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+170
-183
lines changed

‎Changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,5 @@ __*Why "v3.0.0" instead of "v1.0.0?"*__ Prior to phpMussel v3, the "phpMussel Co
143143
[2023.02.28; Maikuolan]: Adjusted the eTaggable method, increasing expiries from 1 month to 6 months to further reduce superfluous requests for static files, and explicitly removing the Cache-Control header due to some implementations setting the Cache-Control header within their own code, prior to calling phpMussel, thus preventing browsers from being able to properly cache phpMussel's static assets (explicitly removing the header should ensure that static assets can be cached as expected).
144144

145145
[2023.03.06; Documentation; Maikuolan]: Due to changes implemented by GitHub in how it handles anchors in markdown files, a vast majority of the internal links within the documentation were broken, as well as most links within the L10N data which pointed to said documentation; Fixed.
146+
147+
[2023.03.08; Maikuolan]: Optimise nav icons, pip icons, and related assets.

‎assets/bluemetal/frontend.css

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ input,select{width:150px;background-repeat:no-repeat;background-position:top {FE
99
input[type=submit]:not(.auto),input[type=button]:not(.auto){width:auto;min-width:150px}
1010
input.auto,select.auto{width:auto;padding-left:10px;padding-right:10px}
1111
input[type=image]{width:inherit;border:inherit}
12-
input[type=password]{background-image:url(data:image/gif;base64,{PIP_Key_64})}
13-
input[type=text]{background-image:url(data:image/gif;base64,{PIP_Input_64})}
14-
input[type=text][pattern]:valid:not(input[type=text]:placeholder-shown){background-image:url(data:image/gif;base64,{PIP_Input_Valid_64})}
15-
input[type=text][pattern]:invalid:not(input[type=text]:placeholder-shown){background-image:url(data:image/gif;base64,{PIP_Input_Invalid_64})}
12+
input[type=password]{background-image:url(data:image/gif;base64,{Base64Encode}{Asset:pip_key_blue.gif}{/Base64Encode})}
13+
input[type=text]{background-image:url(data:image/gif;base64,{Base64Encode}{Asset:pip_{Text Direction}_blue.gif}{/Base64Encode})}
14+
input[type=text][pattern]:valid:not(input[type=text]:placeholder-shown){background-image:url(data:image/gif;base64,{Base64Encode}{Asset:pip_{Text Direction}_blue_valid.gif}{/Base64Encode})}
15+
input[type=text][pattern]:invalid:not(input[type=text]:placeholder-shown){background-image:url(data:image/gif;base64,{Base64Encode}{Asset:pip_{Text Direction}_blue_invalid.gif}{/Base64Encode})}
1616
input{border-radius:0}
1717
input[type=button],input[type=submit],input[type=reset]{border-radius:18px;transition:all .3s ease-out}
1818
select,option,input,textarea{filter:grayscale(.1) brightness(.94)}
@@ -65,7 +65,7 @@ a:hover,a:active,a:focus,.txtRd{color:#fca}
6565
@keyframes idxAn{0%{background:#603}100%{background:#ddd}}
6666
@keyframes UplT{0%{opacity:0}100%{opacity:1}}
6767
.mob{display:none}
68-
input[id=logoutbutton]{border-top-{FE_Align}-radius:0;border-bottom-{FE_Align}-radius:0;padding-{FE_Align}:18px;margin-{FE_Align}:-1px;background-position:top 1px {FE_Align} 4px,top 1px {FE_Align} 4px;background-image:url('?phpmussel-asset=lock_bl_o.png&theme={theme}'),url('?phpmussel-asset=lock_bl_c.png&theme={theme}')}
68+
input[id=logoutbutton]{border-top-{FE_Align}-radius:0;border-bottom-{FE_Align}-radius:0;padding-{FE_Align}:18px;margin-{FE_Align}:-1px;background-position:top 1px {FE_Align} 4px,top 1px {FE_Align} 4px;background-image:url(data:image/png;base64,{Base64Encode}{Asset:lock_bl_o.png}{/Base64Encode}),url(data:image/png;base64,{Base64Encode}{Asset:lock_bl_c.png}{/Base64Encode})}
6969
input[id=logoutbutton]:hover,input[id=logoutbutton]:active,input[id=logoutbutton]:focus{background-position:top 3px {FE_Align} 4px,top 1px {FE_Align} 4px}
7070
input[id=homebutton]{border-top-{FE_Align_Reverse}-radius:0;border-bottom-{FE_Align_Reverse}-radius:0;margin-{FE_Align_Reverse}:0}
7171
.h1f,.h2f,.h3f,.h4f,.rf{white-space:nowrap}
@@ -90,7 +90,7 @@ li>span.comCat:first-child{cursor:pointer}
9090
blockquote.comSub{margin:-2px 0 0 0;padding:0 0 0 0}
9191
@keyframes forRotate{0%{transform:rotate(0)}100%{transform:rotate({45deg})}}
9292
@keyframes revRotate{0%{transform:rotate({45deg})}100%{transform:rotate(0)}}
93-
.navicon{filter:invert(85%) saturate(1074%) hue-rotate(206deg) brightness(100%) contrast(87%);position:relative;top:1px;width:16px;height:16px}
93+
.navicon{display:inline-block;filter:invert(85%) saturate(1074%) hue-rotate(206deg) brightness(100%) contrast(87%);position:relative;top:1px;width:16px;height:16px}
9494
select+input[type=submit],select+input[type=button],input[name=qkey]+input[type=submit]{height:20px;margin-{FE_Align}:-3px;border-bottom-{FE_Align}-radius:0;border-top-{FE_Align}-radius:0;padding-{FE_Align}:3px}
9595
input[name=qkey]{margin-{FE_Align}:-3px;padding-{FE_Align}:3px}
9696
select,input[type=submit],input[type=reset],input[type=button],input[type=text],input[type=password],input[type=number],input[type=date],input[type=time],button{box-sizing:border-box;height:20px;padding-top:0;padding-bottom:0}
@@ -128,3 +128,12 @@ input[type=button].reset{background:none;cursor:pointer;border:none;padding:0 12
128128
input[type=button].reset:hover,input[type=button].reset:active{color:#ffc}
129129
.tablend{margin-top:-2px}
130130
#logsTA{position:relative;top:-2px}
131+
.navicon.accounts{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:accounts.svg}{/Base64Encode})}
132+
.navicon.cache{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:cache.svg}{/Base64Encode})}
133+
.navicon.configuration{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:configuration.svg}{/Base64Encode})}
134+
.navicon.quarantine{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:quarantine.svg}{/Base64Encode})}
135+
.navicon.statistics{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:statistics.svg}{/Base64Encode})}
136+
.navicon.test{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:test.svg}{/Base64Encode})}
137+
.navicon.logs{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:logs.svg}{/Base64Encode})}
138+
.navicon.documentation{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:documentation.svg}{/Base64Encode})}
139+
.navicon.link{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:link.svg}{/Base64Encode})}

‎assets/bluemetal/pips.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎assets/default/_nav_complete_access.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<table>
22
<tr>
33
<td class="ng2 big" style="border-radius:0 12px 0 0">
4-
<a href="?"><img src="?phpmussel-asset=home.svg" class="navicon" aria-hidden="true" />{link_home}</a>
4+
<a href="?"><span class="navicon" style="background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:home.svg}{/Base64Encode})"></span>{link_home}</a>
55
</td>
66
</tr>
77
<tr>
88
<td class="ng1">
9-
<a href="?phpmussel-page=accounts"><img src="?phpmussel-asset=accounts.svg" class="navicon" aria-hidden="true" />{link_accounts}</a><br />
10-
<a href="?phpmussel-page=cache-data"><img src="?phpmussel-asset=cache.svg" class="navicon" aria-hidden="true" />{link_cache_data}</a><br />
11-
<a href="?phpmussel-page=config"><img src="?phpmussel-asset=configuration.svg" class="navicon" aria-hidden="true" />{link_config}</a><br />
12-
<a href="?phpmussel-page=quarantine"><img src="?phpmussel-asset=quarantine.svg" class="navicon" aria-hidden="true" />{link_quarantine}</a><br />
9+
<a href="?phpmussel-page=accounts"><span class="navicon accounts"></span>{link_accounts}</a><br />
10+
<a href="?phpmussel-page=cache-data"><span class="navicon cache"></span>{link_cache_data}</a><br />
11+
<a href="?phpmussel-page=config"><span class="navicon configuration"></span>{link_config}</a><br />
12+
<a href="?phpmussel-page=quarantine"><span class="navicon quarantine"></span>{link_quarantine}</a><br />
1313
<a href="?phpmussel-page=siginfo">{link_siginfo}</a><br />
14-
<a href="?phpmussel-page=statistics"><img src="?phpmussel-asset=statistics.svg" class="navicon" aria-hidden="true" />{link_statistics}</a><br />
15-
<a href="?phpmussel-page=upload-test"><img src="?phpmussel-asset=test.svg" class="navicon" aria-hidden="true" />{link_upload_test}</a><br />
16-
<a href="?phpmussel-page=logs"><img src="?phpmussel-asset=logs.svg" class="navicon" aria-hidden="true" />{link_logs}</a>
14+
<a href="?phpmussel-page=statistics"><span class="navicon statistics"></span>{link_statistics}</a><br />
15+
<a href="?phpmussel-page=upload-test"><span class="navicon test"></span>{link_upload_test}</a><br />
16+
<a href="?phpmussel-page=logs"><span class="navicon logs"></span>{link_logs}</a>
1717
</td>
1818
</tr>
1919
<tr>
2020
<td class="ng2">
2121
<div class="subNav">{label_external}</div>
22-
<a href="{Links.Documentation}" hreflang="en-US" rel="noopener external"><img src="?phpmussel-asset=documentation.svg" class="navicon" aria-hidden="true" />{link_documentation}</a><br />
22+
<a href="{Links.Documentation}" hreflang="en-US" rel="noopener external"><span class="navicon documentation"></span>{link_documentation}</a><br />
2323
{Links.Website}
2424
</td>
2525
</tr>

‎assets/default/_nav_logs_access_only.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<table>
22
<tr>
33
<td class="ng2 big">
4-
<a href="?"><img src="?phpmussel-asset=home.svg" class="navicon" aria-hidden="true" />{link_home}</a>
4+
<a href="?"><span class="navicon" style="background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:home.svg}{/Base64Encode})"></span>{link_home}</a>
55
</td>
66
</tr>
77
<tr>
88
<td class="ng1">
9-
<a href="?phpmussel-page=logs"><img src="?phpmussel-asset=logs.svg" class="navicon" aria-hidden="true" />{link_logs}</a>
9+
<a href="?phpmussel-page=logs"><span class="navicon logs"></span>{link_logs}</a>
1010
</td>
1111
</tr>
1212
<tr>
1313
<td class="ng2">
1414
<div class="subNav">{label_external}</div>
15-
<a href="{Links.Documentation}" hreflang="en-US" rel="noopener external"><img src="?phpmussel-asset=documentation.svg" class="navicon" aria-hidden="true" />{link_documentation}</a><br />
15+
<a href="{Links.Documentation}" hreflang="en-US" rel="noopener external"><span class="navicon documentation"></span>{link_documentation}</a><br />
1616
{Links.Website}
1717
</td>
1818
</tr>

‎assets/default/frontend.css

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ input,select{width:150px;background-repeat:no-repeat;background-position:top {FE
99
input[type=submit]:not(.auto),input[type=button]:not(.auto){width:auto;min-width:150px}
1010
input.auto,select.auto{width:auto;padding-left:10px;padding-right:10px}
1111
input[type=image]{width:inherit;border:inherit}
12-
input[type=password]{background-image:url(data:image/gif;base64,{PIP_Key_64})}
13-
input[type=text]{background-image:url(data:image/gif;base64,{PIP_Input_64})}
14-
input[type=text][pattern]:valid:not(input[type=text]:placeholder-shown){background-image:url(data:image/gif;base64,{PIP_Input_Valid_64})}
15-
input[type=text][pattern]:invalid:not(input[type=text]:placeholder-shown){background-image:url(data:image/gif;base64,{PIP_Input_Invalid_64})}
12+
input[type=password]{background-image:url(data:image/gif;base64,{Base64Encode}{Asset:pip_key_red.gif}{/Base64Encode})}
13+
input[type=text]{background-image:url(data:image/gif;base64,{Base64Encode}{Asset:pip_{Text Direction}_red.gif}{/Base64Encode})}
14+
input[type=text][pattern]:valid:not(input[type=text]:placeholder-shown){background-image:url(data:image/gif;base64,{Base64Encode}{Asset:pip_{Text Direction}_red_valid.gif}{/Base64Encode})}
15+
input[type=text][pattern]:invalid:not(input[type=text]:placeholder-shown){background-image:url(data:image/gif;base64,{Base64Encode}{Asset:pip_{Text Direction}_red_invalid.gif}{/Base64Encode})}
1616
input{border-radius:0}
1717
input[type=button],input[type=submit],input[type=reset]{border-radius:18px;transition:all .3s ease-out}
1818
select,option,input,textarea{filter:grayscale(.1) brightness(.94)}
@@ -69,7 +69,7 @@ a:active,a:focus{color:red}
6969
@keyframes idxAn{0%{background:#fa6}100%{background:#ddd}}
7070
@keyframes UplT{0%{opacity:0}100%{opacity:1}}
7171
.mob{display:none}
72-
input[id=logoutbutton]{border-top-{FE_Align}-radius:0;border-bottom-{FE_Align}-radius:0;padding-{FE_Align}:18px;margin-{FE_Align}:-1px;background-position:top 1px {FE_Align} 4px,top 1px {FE_Align} 4px;background-image:url('?phpmussel-asset=lock_rd_o.png&theme={theme}'),url('?phpmussel-asset=lock_rd_c.png&theme={theme}')}
72+
input[id=logoutbutton]{border-top-{FE_Align}-radius:0;border-bottom-{FE_Align}-radius:0;padding-{FE_Align}:18px;margin-{FE_Align}:-1px;background-position:top 1px {FE_Align} 4px,top 1px {FE_Align} 4px;background-image:url(data:image/png;base64,{Base64Encode}{Asset:lock_rd_o.png}{/Base64Encode}),url(data:image/png;base64,{Base64Encode}{Asset:lock_rd_c.png}{/Base64Encode})}
7373
input[id=logoutbutton]:hover,input[id=logoutbutton]:active,input[id=logoutbutton]:focus{background-position:top 3px {FE_Align} 4px,top 1px {FE_Align} 4px}
7474
input[id=homebutton]{border-top-{FE_Align_Reverse}-radius:0;border-bottom-{FE_Align_Reverse}-radius:0;margin-{FE_Align_Reverse}:0}
7575
.h1f,.h2f,.h3f,.h4f,.rf{white-space:nowrap}
@@ -94,7 +94,7 @@ li>span.comCat:first-child{cursor:pointer}
9494
blockquote.comSub{margin:-2px 0 0 0;padding:0 0 0 0}
9595
@keyframes forRotate{0%{transform:rotate(0)}100%{transform:rotate({45deg})}}
9696
@keyframes revRotate{0%{transform:rotate({45deg})}100%{transform:rotate(0)}}
97-
.navicon{filter:invert(12%) sepia(91%) saturate(1979%) hue-rotate(222deg) brightness(107%) contrast(94%);position:relative;top:1px;width:16px;height:16px}
97+
.navicon{display:inline-block;filter:invert(12%) sepia(91%) saturate(1979%) hue-rotate(222deg) brightness(107%) contrast(94%);position:relative;top:1px;width:16px;height:16px}
9898
select+input[type=submit],select+input[type=button],input[name=qkey]+input[type=submit]{margin-{FE_Align}:-3px;border-bottom-{FE_Align}-radius:0;border-top-{FE_Align}-radius:0;padding-{FE_Align}:3px}
9999
input[name=qkey]{margin-{FE_Align}:-3px;padding-{FE_Align}:3px}
100100
select,input[type=submit],input[type=reset],input[type=button],input[type=text],input[type=password],input[type=number],input[type=date],input[type=time],button{box-sizing:border-box;height:20px;padding-top:0;padding-bottom:0}
@@ -132,3 +132,12 @@ input[type=button].reset{background:none;cursor:pointer;border:none;padding:0 12
132132
input[type=button].reset:hover,input[type=button].reset:active{color:#f88}
133133
.tablend{margin-top:-2px}
134134
#logsTA{position:relative;top:-2px}
135+
.navicon.accounts{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:accounts.svg}{/Base64Encode})}
136+
.navicon.cache{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:cache.svg}{/Base64Encode})}
137+
.navicon.configuration{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:configuration.svg}{/Base64Encode})}
138+
.navicon.quarantine{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:quarantine.svg}{/Base64Encode})}
139+
.navicon.statistics{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:statistics.svg}{/Base64Encode})}
140+
.navicon.test{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:test.svg}{/Base64Encode})}
141+
.navicon.logs{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:logs.svg}{/Base64Encode})}
142+
.navicon.documentation{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:documentation.svg}{/Base64Encode})}
143+
.navicon.link{background-image:url(data:image/svg+xml;base64,{Base64Encode}{Asset:link.svg}{/Base64Encode})}

‎assets/default/pip_key_blue.gif

54 Bytes
Loading

‎assets/default/pip_key_red.gif

60 Bytes
Loading

‎assets/default/pip_key_silver.gif

60 Bytes
Loading

‎assets/default/pip_ltr_blue.gif

54 Bytes
Loading

0 commit comments

Comments
 (0)