diff --git a/site/assets/fonts/FontAwesome.otf b/site/assets/fonts/FontAwesome.otf deleted file mode 100644 index 81c9ad9..0000000 Binary files a/site/assets/fonts/FontAwesome.otf and /dev/null differ diff --git a/site/assets/fonts/bosun03-webfont.eot b/site/assets/fonts/bosun03-webfont.eot deleted file mode 100755 index 800728e..0000000 Binary files a/site/assets/fonts/bosun03-webfont.eot and /dev/null differ diff --git a/site/assets/fonts/bosun03-webfont.svg b/site/assets/fonts/bosun03-webfont.svg deleted file mode 100755 index c2026a4..0000000 --- a/site/assets/fonts/bosun03-webfont.svg +++ /dev/null @@ -1,381 +0,0 @@ - - - \ No newline at end of file diff --git a/site/assets/fonts/bosun03-webfont.ttf b/site/assets/fonts/bosun03-webfont.ttf deleted file mode 100755 index 5197e03..0000000 Binary files a/site/assets/fonts/bosun03-webfont.ttf and /dev/null differ diff --git a/site/assets/fonts/bosun03-webfont.woff b/site/assets/fonts/bosun03-webfont.woff deleted file mode 100755 index 7f83001..0000000 Binary files a/site/assets/fonts/bosun03-webfont.woff and /dev/null differ diff --git a/site/assets/fonts/bosun03-webfont.woff2 b/site/assets/fonts/bosun03-webfont.woff2 deleted file mode 100755 index b3821ff..0000000 Binary files a/site/assets/fonts/bosun03-webfont.woff2 and /dev/null differ diff --git a/site/assets/fonts/fontawesome-webfont.eot b/site/assets/fonts/fontawesome-webfont.eot deleted file mode 100644 index 84677bc..0000000 Binary files a/site/assets/fonts/fontawesome-webfont.eot and /dev/null differ diff --git a/site/assets/fonts/fontawesome-webfont.svg b/site/assets/fonts/fontawesome-webfont.svg deleted file mode 100644 index d907b25..0000000 --- a/site/assets/fonts/fontawesome-webfont.svg +++ /dev/null @@ -1,520 +0,0 @@ - - - \ No newline at end of file diff --git a/site/assets/fonts/fontawesome-webfont.ttf b/site/assets/fonts/fontawesome-webfont.ttf deleted file mode 100644 index 96a3639..0000000 Binary files a/site/assets/fonts/fontawesome-webfont.ttf and /dev/null differ diff --git a/site/assets/fonts/fontawesome-webfont.woff b/site/assets/fonts/fontawesome-webfont.woff deleted file mode 100644 index 628b6a5..0000000 Binary files a/site/assets/fonts/fontawesome-webfont.woff and /dev/null differ diff --git a/site/assets/fonts/inconsolata-bold-webfont.woff b/site/assets/fonts/inconsolata-bold-webfont.woff new file mode 100644 index 0000000..a23ab17 Binary files /dev/null and b/site/assets/fonts/inconsolata-bold-webfont.woff differ diff --git a/site/assets/fonts/inconsolata-bold-webfont.woff2 b/site/assets/fonts/inconsolata-bold-webfont.woff2 new file mode 100644 index 0000000..654022b Binary files /dev/null and b/site/assets/fonts/inconsolata-bold-webfont.woff2 differ diff --git a/site/assets/fonts/inconsolata-regular-webfont.woff b/site/assets/fonts/inconsolata-regular-webfont.woff new file mode 100644 index 0000000..a3ad330 Binary files /dev/null and b/site/assets/fonts/inconsolata-regular-webfont.woff differ diff --git a/site/assets/fonts/inconsolata-regular-webfont.woff2 b/site/assets/fonts/inconsolata-regular-webfont.woff2 new file mode 100644 index 0000000..4e3bd17 Binary files /dev/null and b/site/assets/fonts/inconsolata-regular-webfont.woff2 differ diff --git a/site/assets/fonts/inconsolata-webfont.eot b/site/assets/fonts/inconsolata-webfont.eot deleted file mode 100755 index da5fc79..0000000 Binary files a/site/assets/fonts/inconsolata-webfont.eot and /dev/null differ diff --git a/site/assets/fonts/inconsolata-webfont.svg b/site/assets/fonts/inconsolata-webfont.svg deleted file mode 100755 index 742ec33..0000000 --- a/site/assets/fonts/inconsolata-webfont.svg +++ /dev/null @@ -1,239 +0,0 @@ - - - \ No newline at end of file diff --git a/site/assets/fonts/inconsolata-webfont.ttf b/site/assets/fonts/inconsolata-webfont.ttf deleted file mode 100755 index 8492965..0000000 Binary files a/site/assets/fonts/inconsolata-webfont.ttf and /dev/null differ diff --git a/site/assets/fonts/inconsolata-webfont.woff b/site/assets/fonts/inconsolata-webfont.woff deleted file mode 100755 index 95a6fd4..0000000 Binary files a/site/assets/fonts/inconsolata-webfont.woff and /dev/null differ diff --git a/site/assets/fonts/inconsolata-webfont.woff2 b/site/assets/fonts/inconsolata-webfont.woff2 deleted file mode 100755 index cdc8174..0000000 Binary files a/site/assets/fonts/inconsolata-webfont.woff2 and /dev/null differ diff --git a/site/assets/fonts/lato-bold.eot b/site/assets/fonts/lato-bold.eot deleted file mode 100644 index 772087d..0000000 Binary files a/site/assets/fonts/lato-bold.eot and /dev/null differ diff --git a/site/assets/fonts/lato-bold.ttf b/site/assets/fonts/lato-bold.ttf deleted file mode 100644 index 2ddd990..0000000 Binary files a/site/assets/fonts/lato-bold.ttf and /dev/null differ diff --git a/site/assets/fonts/roboto-black-webfont.woff b/site/assets/fonts/roboto-black-webfont.woff new file mode 100644 index 0000000..1516404 Binary files /dev/null and b/site/assets/fonts/roboto-black-webfont.woff differ diff --git a/site/assets/fonts/roboto-black-webfont.woff2 b/site/assets/fonts/roboto-black-webfont.woff2 new file mode 100644 index 0000000..1fe9815 Binary files /dev/null and b/site/assets/fonts/roboto-black-webfont.woff2 differ diff --git a/site/assets/fonts/roboto-blackitalic-webfont.woff b/site/assets/fonts/roboto-blackitalic-webfont.woff new file mode 100644 index 0000000..42c4262 Binary files /dev/null and b/site/assets/fonts/roboto-blackitalic-webfont.woff differ diff --git a/site/assets/fonts/roboto-blackitalic-webfont.woff2 b/site/assets/fonts/roboto-blackitalic-webfont.woff2 new file mode 100644 index 0000000..5eec70b Binary files /dev/null and b/site/assets/fonts/roboto-blackitalic-webfont.woff2 differ diff --git a/site/assets/fonts/roboto-bold-webfont.woff b/site/assets/fonts/roboto-bold-webfont.woff new file mode 100644 index 0000000..0e68c7d Binary files /dev/null and b/site/assets/fonts/roboto-bold-webfont.woff differ diff --git a/site/assets/fonts/roboto-bold-webfont.woff2 b/site/assets/fonts/roboto-bold-webfont.woff2 new file mode 100644 index 0000000..9a3aa0c Binary files /dev/null and b/site/assets/fonts/roboto-bold-webfont.woff2 differ diff --git a/site/assets/fonts/roboto-bolditalic-webfont.woff b/site/assets/fonts/roboto-bolditalic-webfont.woff new file mode 100644 index 0000000..78375f0 Binary files /dev/null and b/site/assets/fonts/roboto-bolditalic-webfont.woff differ diff --git a/site/assets/fonts/roboto-bolditalic-webfont.woff2 b/site/assets/fonts/roboto-bolditalic-webfont.woff2 new file mode 100644 index 0000000..2cf9cd2 Binary files /dev/null and b/site/assets/fonts/roboto-bolditalic-webfont.woff2 differ diff --git a/site/assets/fonts/roboto-italic-webfont.woff b/site/assets/fonts/roboto-italic-webfont.woff new file mode 100644 index 0000000..7bc589c Binary files /dev/null and b/site/assets/fonts/roboto-italic-webfont.woff differ diff --git a/site/assets/fonts/roboto-italic-webfont.woff2 b/site/assets/fonts/roboto-italic-webfont.woff2 new file mode 100644 index 0000000..408d310 Binary files /dev/null and b/site/assets/fonts/roboto-italic-webfont.woff2 differ diff --git a/site/assets/fonts/roboto-light-webfont.woff b/site/assets/fonts/roboto-light-webfont.woff new file mode 100644 index 0000000..61d9e6a Binary files /dev/null and b/site/assets/fonts/roboto-light-webfont.woff differ diff --git a/site/assets/fonts/roboto-light-webfont.woff2 b/site/assets/fonts/roboto-light-webfont.woff2 new file mode 100644 index 0000000..c4ca9ab Binary files /dev/null and b/site/assets/fonts/roboto-light-webfont.woff2 differ diff --git a/site/assets/fonts/roboto-medium-webfont.woff b/site/assets/fonts/roboto-medium-webfont.woff new file mode 100644 index 0000000..a8e6769 Binary files /dev/null and b/site/assets/fonts/roboto-medium-webfont.woff differ diff --git a/site/assets/fonts/roboto-medium-webfont.woff2 b/site/assets/fonts/roboto-medium-webfont.woff2 new file mode 100644 index 0000000..930f36a Binary files /dev/null and b/site/assets/fonts/roboto-medium-webfont.woff2 differ diff --git a/site/assets/fonts/roboto-mediumitalic-webfont.woff b/site/assets/fonts/roboto-mediumitalic-webfont.woff new file mode 100644 index 0000000..6240745 Binary files /dev/null and b/site/assets/fonts/roboto-mediumitalic-webfont.woff differ diff --git a/site/assets/fonts/roboto-mediumitalic-webfont.woff2 b/site/assets/fonts/roboto-mediumitalic-webfont.woff2 new file mode 100644 index 0000000..c54a5a5 Binary files /dev/null and b/site/assets/fonts/roboto-mediumitalic-webfont.woff2 differ diff --git a/site/assets/fonts/roboto-regular-webfont.woff b/site/assets/fonts/roboto-regular-webfont.woff new file mode 100644 index 0000000..ef4f4af Binary files /dev/null and b/site/assets/fonts/roboto-regular-webfont.woff differ diff --git a/site/assets/fonts/roboto-regular-webfont.woff2 b/site/assets/fonts/roboto-regular-webfont.woff2 new file mode 100644 index 0000000..9f5c463 Binary files /dev/null and b/site/assets/fonts/roboto-regular-webfont.woff2 differ diff --git a/site/assets/fonts/roboto-thin-webfont.woff b/site/assets/fonts/roboto-thin-webfont.woff new file mode 100644 index 0000000..3f08850 Binary files /dev/null and b/site/assets/fonts/roboto-thin-webfont.woff differ diff --git a/site/assets/fonts/roboto-thin-webfont.woff2 b/site/assets/fonts/roboto-thin-webfont.woff2 new file mode 100644 index 0000000..7d70569 Binary files /dev/null and b/site/assets/fonts/roboto-thin-webfont.woff2 differ diff --git a/site/assets/scss/elements/_typography.scss b/site/assets/scss/elements/_typography.scss index 98f9245..3f5575e 100644 --- a/site/assets/scss/elements/_typography.scss +++ b/site/assets/scss/elements/_typography.scss @@ -1,41 +1,48 @@ -.h1, -h1 { -} - -.h2, -h2 { -} - -.h3, -h3 { -} - -.h4, -h4 { -} - -.h5, -h5 { -} - -.h6, -h6 { -} - -a { - &:visited { - } - - &:hover { - } - - &:active { - } -} - -.small { -} - -code { - +// .h1, +// h1 { +// } +// +// .h2, +// h2 { +// } +// +// .h3, +// h3 { +// } +// +// .h4, +// h4 { +// } +// +// .h5, +// h5 { +// } +// +// .h6, +// h6 { +// } +// +// a { +// &:visited { +// } +// +// &:hover { +// } +// +// &:active { +// } +// } +// +// .small { +// } +// +// code { +// +// } + +// tahoma + +.sample { + margin: 25px; + font-size: 28px; } diff --git a/site/assets/scss/generic/_reset.scss b/site/assets/scss/generic/_reset.scss index f25ffa2..8be371a 100644 --- a/site/assets/scss/generic/_reset.scss +++ b/site/assets/scss/generic/_reset.scss @@ -25,4 +25,3 @@ ul, *::after { box-sizing: inherit; } - diff --git a/site/assets/scss/tools/_fonts.scss b/site/assets/scss/tools/_fonts.scss index e69de29..ecd09a1 100644 --- a/site/assets/scss/tools/_fonts.scss +++ b/site/assets/scss/tools/_fonts.scss @@ -0,0 +1,48 @@ +@font-face { + font-family: 'roboto'; + font-weight: 300; + font-style: normal; + src: url('/assets/fonts/roboto-light-webfont.woff2') format('woff2'), url('/assets/fonts/roboto-light-webfont.woff') format('woff'); +} + +@font-face { + font-family: 'roboto'; + font-weight: 400; + font-style: italic; + src: url('/assets/fonts/roboto-italic-webfont.woff2') format('woff2'), url('/assets/fonts/roboto-italic-webfont.woff') format('woff'); +} + +@font-face { + font-family: 'roboto'; + font-weight: 400; + font-style: normal; + src: url('/assets/fonts/roboto-regular-webfont.woff2') format('woff2'), url('/assets/fonts/roboto-regular-webfont.woff') format('woff'); +} + +@font-face { + font-family: 'roboto'; + font-weight: 700; + font-style: normal; + src: url('/assets/fonts/roboto-bold-webfont.woff2') format('woff2'), url('/assets/fonts/roboto-bold-webfont.woff') format('woff'); +} + +@font-face { + font-family: 'roboto'; + font-weight: 700; + font-style: italic; + src: url('/assets/fonts/roboto-bolditalic-webfont.woff2') format('woff2'), url('/assets/fonts/roboto-bolditalic-webfont.woff') format('woff'); +} + +@font-face { + font-family: 'inconsolata'; + font-weight: 700; + font-style: normal; + src: url('/assets/fonts/inconsolata-bold-webfont.woff2') format('woff2'), url('/assets/fonts/inconsolata-bold-webfont.woff') format('woff'); +} + +@font-face { + font-family: 'inconsolata'; + font-weight: 400; + font-style: normal; + src: url('/assets/fonts/inconsolata-regular-webfont.woff2') format('woff2'), url('/assets/fonts/inconsolata-regular-webfont.woff') format('woff'); +} diff --git a/site/pages/index.hbs b/site/pages/index.hbs index 4cb25c4..6d2fd91 100644 --- a/site/pages/index.hbs +++ b/site/pages/index.hbs @@ -11,6 +11,17 @@
Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed odio dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui. Sed posuere consectetur est at lobortis. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
+
function thing1(thing2) {
var thing3 = 'some default value';
diff --git a/site/partials/sample.hbs b/site/partials/sample.hbs
new file mode 100644
index 0000000..031b2ec
--- /dev/null
+++ b/site/partials/sample.hbs
@@ -0,0 +1,6 @@
+
+ {{font}} - Nullam quis risus eget urna mollis ornare vel eu leo. Integer
+ posuere erat a ante venenatis dapibus posuere velit aliquet. Maecenas sed
+ diam eget risus varius blandit sit amet non magna. Nulla vitae elit libero,
+ a pharetra augue. Nullam id dolor id nibh ultricies vehicula ut id elit.
+