Merge branch 'EdwardLangdon-UI-Changes'
This commit is contained in:
ManeraKai
commit
456d0ee4b1
|
|
@ -50,11 +50,16 @@
|
|||
<path d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z"></path>
|
||||
</svg><a href="#maps" data-localise="__MSG_maps__">Maps</a>
|
||||
</div>
|
||||
<div class="title">
|
||||
<div class="title">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
|
||||
<path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"></path>
|
||||
</svg><a href="#sendTargets" data-localise="__MSG_sendFiles__">Send Files</a>
|
||||
</div>
|
||||
<div class="title">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" fill="currentColor">
|
||||
<path d="M11 17h2v-6h-2Zm1-8q.425 0 .713-.288Q13 8.425 13 8t-.287-.713Q12.425 7 12 7t-.712.287Q11 7.575 11 8t.288.712Q11.575 9 12 9Zm0 13q-2.075 0-3.9-.788-1.825-.787-3.175-2.137-1.35-1.35-2.137-3.175Q2 14.075 2 12t.788-3.9q.787-1.825 2.137-3.175 1.35-1.35 3.175-2.138Q9.925 2 12 2t3.9.787q1.825.788 3.175 2.138 1.35 1.35 2.137 3.175Q22 9.925 22 12t-.788 3.9q-.787 1.825-2.137 3.175-1.35 1.35-3.175 2.137Q14.075 22 12 22Zm0-2q3.35 0 5.675-2.325Q20 15.35 20 12q0-3.35-2.325-5.675Q15.35 4 12 4 8.65 4 6.325 6.325 4 8.65 4 12q0 3a.35 2.325 5.675Q8.65 20 12 20Zm0-8Z"></path>
|
||||
</svg><a href="#about" data-localise="__MSG_about">About</a>
|
||||
</div>
|
||||
</section>
|
||||
<div id="pages">
|
||||
<section class="option-block" id="general_page">
|
||||
|
|
@ -1994,6 +1999,30 @@
|
|||
</div>
|
||||
<script type="module" src="./widgets/sendTargets.js"></script>
|
||||
</section>
|
||||
<section class="option-block" id="about_page">
|
||||
<div class="some-block option-block">
|
||||
<h1 data-localise="__MSG_about__">About</h1>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="about">
|
||||
<div class="some-block option-block">
|
||||
<h4>Donate: ♥️</h4>
|
||||
<h4><a href='https://libredirect.github.io/donate'>https://libredirect.github.io/donate</a> </h4>
|
||||
</div>
|
||||
<div class="some-block option-block">
|
||||
<h4>FAQ:</h4>
|
||||
<h4><a href='https://libredirect.github.io/faq'>https://libredirect.github.io/faq</a></h4>
|
||||
</div>
|
||||
<div class="some-block option-block">
|
||||
<h4>Docs:</h4>
|
||||
<h4><a href='https://libredirect.github.io/docs'>https://libredirect.github.io/docs</a></h4>
|
||||
</div>
|
||||
<div class="some-block option-block">
|
||||
<h4>Source Code:</h4>
|
||||
<h4><a href='https://libredirect.github.io/source_code'>https://libredirect.github.io/source_code</a></h4>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</body>
|
||||
<script type="module" src="./index.js"></script>
|
||||
|
|
|
|||
|
|
@ -31,5 +31,6 @@ html#elementToShowWithJavaScript(lang="en")
|
|||
include ./widgets/translate.pug
|
||||
include ./widgets/maps.pug
|
||||
include ./widgets/sendTargets.pug
|
||||
include ./widgets/about.pug
|
||||
|
||||
script(type="module" src="./index.js")
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
section#about_page.option-block
|
||||
.some-block.option-block
|
||||
h1(data-localise="__MSG_about__") About
|
||||
hr
|
||||
.about
|
||||
.some-block.option-block
|
||||
h4 Donate: ♥️
|
||||
h4 <a href='https://libredirect.github.io/donate'>https://libredirect.github.io/donate</a>
|
||||
.some-block.option-block
|
||||
h4 FAQ:
|
||||
h4 <a href='https://libredirect.github.io/faq'>https://libredirect.github.io/faq</a>
|
||||
.some-block.option-block
|
||||
h4 Docs:
|
||||
h4 <a href='https://libredirect.github.io/docs'>https://libredirect.github.io/docs</a>
|
||||
.some-block.option-block
|
||||
h4 Source Code:
|
||||
h4 <a href='https://libredirect.github.io/source_code'>https://libredirect.github.io/source_code</a>
|
||||
|
|
@ -191,26 +191,31 @@
|
|||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="some-block" id="change_instance_div"><a class="title button" id="change_instance">
|
||||
<div class="some-block" id="change_instance_div"><a class="title button prevent" id="change_instance">
|
||||
<h4 data-localise="__MSG_switchInstance__">Change Instance</h4>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
|
||||
<path d="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01-.25 1.97-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0-4.42-3.58-8-8-8zm0 14c-3.31 0-6-2.69-6-6 0-1.01.25-1.97.7-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4-4-4-4v3z"></path>
|
||||
</svg></a></div>
|
||||
<div class="some-block" id="copy_raw_div" title="Copy the original redirected link"> <a class="title button" id="copy_raw">
|
||||
<div class="some-block" id="copy_raw_div" title="Copy the original redirected link"> <a class="title button prevent" id="copy_raw">
|
||||
<h4 data-localise="__MSG_copyRaw__">Copy Raw</h4>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
|
||||
<path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"></path>
|
||||
</svg></a></div>
|
||||
<div class="some-block" id="unify_div" title="Unify cookies across all selected instances"><a class="title button" id="unify">
|
||||
<div class="some-block" id="unify_div" title="Unify cookies across all selected instances"><a class="title button prevent" id="unify">
|
||||
<h4 data-localise="__MSG_unifySettings__">Unify Settings</h4>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
|
||||
<path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"></path>
|
||||
</svg></a></div>
|
||||
<div class="some-block"><a class="title button" id="more-options">
|
||||
<div class="some-block"><a class="title button prevent" id="more-options">
|
||||
<h4 data-localise="__MSG_settings__">Settings</h4>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
|
||||
<path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"></path>
|
||||
</svg></a></div>
|
||||
<div class="some-block"><a class="title button" id="about" href="/pages/options/index.html#about">
|
||||
<h4 data-localise="__MSG_about__">About</h4>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" fill="currentColor">
|
||||
<path d="M11 17h2v-6h-2Zm1-8q.425 0 .713-.288Q13 8.425 13 8t-.287-.713Q12.425 7 12 7t-.712.287Q11 7.575 11 8t.288.712Q11.575 9 12 9Zm0 13q-2.075 0-3.9-.788-1.825-.787-3.175-2.137-1.35-1.35-2.137-3.175Q2 14.075 2 12t.788-3.9q.787-1.825 2.137-3.175 1.35-1.35 3.175-2.138Q9.925 2 12 2t3.9.787q1.825.788 3.175 2.138 1.35 1.35 2.137 3.175Q22 9.925 22 12t-.788 3.9q-.787 1.825-2.137 3.175-1.35 1.35-3.175 2.137Q14.075 22 12 22Zm0-2q3.35 0 5.675-2.325Q20 15.35 20 12q0-3.35-2.325-5.675Q15.35 4 12 4 8.65 4 6.325 6.325 4 8.65 4 12q0 3a.35 2.325 5.675Q8.65 20 12 20Zm0-8Z"></path>
|
||||
</svg></a></div>
|
||||
<div class="space"></div>
|
||||
<script type="module" src="../options/init.js"></script>
|
||||
<script type="module" src="./popup.js"></script>
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ utils.copyRaw(true).then(r => {
|
|||
copy_raw.addEventListener("click", () => utils.copyRaw(false, copy_raw));
|
||||
}
|
||||
})
|
||||
|
||||
document.getElementById("more-options").addEventListener("click", () => browser.runtime.openOptionsPage());
|
||||
|
||||
const allSites = document.getElementsByClassName('all_sites')[0];
|
||||
|
|
@ -323,7 +322,7 @@ document.addEventListener("change", () => {
|
|||
|
||||
for (const a of document.getElementsByTagName('a')) {
|
||||
a.addEventListener('click', e => {
|
||||
if (!a.classList.contains('button')) {
|
||||
if (!a.classList.contains('prevent')) {
|
||||
browser.tabs.create({ url: a.getAttribute('href') });
|
||||
e.preventDefault();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -124,25 +124,30 @@ html(lang="en")
|
|||
+services
|
||||
hr
|
||||
#change_instance_div.some-block
|
||||
a#change_instance.title.button
|
||||
a#change_instance.title.button.prevent
|
||||
h4(data-localise="__MSG_switchInstance__") Change Instance
|
||||
+change_instance
|
||||
|
||||
#copy_raw_div.some-block(title="Copy the original redirected link")
|
||||
a#copy_raw.title.button
|
||||
a#copy_raw.title.button.prevent
|
||||
h4(data-localise="__MSG_copyRaw__") Copy Raw
|
||||
+copy_raw
|
||||
|
||||
#unify_div.some-block(title="Unify cookies across all selected instances")
|
||||
a#unify.title.button
|
||||
a#unify.title.button.prevent
|
||||
h4(data-localise="__MSG_unifySettings__") Unify Settings
|
||||
+unify
|
||||
|
||||
.some-block
|
||||
a#more-options.title.button
|
||||
a#more-options.title.button.prevent
|
||||
h4(data-localise="__MSG_settings__") Settings
|
||||
+settings
|
||||
|
||||
.some-block
|
||||
a#about.title.button(href="/pages/options/index.html#about")
|
||||
h4(data-localise="__MSG_about__") About
|
||||
+about
|
||||
|
||||
.space
|
||||
|
||||
script(type="module" src="../options/init.js")
|
||||
|
|
|
|||
|
|
@ -453,4 +453,13 @@ button {
|
|||
|
||||
body div section {
|
||||
display: none;
|
||||
}
|
||||
|
||||
div.about > div{
|
||||
justify-content: start;
|
||||
width: 520px;
|
||||
}
|
||||
|
||||
div.about h4 {
|
||||
width: auto;
|
||||
}
|
||||
|
|
@ -39,4 +39,8 @@ mixin general
|
|||
|
||||
mixin unify
|
||||
svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor")
|
||||
path(d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z")
|
||||
path(d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z")
|
||||
|
||||
mixin about
|
||||
svg( xmlns="http://www.w3.org/2000/svg" height="24" width="24" fill="currentColor")
|
||||
path( d="M11 17h2v-6h-2Zm1-8q.425 0 .713-.288Q13 8.425 13 8t-.287-.713Q12.425 7 12 7t-.712.287Q11 7.575 11 8t.288.712Q11.575 9 12 9Zm0 13q-2.075 0-3.9-.788-1.825-.787-3.175-2.137-1.35-1.35-2.137-3.175Q2 14.075 2 12t.788-3.9q.787-1.825 2.137-3.175 1.35-1.35 3.175-2.138Q9.925 2 12 2t3.9.787q1.825.788 3.175 2.138 1.35 1.35 2.137 3.175Q22 9.925 22 12t-.788 3.9q-.787 1.825-2.137 3.175-1.35 1.35-3.175 2.137Q14.075 22 12 22Zm0-2q3.35 0 5.675-2.325Q20 15.35 20 12q0-3.35-2.325-5.675Q15.35 4 12 4 8.65 4 6.325 6.325 4 8.65 4 12q0 3a.35 2.325 5.675Q8.65 20 12 20Zm0-8Z")
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
include ../widgets/icons.pug
|
||||
include ./icons.pug
|
||||
|
||||
mixin links(service)
|
||||
section#links.links
|
||||
|
|
@ -74,6 +74,10 @@ mixin links(service)
|
|||
+maps
|
||||
a(href="#maps" data-localise="__MSG_maps__") Maps
|
||||
|
||||
.title
|
||||
.title
|
||||
+send
|
||||
a(href="#sendTargets" data-localise="__MSG_sendFiles__") Send Files
|
||||
a(href="#sendTargets" data-localise="__MSG_sendFiles__") Send Files
|
||||
|
||||
.title
|
||||
+about
|
||||
a(href="#about" data-localise="__MSG_about") About
|
||||
Loading…
Reference in New Issue