Skip to content

Commit

Permalink
Merge pull request #40 in EXTENSIONS/browser-extension from feature/f…
Browse files Browse the repository at this point in the history
…onts to master

* commit '34b2c279e6d3bec2d2af6fa9c4a4e62fc1d47820':
  Refreshed fonts
  • Loading branch information
ameshkov committed Oct 3, 2017
2 parents ede2602 + 34b2c27 commit 0ea2a0f
Show file tree
Hide file tree
Showing 34 changed files with 2,045 additions and 139 deletions.

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Extension/browser/firefox/skin/fonts_firefox.css

Large diffs are not rendered by default.

33 changes: 13 additions & 20 deletions Extension/lib/content-script/assistant/css/assistant.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Extension/lib/content-script/content-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
var MAIN_DIV_STYLE = "position: fixed !important;top: 10px !important;right: 0px !important;z-index: 9999999999 !important;" +
"width: 390px !important;padding: 30px 20px 30px 36px !important;border-right: 6px solid #409e56 !important;-webkit-border-radius: 9px 0 0 9px !important;border-radius: 9px 0 0 9px !important;" +
"background: rgba(0, 0, 0, 0.93) !important;color: #fff !important;text-align: left !important;";
var TITLE_STYLE = "margin: 0 0 10px !important; font: 400 18px/100% 'gotham_proregular', 'opensans_semibold', sans-serif !important;";
var TEXT_STYLE = "font: 400 13px/150% 'gotham_proregular', 'opensans_semibold', sans-serif !important; margin-top: 10px !important;";
var TITLE_STYLE = "margin: 0 0 10px !important; font: 400 18px/100% 'Open Sans', sans-serif !important;";
var TEXT_STYLE = "font: 400 13px/150% 'Open Sans', sans-serif !important; margin-top: 10px !important;";

