Skip to content

Added default variables for font paths. #123

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

Merged
merged 2 commits into from
Nov 19, 2015
Merged

Added default variables for font paths. #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d889a96
Added variables for font paths.
mlijanto Nov 18, 2015
e425a69
Merge remote-tracking branch 'origin' into bug-fixes
mlijanto Nov 18, 2015
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
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Winstrap",
"version": "0.5.4",
"version": "0.5.5",
"main": [
"src/scss/winstrap.scss"
],
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "git",
"url": "git+https://github.com/winjs/winstrap.git"
},
"version": "0.5.4",
"version": "0.5.5",
"author": "Microsoft",
"contributors": [
"Frederic Perrin",
Expand Down
3 changes: 2 additions & 1 deletion src/scss/win/_resources.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
$icon-font-path: "../fonts/glyphs";
$font-path: "../fonts" !default;
$icon-font-path: "#{$font-path}/glyphs" !default;
2 changes: 2 additions & 0 deletions src/scss/win/_side-navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
// This is for viewports 1 & 2 and lives outside the .side-navigation structure to be visible when .side-navigation is not
a.navigation-btn {
position: relative;
text-align: left;
margin-top: spacing(xs);
padding-left: spacing(sm);
[dir="rtl"] & {
text-align: right;
padding-right: spacing(sm);
}
&:hover {
Expand Down
32 changes: 17 additions & 15 deletions src/scss/win/_type.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,37 @@

@font-face {
font-family: "Selawik";
src: url("../fonts/selawk.eot");
src: url("../fonts/selawk.eot#iefix") format("embedded-opentype"),
url("../fonts/selawk.ttf") format("truetype");
src: url("#{$font-path}/selawk.eot");
src: url("#{$font-path}/selawk.eot#iefix") format("embedded-opentype"),
url("#{$font-path}/selawk.ttf") format("truetype");
}

@font-face {
font-family: "Selawik Bold";
src: url("../fonts/selawkb.eot");
src: url("../fonts/selawkb.eot#iefix") format("embedded-opentype"),
url("../fonts/selawkb.ttf") format("truetype");
src: url("#{$font-path}/selawkb.eot");
src: url("#{$font-path}/selawkb.eot#iefix") format("embedded-opentype"),
url("#{$font-path}/selawkb.ttf") format("truetype");
}

@font-face {
font-family: "Selawik Light";
src: url("../fonts/selawkl.eot");
src: url("../fonts/selawkl.eot#iefix") format("embedded-opentype"),
url("../fonts/selawkl.ttf") format("truetype");
src: url("#{$font-path}/selawkl.eot");
src: url("#{$font-path}/selawkl.eot#iefix") format("embedded-opentype"),
url("#{$font-path}/selawkl.ttf") format("truetype");
}

@font-face {
font-family: "Selawik Semibold";
src: url("../fonts/selawksb.eot");
src: url("../fonts/selawksb.eot#iefix") format("embedded-opentype"),
url("../fonts/selawksb.ttf") format("truetype");
src: url("#{$font-path}/selawksb.eot");
src: url("#{$font-path}/selawksb.eot#iefix") format("embedded-opentype"),
url("#{$font-path}/selawksb.ttf") format("truetype");
}

@font-face {
font-family: "Selawik Semilight";
src: url("../fonts/selawksl.eot");
src: url("../fonts/selawksl.eot#iefix") format("embedded-opentype"),
url("../fonts/selawksl.ttf") format("truetype");
src: url("#{$font-path}/selawksl.eot");
src: url("#{$font-path}/selawksl.eot#iefix") format("embedded-opentype"),
url("#{$font-path}/selawksl.ttf") format("truetype");
}

// Responsive Typography mixin
Expand Down Expand Up @@ -203,3 +203,5 @@ h5 { @extend .type-h5; }
h6 { @extend .type-h6; }

p { @extend .type-p3; }

figcaption { @extend .type-c1 }