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 github.com:gorhill/uBlock

This commit is contained in:
gorhill 2014-08-22 18:52:08 -04:00
parent d4b9b44391 43d70f3428
commit d47b0f7341
4 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3p-filters.html
View File

@ -15,6 +15,7 @@ div > p:last-child {
body > ul { body > ul {
margin: 0.5em 0 0 0; margin: 0.5em 0 0 0;
padding-left: 1em; padding-left: 1em;
padding-right: 1em;
} }
ul { ul {
padding: 0; padding: 0;
@ -61,7 +62,6 @@ button.reloadAll:hover {
#buttonApply { #buttonApply {
display: none; display: none;
position: fixed; position: fixed;
right: 1em;
top: 1em; top: 1em;
} }
#buttonApply.enabled { #buttonApply.enabled {

3
about.html
View File

@ -8,6 +8,7 @@
<style> <style>
ul { ul {
padding-left: 1em; padding-left: 1em;
padding-right: 1em;
} }
</style> </style>
</head> </head>
@ -15,7 +16,7 @@ ul {
<body> <body>
<h2>µBlock <span id="aboutVersion"></span></h2> <h2>µBlock <span id="aboutVersion"></span></h2>
<ul> <ul id="AboutUL">
<li><a href="https://github.com/gorhill/uBlock/releases" data-i18n="aboutChangelog"></a> <li><a href="https://github.com/gorhill/uBlock/releases" data-i18n="aboutChangelog"></a>
<li><a href="https://github.com/gorhill/ublock" data-i18n="aboutCode"></a> <li><a href="https://github.com/gorhill/ublock" data-i18n="aboutCode"></a>
<li><span data-i18n="aboutContributors"></span> <li><span data-i18n="aboutContributors"></span>

3
css/common.css
View File

@ -12,3 +12,6 @@
vertical-align: baseline; vertical-align: baseline;
display: inline-block; display: inline-block;
} }
#dashboard-nav-widgets {
direction: __MSG_@@bidi_dir__;
}

53
css/dashboard-common.css
View File

@ -2,6 +2,7 @@ body {
margin: 0; margin: 0;
padding: 0 0.5em 5em 0.5em; padding: 0 0.5em 5em 0.5em;
font: 14px sans-serif; font: 14px sans-serif;
direction: __MSG_@@bidi_dir__;
} }
h2, h3 { h2, h3 {
margin: 1em 0; margin: 1em 0;
@ -17,8 +18,9 @@ h3 {
font-size: 16px; font-size: 16px;
} }
h2 + * { h2 + * {
margin: 0 0 0 1em; margin: 0 auto 0 auto;
padding: 0; margin-__MSG_@@bidi_start_edge__: 1em !important;
padding-__MSG_@@bidi_end_edge__: 0em !important;
} }
a { a {
text-decoration: none; text-decoration: none;
@ -29,6 +31,53 @@ a {
body ul.lists {
padding-__MSG_@@bidi_end_edge__: 0em !important;
padding-__MSG_@@bidi_start_edge__: 1em !important;
}
li.listDetails {
float: __MSG_@@bidi_start_edge__;
position: static;
width: 100%;
margin: 0 auto 0 auto !important;
margin-__MSG_@@bidi_start_edge__: 1em !important;
margin-__MSG_@@bidi_end_edge__: 0em !important;
}
li.listDetails input[type="checkbox"] {
float: __MSG_@@bidi_start_edge__;
}
.listDetails a {
float: __MSG_@@bidi_start_edge__;
}
#buttonApply {
__MSG_@@bidi_end_edge__: 1em;
}
#ExternalListDiv {
margin: 2em auto 0 auto;
margin-__MSG_@@bidi_start_edge__: 2em !important;
}
#externalLists {
text-align: left;
}
.userFilters {
text-align: left;
}
#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;
}
.whatisthis { .whatisthis {
margin: 0 0 0 8px; margin: 0 0 0 8px;
border: 0; border: 0;