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

No typekit #2

Open
wants to merge 2 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
3 changes: 0 additions & 3 deletions public/_layout.jade
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
doctype html
html(class="#{ current.source }-body")
head
script(type="text/javascript", src="//use.typekit.net/xzf1kdh.js")
script.
try{Typekit.load();}catch(e){}
link(rel="stylesheet", href="/css/main.css")
link(rel="shortcut icon", href="/favicon.ico?v=1")
body(ng-app='gee')
Expand Down
3 changes: 2 additions & 1 deletion public/_shared/header.jade
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
header.page-header
a(href='/').logo g
a(href='/').logo
img(src="g.svg")

ul
li
Expand Down
11 changes: 6 additions & 5 deletions public/css/partials/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@
color: $base-accent-color;
}


header.page-header {
@include clearfix;
line-height: 0;
.logo {
float: left;
font-family: "bd-jupiter-stencil";
font-size: 40px;
padding: 10px 14px;
padding-bottom: 16px;
border-right: 1px solid $light-gray;
color: $base-accent-color;

img {
margin: 15px 20px;
height: 20px;
}
}
border-bottom: 1px solid $light-gray;
a {
Expand Down
2 changes: 1 addition & 1 deletion public/css/vendor/bitters/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Typography
///////////////////////////////////////////////////////////////////////////////
$sans-serif: "proxima-nova",sans-serif;
$sans-serif: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, sans-serif;
$serif: $georgia;

$base-font-family: $sans-serif;
Expand Down
1 change: 1 addition & 0 deletions public/g.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions public/posts/_layout.jade
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
doctype html
html(class="#{ current.source }-body")
head
script(type="text/javascript", src="//use.typekit.net/xzf1kdh.js")
script.
try{Typekit.load();}catch(e){}
//- link(rel="stylesheet", href="https://use.typekit.net/xzf1kdh.css")
link(rel="stylesheet", href="/lib/prism.css")
link(rel="stylesheet", href="/css/main.css")
link(rel="shortcut icon", href="/favicon.ico?v=1")
Expand Down
2 changes: 2 additions & 0 deletions public/style.jade
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ include _mixins/lorem
h1 Style Guide
p The purpose of this HTML is to help determine what default settings are with Bitters and to make sure that all possible HTML Elements are included in this HTML so as to not miss any possible Elements when designing a site.

section
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="198px" height="398px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><path d="M79.8,159l21.6,0c10.8,0 19.8,-9 19.8,-20.4c0,-10.8 -9,-20.4 -19.8,-20.4l-21.6,0c-12,0 -20.4,-2.4 -28.8,-10.8c-7.8,-8.4 -10.8,-16.2 -10.8,-27.6c0,-11.4 3,-19.8 10.8,-28.2c8.4,-8.4 16.8,-11.4 28.8,-11.4l78.6,0l0,257.4c0,17.4 -4.2,28.8 -15.6,42c-7.8,9.6 -25.2,18 -43.8,18l-49.8,0l0,-160.2c0,-10.2 -9,-19.2 -19.8,-19.2c-10.8,0 -19.8,9 -19.8,19.2l0,180c0,4.8 1.2,8.4 4.2,12.6c4.2,4.8 9,7.2 15.6,7.2l69.6,0c31.8,0 61.2,-15.6 75.6,-32.4c12,-13.2 23.4,-39 23.4,-67.2l0,-277.2c0,-10.8 -8.4,-20.4 -19.2,-20.4l-99,0c-24,0 -40.2,6 -57,22.8c-16.8,17.4 -22.8,33.6 -22.8,57c0,23.4 4.8,39.6 22.2,56.4c16.8,17.4 33.6,22.8 57.6,22.8Z" style="fill:#38dabb;fill-rule:nonzero;"/></svg>

section
header
Expand Down