Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-16 23:42:39 +01:00
Code Issues Releases Wiki Activity

Completes UI fixes for #1235

Browse Source
This commit is contained in:
Chris 2015-04-11 02:03:57 -06:00
parent 323dc5feea
commit 25d06114fe
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/3p-filters.html
View File

@ -22,11 +22,6 @@
</ul> </ul>
<ul id="lists"></ul> <ul id="lists"></ul>
<div id="externalListsDiv">
<p data-i18n="3pExternalListsHint" style="margin: 0 0 0.25em 0; font-size: 13px;"></p>
<textarea id="externalLists" dir="ltr" spellcheck="false"></textarea>
<p style="margin: 0.25em 0 0 0"><button id="externalListsApply" disabled="true" data-i18n="3pExternalListsApply"></button></p>
</div>
<div id="busyOverlay"> <div id="busyOverlay">
<div></div> <div></div>
@ -50,6 +45,11 @@
 --><span class="status purge" style="display: none;" data-i18n="3pExternalListPurge"></span>  --><span class="status purge" style="display: none;" data-i18n="3pExternalListPurge"></span>
</li> </li>
</ul> </ul>
<div id="externalListsDiv">
<p data-i18n="3pExternalListsHint" style="margin: 0 0 0.25em 0; font-size: 13px;"></p>
<textarea id="externalLists" dir="ltr" spellcheck="false"></textarea>
<p style="margin: 0.25em 0 0 0"><button id="externalListsApply" disabled="true" data-i18n="3pExternalListsApply"></button></p>
</div>
</div> </div>
<script src="js/vapi-common.js"></script> <script src="js/vapi-common.js"></script>

9
src/css/3p-filters.css
View File

@ -6,7 +6,7 @@ ul {
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
#lists { #lists {
margin: 0.5em 0 0 0; margin: 0.5em 0 4em 0;
padding-left: 1em; padding-left: 1em;
padding-right: 0em; padding-right: 0em;
} }
@ -37,7 +37,8 @@ body[dir=rtl] #lists {
#lists > .groupEntry > ul { #lists > .groupEntry > ul {
margin: 0.25em 0 0 0; margin: 0.25em 0 0 0;
} }
#lists > .groupEntry.collapsed > ul { #lists > .groupEntry.collapsed > ul,
#lists > .groupEntry.collapsed > div {
display: none; display: none;
} }
li.listEntry { li.listEntry {
@ -139,10 +140,10 @@ span.new {
background-color: hsl(36, 100%, 75%); background-color: hsl(36, 100%, 75%);
} }
#externalListsDiv { #externalListsDiv {
margin: 2em auto 2em 2em; margin: 2em auto 0 2em;
} }
body[dir=rtl] #externalListsDiv { body[dir=rtl] #externalListsDiv {
margin: 2em 2em 2em; margin: 2em 2em 0;
} }
#externalLists { #externalLists {
box-sizing: border-box; box-sizing: border-box;

3
src/css/dashboard.css
View File

@ -12,6 +12,7 @@ html, body {
} }
body { body {
padding:8px; padding:8px;
box-sizing: border-box;
} }
#dashboard-nav { #dashboard-nav {
margin: 0; margin: 0;
@ -62,7 +63,7 @@ iframe {
border: 0; border: 0;
padding: 0; padding: 0;
background-color: transparent; background-color: transparent;
width: calc(100% - 16px); width: 100%;
} }
@media (max-width: 600px) { @media (max-width: 600px) {

5
src/js/3p-filters.js
View File

@ -162,6 +162,9 @@ var renderFilterLists = function() {
var liFromListGroup = function(groupKey, listKeys) { var liFromListGroup = function(groupKey, listKeys) {
var liGroup = listGroupTemplate.clone(); var liGroup = listGroupTemplate.clone();
if(groupKey === 'custom') {
liGroup.append(uDom('#externalListsDiv'));
}
var groupName = vAPI.i18n('3pGroup' + groupKey.charAt(0).toUpperCase() + groupKey.slice(1)); var groupName = vAPI.i18n('3pGroup' + groupKey.charAt(0).toUpperCase() + groupKey.slice(1));
if ( groupName !== '' ) { if ( groupName !== '' ) {
liGroup.descendants('span.geName').text(groupName); liGroup.descendants('span.geName').text(groupName);
@ -245,6 +248,7 @@ var renderFilterLists = function() {
uDom('#autoUpdate').prop('checked', listDetails.autoUpdate === true); uDom('#autoUpdate').prop('checked', listDetails.autoUpdate === true);
uDom('#parseCosmeticFilters').prop('checked', listDetails.cosmetic === true); uDom('#parseCosmeticFilters').prop('checked', listDetails.cosmetic === true);
renderExternalLists();
renderWidgets(); renderWidgets();
renderBusyOverlay(details.manualUpdate, details.manualUpdateProgress); renderBusyOverlay(details.manualUpdate, details.manualUpdateProgress);
}; };
@ -539,7 +543,6 @@ uDom.onLoad(function() {
uDom('#lists').on('click', '.groupEntry > span', groupEntryClickHandler); uDom('#lists').on('click', '.groupEntry > span', groupEntryClickHandler);
renderFilterLists(); renderFilterLists();
renderExternalLists();
}); });
/******************************************************************************/ /******************************************************************************/