Skip to content

Commit

Permalink
Merge pull request #850 from muxahuk/1.x
Browse files Browse the repository at this point in the history
Crossbrowser font support
  • Loading branch information
Eugeny committed Jan 4, 2016
2 parents bb12e35 + 57b4fad commit 9457351
Show file tree
Hide file tree
Showing 27 changed files with 5,226 additions and 17 deletions.
5 changes: 5 additions & 0 deletions ajenti/plugins/main/content/css/icons.i.less
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@

position: relative;
//top: -4px;

/* Better font rendering */
text-rendering: auto;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}


Expand Down
57 changes: 40 additions & 17 deletions ajenti/plugins/main/content/css/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,54 @@


@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url(main/OpenSans.woff) format('woff');
font-family: 'Open Sans';
src: url('main/fonts/opensans-regular.eot');
src: local('Open Sans'), local('OpenSans'), local('OpenSans-Regular'),
url('main/fonts/opensans-regular.eot?#iefix') format('embedded-opentype'),
url('main/fonts/opensans-regular.woff2') format('woff2'),
url('main/fonts/opensans-regular.woff') format('woff'),
url('main/fonts/opensans-regular.ttf') format('truetype'),
url('main/fonts/opensans-regular.svg#open_sansregular') format('svg');
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(main/OpenSans-Bold.woff) format('woff');
font-family: 'Open Sans';
src: url('main/fonts/opensans-bold.eot');
src: local('Open Sans Bold'), local('OpenSans-Bold'),
url('main/fonts/opensans-bold.eot?#iefix') format('embedded-opentype'),
url('main/fonts/opensans-bold.woff2') format('woff2'),
url('main/fonts/opensans-bold.woff') format('woff'),
url('main/fonts/opensans-bold.ttf') format('truetype'),
url('main/fonts/opensans-bold.svg#open_sansbold') format('svg');
font-weight: 700;
font-style: normal;
}

@font-face {
font-family: 'PT Sans';
font-style: normal;
font-weight: 700;
src: local('PT Sans Bold'), local('PTSans-Bold'), url(main/PS-Bold.woff) format('woff');
font-family: 'PT Sans';
src: url('pt_sans-web-bold.eot');
src: local('PT Sans Bold'), local('PTSans-Bold'), local('PT_Sans-Bold')
url('main/fonts/pt_sans-web-bold.eot?#iefix') format('embedded-opentype'),
url('main/fonts/pt_sans-web-bold.woff2') format('woff2'),
url('main/fonts/pt_sans-web-bold.woff') format('woff'),
url('main/fonts/pt_sans-web-bold.ttf') format('truetype'),
url('main/fonts/pt_sans-web-bold.svg#pt_sansbold') format('svg');
font-weight: 700;
font-style: normal;
}

@font-face {
font-family: 'FontAwesome';
src: url(main/fontawesome.woff) format('woff');
font-weight: normal;
font-style: normal;
font-family: 'FontAwesome';
src: url('main/fonts/fontawesome-webfont.eot?v=4.5.0');
src: url('main/fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'),
url('main/fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'),
url('main/fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'),
url('main/fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'),
url('main/fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}

html {
Expand Down Expand Up @@ -456,4 +479,4 @@ body.auth {
@import "controls.dialogs.i.less";
@import "controls.select2.i.less";

@import "jquery.ui.i.less";
@import "jquery.ui.i.less";
Binary file not shown.
Binary file removed ajenti/plugins/main/content/static/OpenSans.woff
Binary file not shown.
Binary file removed ajenti/plugins/main/content/static/PS-Bold.woff
Binary file not shown.
Binary file removed ajenti/plugins/main/content/static/fontawesome.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
655 changes: 655 additions & 0 deletions ajenti/plugins/main/content/static/fonts/fontawesome-webfont.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 not shown.
Binary file not shown.
Binary file not shown.
1,824 changes: 1,824 additions & 0 deletions ajenti/plugins/main/content/static/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 not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1,824 changes: 1,824 additions & 0 deletions ajenti/plugins/main/content/static/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 not shown.
Binary file not shown.
Binary file not shown.
878 changes: 878 additions & 0 deletions ajenti/plugins/main/content/static/fonts/pt_sans-web-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 not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 9457351

Please sign in to comment.