Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/gorhill/uBlock

This commit is contained in:
Mikey1993 2014-08-24 01:45:22 +03:00
parent 6bf166169a e811fd2958
commit a315126921
3 changed files with 33 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3p-filters.html
View File

@ -22,7 +22,7 @@
<ul id="lists">
</ul>
<div style="margin: 2em 0 0 2em">
<div id="externalListsDiv">
<p data-i18n="3pExternalListsHint" style="margin: 0 0 0.25em 0; font-size: 13px;"></p>
<textarea id="externalLists"></textarea>
<p style="margin: 0.25em 0 0 0"><button id="externalListsApply" disabled="true" data-i18n="3pExternalListsApply"></button></p>

55
css/3p-filters.css
View File

@ -1,30 +1,33 @@
div > p:first-child {
margin-top: 0;
}
div > p:last-child {
margin-bottom: 0;
ul {
padding: 0;
list-style-type: none;
}
ul#lists {
margin: 0.5em 0 0 0;
padding-__MSG_@@bidi_end_edge__: 0em;
padding-__MSG_@@bidi_start_edge__: 1em;
}
ul {
padding: 0;
list-style-type: none;
}
ul#lists > li {
margin: 0.5em 0 0 0;
padding: 0;
font-size: 15px;
list-style-type: none;
}
ul > li > ul {
ul#lists > li > ul {
margin: 0.25em 0 0 0;
}
ul > li > ul > li {
li.listDetails {
font-size: 14px;
margin: 0 0 0 1em;
margin: 0 auto 0 auto;
margin-__MSG_@@bidi_start_edge__: 1em;
margin-__MSG_@@bidi_end_edge__: 0em;
}
li.listDetails > * {
unicode-bidi: embed;
}
li.listDetails > a:nth-of-type(2) {
font-size: 13px;
opacity: 0.5;
}
.dim {
opacity: 0.5;
@ -55,7 +58,6 @@ button.reloadAll:hover {
display: none;
position: fixed;
top: 1em;
__MSG_@@bidi_end_edge__: 1em;
}
#buttonApply.enabled {
@ -83,13 +85,16 @@ span.obsolete {
color: #222;
background-color: hsl(36, 100%, 75%);
}
#externalListsDiv {
margin: 2em auto 0 auto;
margin-__MSG_@@bidi_start_edge__: 2em;
}
#externalLists {
font-size: smaller;
width: 48em;
height: 8em;
white-space: nowrap;
text-align: left;
direction: ltr;
}
body #loadingOverlay {
position: fixed;
@ -106,23 +111,3 @@ body #loadingOverlay {
body.loading #loadingOverlay {
display: block;
}
li.listDetails {
width: 100%;
margin: 0 auto 0 auto;
unicode-bidi: bidi-override;
margin-__MSG_@@bidi_start_edge__: 1em;
margin-__MSG_@@bidi_end_edge__: 0em;
}
li.listDetails > * {
unicode-bidi: embed;
}
li.listDetails > a:nth-of-type(2) {
font-size: 13px;
opacity: 0.5;
}
#ExternalListDiv {
margin: 2em auto 0 auto;
margin-__MSG_@@bidi_start_edge__: 2em;
}

27
css/dashboard-common.css
View File

@ -18,19 +18,24 @@ h3 {
font-size: 16px;
}
h2 + * {
margin: 0 auto 0 auto;
margin-__MSG_@@bidi_start_edge__: 1em !important;
padding-__MSG_@@bidi_end_edge__: 0em !important;
margin: 0 auto;
margin-__MSG_@@bidi_start_edge__: 1em;
padding-__MSG_@@bidi_end_edge__: 0em;
}
a {
text-decoration: none;
}
div > p:first-child {
margin-top: 0;
}
div > p:last-child {
margin-bottom: 0;
}
.para {
width: 40em;
}
.userFilters {
text-align: left;
@ -38,18 +43,11 @@ a {
#whitelist {
text-align: left;
}
table.ooo {
direction: ltr;
float: __MSG_@@bidi_start_edge__;
}
ul#AboutUL {
padding-__MSG_@@bidi_start_edge__: 1em;
margin-__MSG_@@bidi_start_edge__: 1em !important;
margin-__MSG_@@bidi_start_edge__: 1em;
}
.whatisthis {
margin: 0 0 0 8px;
border: 0;
@ -86,4 +84,3 @@ ul#AboutUL {
padding: 5px;
background-color: #FEDAE0;
}