/**
* Shows alert popup.
Expand Down
4 changes: 2 additions & 2 deletions Extension/pages/skin/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
display: inline-block;
padding: 6px 12px;
margin-bottom: 0;
font-family: "gotham_promedium", 'opensans_semibold', sans-serif;
font-family: "Open Sans", sans-serif;
font-size: 14px;
font-weight: normal;
font-weight: 600;
line-height: 1.42857143;
text-align: center;
text-decoration: none;
Expand Down
52 changes: 27 additions & 25 deletions Extension/pages/skin/fonts.css
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
@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-family: 'Open Sans';
src: url('fonts/OpenSans-Regular.eot');
src: url('fonts/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),
url('fonts/OpenSans-Regular.woff') format('woff'),
url('fonts/OpenSans-Regular.ttf') format('truetype'),
url('fonts/OpenSans-Regular.svg#OpenSansRegular') 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-face {
font-family: 'Open Sans';
src: url('fonts/OpenSans-Semibold.eot');
src: url('fonts/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),
url('fonts/OpenSans-Semibold.woff') format('woff'),
url('fonts/OpenSans-Semibold.ttf') format('truetype'),
url('fonts/OpenSans-Semibold.svg#OpenSansSemibold') format('svg');
font-weight: 600;
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-face {
font-family: 'Open Sans';
src: url('fonts/OpenSans-Bold.eot');
src: url('fonts/OpenSans-Bold.eot?#iefix') format('embedded-opentype'),
url('fonts/OpenSans-Bold.woff') format('woff'),
url('fonts/OpenSans-Bold.ttf') format('truetype'),
url('fonts/OpenSans-Bold.svg#OpenSansBold') format('svg');
font-weight: bold;
font-style: normal;
}
}
Binary file added Extension/pages/skin/fonts/OpenSans-Bold.eot
Binary file not shown.
958 changes: 958 additions & 0 deletions Extension/pages/skin/fonts/OpenSans-Bold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Extension/pages/skin/fonts/OpenSans-Bold.ttf
Binary file not shown.
Binary file added Extension/pages/skin/fonts/OpenSans-Bold.woff
Binary file not shown.
Binary file added Extension/pages/skin/fonts/OpenSans-Bold.woff2
Binary file not shown.
Binary file added Extension/pages/skin/fonts/OpenSans-Regular.eot
Binary file not shown.
958 changes: 958 additions & 0 deletions Extension/pages/skin/fonts/OpenSans-Regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added Extension/pages/skin/fonts/OpenSans-Regular.woff
Binary file not shown.
Binary file added Extension/pages/skin/fonts/OpenSans-Regular.woff2
Binary file not shown.
Binary file added Extension/pages/skin/fonts/OpenSans-Semibold.eot
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Extension/pages/skin/fonts/gothaprobol-webfont.woff
Binary file not shown.
Binary file removed Extension/pages/skin/fonts/gothapromed-webfont.eot
Binary file not shown.
Binary file removed Extension/pages/skin/fonts/gothapromed-webfont.svg
Binary file not shown.
Binary file removed Extension/pages/skin/fonts/gothapromed-webfont.ttf
Binary file not shown.
Binary file not shown.
Binary file removed Extension/pages/skin/fonts/gothaproreg-webfont.eot
Binary file not shown.
Binary file not shown.
Binary file removed Extension/pages/skin/fonts/gothaproreg-webfont.ttf
Binary file not shown.
Binary file removed Extension/pages/skin/fonts/gothaproreg-webfont.woff
Binary file not shown.
Binary file not shown.
10 changes: 6 additions & 4 deletions Extension/pages/skin/logpage/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ body {
padding: 13px 21px 13px;
font-size: 13px;
background: #46bb61;
font-family: 'gotham_proregular', 'opensans_semibold', sans-serif;
font-family: 'Open Sans', sans-serif;
text-align: center;
color: #fff;
text-decoration: none;
Expand Down Expand Up @@ -430,7 +430,7 @@ body {
background: #FAFAFA;
}
.adg-modal-window .modal-title{
font-family: 'gotham_prolight', 'gotham_proregular', 'opensans_semibold', sans-serif;
font-family: 'Open Sans', sans-serif;
padding: 5px 30px;
font-size: 20px;
text-align: center;
Expand All @@ -455,7 +455,8 @@ body {
word-break: break-all;
}
.adg-modal-window-locking-info-left-col:first-of-type{
font-family: 'gotham_promedium', 'opensans_semibold', sans-serif;
font-family: 'Open Sans', sans-serif;
font-weight: 600;
}
.adg-modal-window-locking-info-left-col:first-child{
-webkit-box-sizing: border-box;
Expand Down Expand Up @@ -499,7 +500,8 @@ body {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
font-family: 'gotham_promedium', 'opensans_semibold', sans-serif;
font-family: 'Open Sans', sans-serif;
font-weight: 600
}
.addition-rule-row-right{
float: right;
Expand Down
12 changes: 6 additions & 6 deletions Extension/pages/skin/my.css
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ a.sp-table-row-info:hover {
width: 100%;
top: 45%;
text-align: center;
font: 400 14px/100% 'gotham_proregular', 'opensans_semibold', sans-serif;
font: 400 14px/100% 'Open Sans', sans-serif;
color: #999;
}

.sp-lists-filters-empty {
text-align: center;
font: 400 14px/100% 'gotham_proregular', 'opensans_semibold', sans-serif;
font: 400 14px/100% 'Open Sans', sans-serif;
color: #999;
line-height: 22px;
}
Expand Down Expand Up @@ -274,13 +274,13 @@ a.spl-user-add-spn {

.popup-footer span {
color: #8f9b92;
font: 400 14px 'gotham_proregular', 'opensans_semibold', sans-serif-webkit-body;
font: 400 14px 'Open Sans', sans-serif-webkit-body;
vertical-align: middle;
}

.popup-footer a {
color: #8f9b92;
font: 400 14px 'gotham_proregular', 'opensans_semibold', sans-serif-webkit-body;
font: 400 14px 'Open Sans', sans-serif-webkit-body;
}

.updates-filter-popup {
Expand Down Expand Up @@ -330,7 +330,7 @@ a.spl-user-add-spn {
}

.m-feedback-actions-error {
font: 400 12px/100% 'gotham_proregular', 'opensans_semibold', sans-serif;
font: 400 12px/100% 'Open Sans', sans-serif;
color: #ff0000;
display: none;
float: left;
Expand All @@ -349,7 +349,7 @@ a.spl-user-add-spn {
font-size: 12px;
font-weight: normal;
margin-top: 10px;
font-family: 'gotham_proregular', 'opensans_semibold', sans-serif;
font-family: 'Open Sans', sans-serif;
display: none;
}

Expand Down
Loading

0 comments on commit 0ea2a0f

Please sign in to comment.