Skip to content

Font has been added #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
che wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Font has been added #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/assets/stylesheets/application.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,23 @@
*= require markitup
*/

@font-face {
font-family: 'HelveticaNeueCyrillic';
src: url('../fonts/HelveticaNeueCyrillic-light.eot'); /* IE9 Compat Modes */
src: url('../fonts/HelveticaNeueCyrillic-light.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/HelveticaNeueCyrillic-light.woff') format('woff'), /* Modern Browsers */
url('../fonts/HelveticaNeueCyrillic-light.woff2') format('woff2'), /* Modern Browsers */
url('../fonts/HelveticaNeueCyrillic-light.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/HelveticaNeueCyrillic-light.svg#Bizon') format('svg'); /* Legacy iOS */
font-weight:normal;
font-style:normal;
}

body {
color: #5d6267;
background: #eeeeef url(../images/bg-header.png) repeat-x top left;
font-size: 100%;
font-family: Arial, "DejaVu Sans", "Lucida Sans Unicode", Verdana, sans-serif;
font-family: HelveticaNeueCyrillic, Helvetica, Arial, "DejaVu Sans", "Lucida Sans Unicode", Verdana, sans-serif;
font-size: 13px;
}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blueprint/print.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
body{line-height:1.5;font-family:"Helvetica Neue",Arial,Helvetica,sans-serif;color:#000;background:none;font-size:10pt;}
body{line-height:1.5;font-family:HelveticaNeueCyrillic,Helvetica,"Helvetica Neue",Arial,sans-serif;color:#000;background:none;font-size:10pt;}
.container{background:none;}
hr{background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;}
hr.space{background:#fff;color:#fff;visibility:hidden;}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blueprint/screen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ blockquote:before,blockquote:after,q:before,q:after{content:"";}
blockquote,q{quotes:"" "";}
a img{border:none;}
html{font-size:100.01%;}
body{font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue",Arial,Helvetica,sans-serif;}
body{font-size:75%;color:#222;background:#fff;font-family:HelveticaNeueCyrillic,Helvetica,"Helvetica Neue",Arial,sans-serif;}
h1,h2,h3,h4,h5,h6{font-weight:normal;color:#111;}
h1{font-size:3em;line-height:1;margin-bottom:.5em;}
h2{font-size:2em;margin-bottom:.75em;}
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/jquery-ui.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad

/* Component containers
----------------------------------*/
.ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; }
.ui-widget { font-family: HelveticaNeueCyrillic,Helvetica,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: HelveticaNeueCyrillic,Helvetica,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; }
.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
.ui-widget-content a { color: #222222/*{fcContent}*/; }
.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; }
Expand Down
Loading