Merge pull request #407 from thierrytiti/CSS-font-path
CSS: Fonts Path: editable $font-path via sass/variables.scss
This commit is contained in:
commit
0e47e72cf4
@ -14,6 +14,7 @@ Changelog
|
|||||||
* CSS fix: position and width of the div #conversejs [thierrytiti]
|
* CSS fix: position and width of the div #conversejs [thierrytiti]
|
||||||
* CSS fix: room-info bug on hover after room description loaded [thierrytiti]
|
* CSS fix: room-info bug on hover after room description loaded [thierrytiti]
|
||||||
* I18N: Autodetection of User Locale if no i18n setting is set. [thierrytiti]
|
* I18N: Autodetection of User Locale if no i18n setting is set. [thierrytiti]
|
||||||
|
* CSS: Fonts Path: editabable $font-path via sass/variables.scss [thierrytiti]
|
||||||
|
|
||||||
0.9.3 (2015-05-01)
|
0.9.3 (2015-05-01)
|
||||||
------------------
|
------------------
|
||||||
|
@ -8,10 +8,12 @@
|
|||||||
|
|
||||||
@import "../ruby/1.9.1/gems/bourbon-4.2.1/app/assets/stylesheets/_bourbon";
|
@import "../ruby/1.9.1/gems/bourbon-4.2.1/app/assets/stylesheets/_bourbon";
|
||||||
|
|
||||||
|
@import "variables";
|
||||||
|
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Converse-js';
|
font-family: 'Converse-js';
|
||||||
src: url('../fonticons/fonts/icomoon.eot?-mnoxh0');
|
src: url($font-path + 'icomoon.eot?-mnoxh0');
|
||||||
src: url('../fonticons/fonts/icomoon.eot?#iefix-mnoxh0') format("embedded-opentype"), url('../fonticons/fonts/icomoon.woff?-mnoxh0') format("woff"), url('../fonticons/fonts/icomoon.ttf?-mnoxh0') format("truetype"), url('../fonticons/fonts/icomoon.svg?-mnoxh0#icomoon') format("svg");
|
src: url($font-path + 'icomoon.eot?#iefix-mnoxh0') format("embedded-opentype"), url($font-path + 'icomoon.woff?-mnoxh0') format("woff"), url($font-path + 'icomoon.ttf?-mnoxh0') format("truetype"), url($font-path + 'icomoon.svg?-mnoxh0#icomoon') format("svg");
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
|
@ -37,3 +37,4 @@
|
|||||||
$mobile-chat-width: 100%;
|
$mobile-chat-width: 100%;
|
||||||
$mobile-chat-height: 400px;
|
$mobile-chat-height: 400px;
|
||||||
|
|
||||||
|
$font-path: "../fonticons/fonts/";
|
||||||
|
Loading…
Reference in New Issue
Block a user