Skip to content

Commit

Permalink
Merge pull request #802 from AdguardTeam/feature/793
Browse files Browse the repository at this point in the history
Feature/793
  • Loading branch information
kaprielov committed Aug 2, 2017
2 parents 30aaf50 + 8fc29f0 commit 49c763e
Show file tree
Hide file tree
Showing 86 changed files with 1,628 additions and 7,085 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ Compiler/scripts/oneskyapp
Compiler/certificate.pem
*.iml
tags
extensions
extensions
.DS_Store
87 changes: 0 additions & 87 deletions Extension/pages/css/custom.css

This file was deleted.

40 changes: 40 additions & 0 deletions Extension/pages/css/fonts.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
@charset "UTF-8";
@font-face {
font-family: 'gotham_promedium';
src: url('../fonts/gothapromed-webfont.eot');
src: url('../fonts/gothapromed-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/gothapromed-webfont.woff') format('woff'),
url('../fonts/gothapromed-webfont.ttf') format('truetype'),
url('../fonts/gothapromed-webfont.svg#gotham_promedium') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'gotham_proregular';
src: url('../fonts/gothaproreg-webfont.eot');
src: url('../fonts/gothaproreg-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/gothaproreg-webfont.woff') format('woff'),
url('../fonts/gothaproreg-webfont.ttf') format('truetype'),
url('../fonts/gothaproreg-webfont.svg#gotham_proregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'opensans_semibold';
src: url('../fonts/opensanssemibold-webfont.eot');
src: url('../fonts/opensanssemibold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/opensanssemibold-webfont.woff') format('woff'),
url('../fonts/opensanssemibold-webfont.ttf') format('truetype'),
url('../fonts/opensanssemibold-webfont.svg#opensanssemibold') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'gotham_probol';
src: url('../fonts/gothaprobol-webfont.eot');
src: url('../fonts/gothaprobol-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/gothaprobol-webfont.woff') format('woff'),
url('../fonts/gothaprobol-webfont.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
28 changes: 0 additions & 28 deletions Extension/pages/css/fonts.less

This file was deleted.

71 changes: 71 additions & 0 deletions Extension/pages/css/layout.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
@charset "UTF-8";
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
font: 14px/1.3 'gotham_proregular', 'opensans_semibold', sans-serif;
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
:root {
font-size: 16px;
}
* {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
html {
padding: 0;
margin: 0;
height: 100%;
}
body {
background-color: #fff;
font-family: 'gotham_proregular';
padding: 0;
margin: 0;
font-size: 12px;
height: 100%;
}
a {
color: currentColor;
outline: none;
}
.hidden{
display: none;
}
Loading

0 comments on commit 49c763e

Please sign in to comment.