Skip to content
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.

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

woff, woff2 for regular, italic, bold and bolditalic with scss changes for cayman #29

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file removed inst/resources/fonts/open-sans-400.woff
Binary file not shown.
Binary file removed inst/resources/fonts/open-sans-700.woff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
31 changes: 26 additions & 5 deletions not_in_package/architect/architect.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,38 @@ $block-padding: 20px;
}
}

//+ Local fonts
@font-face {
font-family: "Open Sans";
font-style: normal;
font-weight: 400;
src: local("Open Sans"), local("OpenSans"), url("fonts/open-sans-400.woff") format("woff");
src: local("Open Sans Regular"),
local("OpenSans-Regular"),
url("fonts/open-sans-v18-latin-ext_latin-regular.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: italic;
font-weight: 400;
src: local("Open Sans Italic"),
local("OpenSans-Italic"),
url("fonts/open-sans-v18-latin-ext_latin-italic.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: normal;
font-weight: 700;
src: local("Open Sans Bold"), local("OpenSans-Bold"), url("fonts/open-sans-700.woff") format("woff");
src: local("Open Sans Bold"),
local("OpenSans-Bold"),
url("fonts/open-sans-v18-latin-ext_latin-700.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: italic;
font-weight: 700;
src: local("Open Sans Bold Italic"),
local("OpenSans-BoldItalic"),
url("fonts/open-sans-v18-latin-ext_latin-700italic.woff2") format("woff2");
}

* {
Expand Down Expand Up @@ -132,7 +153,7 @@ header {
line-height: 1;
color: $header-main-color;
}

.subtitle {
margin-top: 0;
margin-bottom: 1em;
Expand All @@ -141,7 +162,7 @@ header {
line-height: 1.3;
color: $header-secondary-color;
}

.author, .date {
margin-top: 0;
margin-bottom: 0.75em;
Expand Down Expand Up @@ -297,7 +318,7 @@ ol {
font-weight: 700;
color: $section-title-color;
letter-spacing: -1px;

&:before {
padding-right: 0.3em;
margin-left: -0.8em;
Expand Down
26 changes: 23 additions & 3 deletions not_in_package/cayman/cayman.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,33 @@ $table-odd-row-bg-color: #f2f2f2 !default;
font-family: "Open Sans";
font-style: normal;
font-weight: 400;
src: local("Open Sans"), local("OpenSans"), url("fonts/open-sans-400.woff") format("woff");
src: local("Open Sans Regular"),
local("OpenSans-Regular"),
url("fonts/open-sans-v18-latin-ext_latin-regular.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: italic;
font-weight: 400;
src: local("Open Sans Italic"),
local("OpenSans-Italic"),
url("fonts/open-sans-v18-latin-ext_latin-italic.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: normal;
font-weight: 700;
src: local("Open Sans Bold"), local("OpenSans-Bold"), url("fonts/open-sans-700.woff") format("woff");
src: local("Open Sans Bold"),
local("OpenSans-Bold"),
url("fonts/open-sans-v18-latin-ext_latin-700.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: italic;
font-weight: 700;
src: local("Open Sans Bold Italic"),
local("OpenSans-BoldItalic"),
url("fonts/open-sans-v18-latin-ext_latin-700italic.woff2") format("woff2");
}

* {
Expand Down Expand Up @@ -324,7 +344,7 @@ a {
//+
line-height: 1.45;
overflow: auto;

//+
@include small {
font-size: 0.9rem;
Expand Down
37 changes: 29 additions & 8 deletions not_in_package/hpstr/_sass/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,38 @@ $front-page-feature-image-height : 300px; // min 150px recommended
/*
Typography
========================================================================== */
//+ Local fonts
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url('fonts/open-sans-400.woff') format('woff');
font-family: "Open Sans";
font-style: normal;
font-weight: 400;
src: local("Open Sans Regular"),
local("OpenSans-Regular"),
url("fonts/open-sans-v18-latin-ext_latin-regular.woff2") format("woff2");
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url('fonts/open-sans-700.woff') format('woff');
font-family: "Open Sans";
font-style: italic;
font-weight: 400;
src: local("Open Sans Italic"),
local("OpenSans-Italic"),
url("fonts/open-sans-v18-latin-ext_latin-italic.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: normal;
font-weight: 700;
src: local("Open Sans Bold"),
local("OpenSans-Bold"),
url("fonts/open-sans-v18-latin-ext_latin-700.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: italic;
font-weight: 700;
src: local("Open Sans Bold Italic"),
local("OpenSans-BoldItalic"),
url("fonts/open-sans-v18-latin-ext_latin-700italic.woff2") format("woff2");
}
$base-font : 'Open Sans', 'Lato', Calibri, Arial, sans-serif;
$heading-font : $base-font;
Expand Down
38 changes: 29 additions & 9 deletions not_in_package/leonids/_sass/components/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,38 @@
* Global Variables
*/

// Google font import
//+ Local fonts
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url('fonts/open-sans-400.woff') format('woff');
font-family: "Open Sans";
font-style: normal;
font-weight: 400;
src: local("Open Sans Regular"),
local("OpenSans-Regular"),
url("fonts/open-sans-v18-latin-ext_latin-regular.woff2") format("woff2");
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
src: local('Open Sans Bold'), local('OpenSans-Bold'), url('fonts/open-sans-700.woff') format('woff');
font-family: "Open Sans";
font-style: italic;
font-weight: 400;
src: local("Open Sans Italic"),
local("OpenSans-Italic"),
url("fonts/open-sans-v18-latin-ext_latin-italic.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: normal;
font-weight: 700;
src: local("Open Sans Bold"),
local("OpenSans-Bold"),
url("fonts/open-sans-v18-latin-ext_latin-700.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: italic;
font-weight: 700;
src: local("Open Sans Bold Italic"),
local("OpenSans-BoldItalic"),
url("fonts/open-sans-v18-latin-ext_latin-700italic.woff2") format("woff2");
}

// Custom variables
Expand Down
26 changes: 23 additions & 3 deletions not_in_package/tactile/tactile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,38 @@ $block-padding: 20px;
}
}

// Local fonts
//+ Local fonts
@font-face {
font-family: "Open Sans";
font-style: normal;
font-weight: 400;
src: local("Open Sans"), local("OpenSans"), url("fonts/open-sans-400.woff") format("woff");
src: local("Open Sans Regular"),
local("OpenSans-Regular"),
url("fonts/open-sans-v18-latin-ext_latin-regular.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: italic;
font-weight: 400;
src: local("Open Sans Italic"),
local("OpenSans-Italic"),
url("fonts/open-sans-v18-latin-ext_latin-italic.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: normal;
font-weight: 700;
src: local("Open Sans Bold"), local("OpenSans-Bold"), url("fonts/open-sans-700.woff") format("woff");
src: local("Open Sans Bold"),
local("OpenSans-Bold"),
url("fonts/open-sans-v18-latin-ext_latin-700.woff2") format("woff2");
}
@font-face {
font-family: "Open Sans";
font-style: italic;
font-weight: 700;
src: local("Open Sans Bold Italic"),
local("OpenSans-BoldItalic"),
url("fonts/open-sans-v18-latin-ext_latin-700italic.woff2") format("woff2");
}

* {
Expand Down