From: jordan Date: Sun, 8 Jan 2012 20:51:19 +0000 (-0500) Subject: reorganized assets, completed new header X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=990f3aa309186cadeccdaeff1f949d5182444603;p=oweals%2Ffinalsclub.git reorganized assets, completed new header --- diff --git a/.gitignore b/.gitignore index 847479d..aed4476 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,7 @@ results node_modules npm-debug.log + +# Configuration for Guard +Guardfile +.sass-cache/* diff --git a/public/assets/css/fonts.css b/public/assets/css/fonts.css index 8e21284..2ccac59 100755 --- a/public/assets/css/fonts.css +++ b/public/assets/css/fonts.css @@ -1,263 +1,49 @@ @font-face { - font-family: 'MuseoSans500Italic'; - src: url('fonts/museosans_500_italic-webfont.eot'); - src: url('fonts/museosans_500_italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museosans_500_italic-webfont.woff') format('woff'), - url('fonts/museosans_500_italic-webfont.ttf') format('truetype'), - url('fonts/museosans_500_italic-webfont.svg#MuseoSans500Italic') format('svg'); + font-family: 'fonts/futura/FuturaLight'; + src: url('futuralt-light-webfont.eot'); + src: url('futuralt-light-webfont.eot?#iefix') format('embedded-opentype'), + url('futuralt-light-webfont.woff') format('woff'), + url('futuralt-light-webfont.ttf') format('truetype'), + url('futuralt-light-webfont.svg#FuturaLTLight') format('svg'); font-weight: normal; font-style: normal; } @font-face { - font-family: 'MuseoSans100'; - src: url('fonts/museosans-100-webfont.eot'); - src: url('fonts/museosans-100-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museosans-100-webfont.woff') format('woff'), - url('fonts/museosans-100-webfont.ttf') format('truetype'), - url('fonts/museosans-100-webfont.svg#MuseoSans100') format('svg'); + font-family: 'fonts/futura/FuturaOblique'; + src: url('futuralt-oblique-webfont.eot'); + src: url('futuralt-oblique-webfont.eot?#iefix') format('embedded-opentype'), + url('futuralt-oblique-webfont.woff') format('woff'), + url('futuralt-oblique-webfont.ttf') format('truetype'), + url('futuralt-oblique-webfont.svg#FuturaLTOblique') format('svg'); font-weight: normal; font-style: normal; } @font-face { - font-family: 'MuseoSans500'; - src: url('fonts/museosans_500-webfont.eot'); - src: url('fonts/museosans_500-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museosans_500-webfont.woff') format('woff'), - url('fonts/museosans_500-webfont.ttf') format('truetype'), - url('fonts/museosans_500-webfont.svg#MuseoSans500') format('svg'); + font-family: 'fonts/futura/FuturaRegular'; + src: url('futuralt-webfont.eot'); + src: url('futuralt-webfont.eot?#iefix') format('embedded-opentype'), + url('futuralt-webfont.woff') format('woff'), + url('futuralt-webfont.ttf') format('truetype'), + url('futuralt-webfont.svg#FuturaLTRegular') format('svg'); font-weight: normal; font-style: normal; } @font-face { - font-family: 'MuseoSans700'; - src: url('fonts/museosans_700-webfont.eot'); - src: url('fonts/museosans_700-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museosans_700-webfont.woff') format('woff'), - url('fonts/museosans_700-webfont.ttf') format('truetype'), - url('fonts/museosans_700-webfont.svg#MuseoSans700') format('svg'); + font-family: 'FuturaStdBold'; + src: url('futurastd-bold-webfont.eot'); + src: url('futurastd-bold-webfont.eot?#iefix') format('embedded-opentype'), + url('futurastd-bold-webfont.woff') format('woff'), + url('futurastd-bold-webfont.ttf') format('truetype'), + url('futurastd-bold-webfont.svg#FuturaStdBold') format('svg'); font-weight: normal; font-style: normal; } -@font-face { - font-family: 'MuseoSans900'; - src: url('fonts/museosans_900-webfont.eot'); - src: url('fonts/museosans_900-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museosans_900-webfont.woff') format('woff'), - url('fonts/museosans_900-webfont.ttf') format('truetype'), - url('fonts/museosans_900-webfont.svg#MuseoSans900') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSans100Italic'; - src: url('fonts/museosans-100italic-webfont.eot'); - src: url('fonts/museosans-100italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museosans-100italic-webfont.woff') format('woff'), - url('fonts/museosans-100italic-webfont.ttf') format('truetype'), - url('fonts/museosans-100italic-webfont.svg#MuseoSans100Italic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSans300'; - src: url('fonts/museosans-300-webfont.eot'); - src: url('fonts/museosans-300-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museosans-300-webfont.woff') format('woff'), - url('fonts/museosans-300-webfont.ttf') format('truetype'), - url('fonts/museosans-300-webfont.svg#MuseoSans300') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSans900Italic'; - src: url('fonts/museosans-900italic-webfont.eot'); - src: url('fonts/museosans-900italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museosans-900italic-webfont.woff') format('woff'), - url('fonts/museosans-900italic-webfont.ttf') format('truetype'), - url('fonts/museosans-900italic-webfont.svg#MuseoSans900Italic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSans700Italic'; - src: url('fonts/museosans-700italic-webfont.eot'); - src: url('fonts/museosans-700italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museosans-700italic-webfont.woff') format('woff'), - url('fonts/museosans-700italic-webfont.ttf') format('truetype'), - url('fonts/museosans-700italic-webfont.svg#MuseoSans700Italic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSans300Italic'; - src: url('fonts/museosans-300italic-webfont.eot'); - src: url('fonts/museosans-300italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museosans-300italic-webfont.woff') format('woff'), - url('fonts/museosans-300italic-webfont.ttf') format('truetype'), - url('fonts/museosans-300italic-webfont.svg#MuseoSans300Italic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab100Italic'; - src: url('fonts/museo_slab_100italic-webfont.eot'); - src: url('fonts/museo_slab_100italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_100italic-webfont.woff') format('woff'), - url('fonts/museo_slab_100italic-webfont.ttf') format('truetype'), - url('fonts/museo_slab_100italic-webfont.svg#MuseoSlab100Italic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab500'; - src: url('fonts/museo_slab_500-webfont.eot'); - src: url('fonts/museo_slab_500-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_500-webfont.woff') format('woff'), - url('fonts/museo_slab_500-webfont.ttf') format('truetype'), - url('fonts/museo_slab_500-webfont.svg#MuseoSlab500') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab100'; - src: url('fonts/museo_slab_100-webfont.eot'); - src: url('fonts/museo_slab_100-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_100-webfont.woff') format('woff'), - url('fonts/museo_slab_100-webfont.ttf') format('truetype'), - url('fonts/museo_slab_100-webfont.svg#MuseoSlab100') format('svg'); - font-weight: normal; - font-style: normal; - -} -@font-face { - font-family: 'MuseoSlab300'; - src: url('fonts/museo_slab_300-webfont.eot'); - src: url('fonts/museo_slab_300-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_300-webfont.woff') format('woff'), - url('fonts/museo_slab_300-webfont.ttf') format('truetype'), - url('fonts/museo_slab_300-webfont.svg#MuseoSlab300') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab500Italic'; - src: url('fonts/museo_slab_500italic-webfont.eot'); - src: url('fonts/museo_slab_500italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_500italic-webfont.woff') format('woff'), - url('fonts/museo_slab_500italic-webfont.ttf') format('truetype'), - url('fonts/museo_slab_500italic-webfont.svg#MuseoSlab500Italic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab300Italic'; - src: url('fonts/museo_slab_300italic-webfont.eot'); - src: url('fonts/museo_slab_300italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_300italic-webfont.woff') format('woff'), - url('fonts/museo_slab_300italic-webfont.ttf') format('truetype'), - url('fonts/museo_slab_300italic-webfont.svg#MuseoSlab300Italic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab700'; - src: url('fonts/museo_slab_700-webfont.eot'); - src: url('fonts/museo_slab_700-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_700-webfont.woff') format('woff'), - url('fonts/museo_slab_700-webfont.ttf') format('truetype'), - url('fonts/museo_slab_700-webfont.svg#MuseoSlab700') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab1000Italic'; - src: url('fonts/museo_slab_1000italic-webfont.eot'); - src: url('fonts/museo_slab_1000italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_1000italic-webfont.woff') format('woff'), - url('fonts/museo_slab_1000italic-webfont.ttf') format('truetype'), - url('fonts/museo_slab_1000italic-webfont.svg#MuseoSlab1000Italic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab900'; - src: url('fonts/museo_slab_900-webfont.eot'); - src: url('fonts/museo_slab_900-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_900-webfont.woff') format('woff'), - url('fonts/museo_slab_900-webfont.ttf') format('truetype'), - url('fonts/museo_slab_900-webfont.svg#MuseoSlab900') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab700Italic'; - src: url('fonts/museo_slab_700italic-webfont.eot'); - src: url('fonts/museo_slab_700italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_700italic-webfont.woff') format('woff'), - url('fonts/museo_slab_700italic-webfont.ttf') format('truetype'), - url('fonts/museo_slab_700italic-webfont.svg#MuseoSlab700Italic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab900Italic'; - src: url('fonts/museo_slab_900italic-webfont.eot'); - src: url('fonts/museo_slab_900italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_900italic-webfont.woff') format('woff'), - url('fonts/museo_slab_900italic-webfont.ttf') format('truetype'), - url('fonts/museo_slab_900italic-webfont.svg#MuseoSlab900Italic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'MuseoSlab1000'; - src: url('fonts/museo_slab_1000-webfont.eot'); - src: url('fonts/museo_slab_1000-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/museo_slab_1000-webfont.woff') format('woff'), - url('fonts/museo_slab_1000-webfont.ttf') format('truetype'), - url('fonts/museo_slab_1000-webfont.svg#MuseoSlab1000') format('svg'); - font-weight: normal; - font-style: normal; - -} diff --git a/public/assets/css/fonts/futura/futuralt-light-webfont.eot b/public/assets/css/fonts/futura/futuralt-light-webfont.eot new file mode 100755 index 0000000..a9e0936 Binary files /dev/null and b/public/assets/css/fonts/futura/futuralt-light-webfont.eot differ diff --git a/public/assets/css/fonts/futura/futuralt-light-webfont.svg b/public/assets/css/fonts/futura/futuralt-light-webfont.svg new file mode 100755 index 0000000..0a5dc98 --- /dev/null +++ b/public/assets/css/fonts/futura/futuralt-light-webfont.svg @@ -0,0 +1,246 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Futura is a registered trademark of Fundicion Tipografica Neufville S A + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/css/fonts/futura/futuralt-light-webfont.ttf b/public/assets/css/fonts/futura/futuralt-light-webfont.ttf new file mode 100755 index 0000000..5dac1de Binary files /dev/null and b/public/assets/css/fonts/futura/futuralt-light-webfont.ttf differ diff --git a/public/assets/css/fonts/futura/futuralt-light-webfont.woff b/public/assets/css/fonts/futura/futuralt-light-webfont.woff new file mode 100755 index 0000000..ddae9d2 Binary files /dev/null and b/public/assets/css/fonts/futura/futuralt-light-webfont.woff differ diff --git a/public/assets/css/fonts/futura/futuralt-oblique-webfont.eot b/public/assets/css/fonts/futura/futuralt-oblique-webfont.eot new file mode 100755 index 0000000..4930a25 Binary files /dev/null and b/public/assets/css/fonts/futura/futuralt-oblique-webfont.eot differ diff --git a/public/assets/css/fonts/futura/futuralt-oblique-webfont.svg b/public/assets/css/fonts/futura/futuralt-oblique-webfont.svg new file mode 100755 index 0000000..3f33d93 --- /dev/null +++ b/public/assets/css/fonts/futura/futuralt-oblique-webfont.svg @@ -0,0 +1,246 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Futura is a registered trademark of Fundicion Tipografica Neufville S A + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/css/fonts/futura/futuralt-oblique-webfont.ttf b/public/assets/css/fonts/futura/futuralt-oblique-webfont.ttf new file mode 100755 index 0000000..61da788 Binary files /dev/null and b/public/assets/css/fonts/futura/futuralt-oblique-webfont.ttf differ diff --git a/public/assets/css/fonts/futura/futuralt-oblique-webfont.woff b/public/assets/css/fonts/futura/futuralt-oblique-webfont.woff new file mode 100755 index 0000000..e8d0a53 Binary files /dev/null and b/public/assets/css/fonts/futura/futuralt-oblique-webfont.woff differ diff --git a/public/assets/css/fonts/futura/futuralt-webfont.eot b/public/assets/css/fonts/futura/futuralt-webfont.eot new file mode 100755 index 0000000..cf557e8 Binary files /dev/null and b/public/assets/css/fonts/futura/futuralt-webfont.eot differ diff --git a/public/assets/css/fonts/futura/futuralt-webfont.svg b/public/assets/css/fonts/futura/futuralt-webfont.svg new file mode 100755 index 0000000..2f64783 --- /dev/null +++ b/public/assets/css/fonts/futura/futuralt-webfont.svg @@ -0,0 +1,246 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Freestyle Script is a trademark of Esselte Pendaflex Corporation in the USA of Letraset Canada Ltd in Canada and of Esselte Letraset Ltd elsewhere + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/css/fonts/futura/futuralt-webfont.ttf b/public/assets/css/fonts/futura/futuralt-webfont.ttf new file mode 100755 index 0000000..fe89d78 Binary files /dev/null and b/public/assets/css/fonts/futura/futuralt-webfont.ttf differ diff --git a/public/assets/css/fonts/futura/futuralt-webfont.woff b/public/assets/css/fonts/futura/futuralt-webfont.woff new file mode 100755 index 0000000..abc7c26 Binary files /dev/null and b/public/assets/css/fonts/futura/futuralt-webfont.woff differ diff --git a/public/assets/css/fonts/futura/futurastd-bold-webfont.eot b/public/assets/css/fonts/futura/futurastd-bold-webfont.eot new file mode 100755 index 0000000..bd3ab66 Binary files /dev/null and b/public/assets/css/fonts/futura/futurastd-bold-webfont.eot differ diff --git a/public/assets/css/fonts/futura/futurastd-bold-webfont.svg b/public/assets/css/fonts/futura/futurastd-bold-webfont.svg new file mode 100755 index 0000000..0ed92ee --- /dev/null +++ b/public/assets/css/fonts/futura/futurastd-bold-webfont.svg @@ -0,0 +1,247 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Copyright 1987 1991 1993 2002 Adobe Systems Incorporated All Rights Reserved +Designer : Paul Renner +Foundry URL : httpwwwadobecomtype + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/css/fonts/futura/futurastd-bold-webfont.ttf b/public/assets/css/fonts/futura/futurastd-bold-webfont.ttf new file mode 100755 index 0000000..a2f120e Binary files /dev/null and b/public/assets/css/fonts/futura/futurastd-bold-webfont.ttf differ diff --git a/public/assets/css/fonts/futura/futurastd-bold-webfont.woff b/public/assets/css/fonts/futura/futurastd-bold-webfont.woff new file mode 100755 index 0000000..0e2eb0d Binary files /dev/null and b/public/assets/css/fonts/futura/futurastd-bold-webfont.woff differ diff --git a/public/assets/css/fonts/museo/museo_slab_100-webfont.eot b/public/assets/css/fonts/museo/museo_slab_100-webfont.eot deleted file mode 100755 index 7fcd53f..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_100-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_100-webfont.svg b/public/assets/css/fonts/museo/museo_slab_100-webfont.svg deleted file mode 100755 index da443bd..0000000 --- a/public/assets/css/fonts/museo/museo_slab_100-webfont.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved TKrip -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_100-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_100-webfont.ttf deleted file mode 100755 index 4066023..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_100-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_100-webfont.woff b/public/assets/css/fonts/museo/museo_slab_100-webfont.woff deleted file mode 100755 index 3018cf2..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_100-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_1000-webfont.eot b/public/assets/css/fonts/museo/museo_slab_1000-webfont.eot deleted file mode 100755 index 9886bb6..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_1000-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_1000-webfont.svg b/public/assets/css/fonts/museo/museo_slab_1000-webfont.svg deleted file mode 100755 index f4e65d7..0000000 --- a/public/assets/css/fonts/museo/museo_slab_1000-webfont.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved TKrip -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_1000-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_1000-webfont.ttf deleted file mode 100755 index eff0f58..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_1000-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_1000-webfont.woff b/public/assets/css/fonts/museo/museo_slab_1000-webfont.woff deleted file mode 100755 index 0ef32cf..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_1000-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.eot b/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.eot deleted file mode 100755 index ee059e5..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.svg b/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.svg deleted file mode 100755 index 492b1fb..0000000 --- a/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved TKrip -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.ttf deleted file mode 100755 index 01015c7..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.woff b/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.woff deleted file mode 100755 index 6567d2f..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_1000italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_100italic-webfont.eot b/public/assets/css/fonts/museo/museo_slab_100italic-webfont.eot deleted file mode 100755 index 8ee1b3c..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_100italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_100italic-webfont.svg b/public/assets/css/fonts/museo/museo_slab_100italic-webfont.svg deleted file mode 100755 index be83d7e..0000000 --- a/public/assets/css/fonts/museo/museo_slab_100italic-webfont.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved TKrip -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_100italic-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_100italic-webfont.ttf deleted file mode 100755 index 0336f20..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_100italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_100italic-webfont.woff b/public/assets/css/fonts/museo/museo_slab_100italic-webfont.woff deleted file mode 100755 index f7e0983..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_100italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_300-webfont.eot b/public/assets/css/fonts/museo/museo_slab_300-webfont.eot deleted file mode 100755 index d75c3be..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_300-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_300-webfont.svg b/public/assets/css/fonts/museo/museo_slab_300-webfont.svg deleted file mode 100755 index 76527a8..0000000 --- a/public/assets/css/fonts/museo/museo_slab_300-webfont.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved TKrip -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_300-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_300-webfont.ttf deleted file mode 100755 index 5f2feff..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_300-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_300-webfont.woff b/public/assets/css/fonts/museo/museo_slab_300-webfont.woff deleted file mode 100755 index a86e5f8..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_300-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_300italic-webfont.eot b/public/assets/css/fonts/museo/museo_slab_300italic-webfont.eot deleted file mode 100755 index 076b761..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_300italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_300italic-webfont.svg b/public/assets/css/fonts/museo/museo_slab_300italic-webfont.svg deleted file mode 100755 index 05f7f00..0000000 --- a/public/assets/css/fonts/museo/museo_slab_300italic-webfont.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved TKrip -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_300italic-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_300italic-webfont.ttf deleted file mode 100755 index b24c871..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_300italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_300italic-webfont.woff b/public/assets/css/fonts/museo/museo_slab_300italic-webfont.woff deleted file mode 100755 index 3851318..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_300italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_500-webfont.eot b/public/assets/css/fonts/museo/museo_slab_500-webfont.eot deleted file mode 100755 index 1693aeb..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_500-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_500-webfont.svg b/public/assets/css/fonts/museo/museo_slab_500-webfont.svg deleted file mode 100755 index 34cc4fb..0000000 --- a/public/assets/css/fonts/museo/museo_slab_500-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_500-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_500-webfont.ttf deleted file mode 100755 index 8934065..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_500-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_500-webfont.woff b/public/assets/css/fonts/museo/museo_slab_500-webfont.woff deleted file mode 100755 index 80ab166..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_500-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_500italic-webfont.eot b/public/assets/css/fonts/museo/museo_slab_500italic-webfont.eot deleted file mode 100755 index 1ef5851..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_500italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_500italic-webfont.svg b/public/assets/css/fonts/museo/museo_slab_500italic-webfont.svg deleted file mode 100755 index 4169fcb..0000000 --- a/public/assets/css/fonts/museo/museo_slab_500italic-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_500italic-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_500italic-webfont.ttf deleted file mode 100755 index e9ab619..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_500italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_500italic-webfont.woff b/public/assets/css/fonts/museo/museo_slab_500italic-webfont.woff deleted file mode 100755 index ee9b503..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_500italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_700-webfont.eot b/public/assets/css/fonts/museo/museo_slab_700-webfont.eot deleted file mode 100755 index ecc9048..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_700-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_700-webfont.svg b/public/assets/css/fonts/museo/museo_slab_700-webfont.svg deleted file mode 100755 index d5e42b3..0000000 --- a/public/assets/css/fonts/museo/museo_slab_700-webfont.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved TKrip -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_700-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_700-webfont.ttf deleted file mode 100755 index 381a263..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_700-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_700-webfont.woff b/public/assets/css/fonts/museo/museo_slab_700-webfont.woff deleted file mode 100755 index b267530..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_700-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_700italic-webfont.eot b/public/assets/css/fonts/museo/museo_slab_700italic-webfont.eot deleted file mode 100755 index 0a209b9..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_700italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_700italic-webfont.svg b/public/assets/css/fonts/museo/museo_slab_700italic-webfont.svg deleted file mode 100755 index 32ba570..0000000 --- a/public/assets/css/fonts/museo/museo_slab_700italic-webfont.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_700italic-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_700italic-webfont.ttf deleted file mode 100755 index d40e9db..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_700italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_700italic-webfont.woff b/public/assets/css/fonts/museo/museo_slab_700italic-webfont.woff deleted file mode 100755 index 4e59d1a..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_700italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_900-webfont.eot b/public/assets/css/fonts/museo/museo_slab_900-webfont.eot deleted file mode 100755 index 88d8858..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_900-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_900-webfont.svg b/public/assets/css/fonts/museo/museo_slab_900-webfont.svg deleted file mode 100755 index 278fcee..0000000 --- a/public/assets/css/fonts/museo/museo_slab_900-webfont.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_900-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_900-webfont.ttf deleted file mode 100755 index edbf8ef..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_900-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_900-webfont.woff b/public/assets/css/fonts/museo/museo_slab_900-webfont.woff deleted file mode 100755 index 451437b..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_900-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_900italic-webfont.eot b/public/assets/css/fonts/museo/museo_slab_900italic-webfont.eot deleted file mode 100755 index f6eed14..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_900italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_900italic-webfont.svg b/public/assets/css/fonts/museo/museo_slab_900italic-webfont.svg deleted file mode 100755 index a3a8bc6..0000000 --- a/public/assets/css/fonts/museo/museo_slab_900italic-webfont.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2009 by Jos Buivenga All rights reserved TKrip -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwexljbriscom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museo_slab_900italic-webfont.ttf b/public/assets/css/fonts/museo/museo_slab_900italic-webfont.ttf deleted file mode 100755 index c8814da..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_900italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museo_slab_900italic-webfont.woff b/public/assets/css/fonts/museo/museo_slab_900italic-webfont.woff deleted file mode 100755 index 0a65327..0000000 Binary files a/public/assets/css/fonts/museo/museo_slab_900italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-100-webfont.eot b/public/assets/css/fonts/museo/museosans-100-webfont.eot deleted file mode 100755 index 09e509f..0000000 Binary files a/public/assets/css/fonts/museo/museosans-100-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-100-webfont.svg b/public/assets/css/fonts/museo/museosans-100-webfont.svg deleted file mode 100755 index 4a7d867..0000000 --- a/public/assets/css/fonts/museo/museosans-100-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2008 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwjosbuivengademonnl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museosans-100-webfont.ttf b/public/assets/css/fonts/museo/museosans-100-webfont.ttf deleted file mode 100755 index 78a6aaa..0000000 Binary files a/public/assets/css/fonts/museo/museosans-100-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-100-webfont.woff b/public/assets/css/fonts/museo/museosans-100-webfont.woff deleted file mode 100755 index 5465f5a..0000000 Binary files a/public/assets/css/fonts/museo/museosans-100-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-100italic-webfont.eot b/public/assets/css/fonts/museo/museosans-100italic-webfont.eot deleted file mode 100755 index 3876581..0000000 Binary files a/public/assets/css/fonts/museo/museosans-100italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-100italic-webfont.svg b/public/assets/css/fonts/museo/museosans-100italic-webfont.svg deleted file mode 100755 index 1e39199..0000000 --- a/public/assets/css/fonts/museo/museosans-100italic-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2008 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwjosbuivengademonnl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museosans-100italic-webfont.ttf b/public/assets/css/fonts/museo/museosans-100italic-webfont.ttf deleted file mode 100755 index 305da56..0000000 Binary files a/public/assets/css/fonts/museo/museosans-100italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-100italic-webfont.woff b/public/assets/css/fonts/museo/museosans-100italic-webfont.woff deleted file mode 100755 index 8b4e097..0000000 Binary files a/public/assets/css/fonts/museo/museosans-100italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-300-webfont.eot b/public/assets/css/fonts/museo/museosans-300-webfont.eot deleted file mode 100755 index 647c800..0000000 Binary files a/public/assets/css/fonts/museo/museosans-300-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-300-webfont.svg b/public/assets/css/fonts/museo/museosans-300-webfont.svg deleted file mode 100755 index 5c13e6a..0000000 --- a/public/assets/css/fonts/museo/museosans-300-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2008 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwjosbuivengademonnl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museosans-300-webfont.ttf b/public/assets/css/fonts/museo/museosans-300-webfont.ttf deleted file mode 100755 index c25e269..0000000 Binary files a/public/assets/css/fonts/museo/museosans-300-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-300-webfont.woff b/public/assets/css/fonts/museo/museosans-300-webfont.woff deleted file mode 100755 index 8164db9..0000000 Binary files a/public/assets/css/fonts/museo/museosans-300-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-300italic-webfont.eot b/public/assets/css/fonts/museo/museosans-300italic-webfont.eot deleted file mode 100755 index 8159aa9..0000000 Binary files a/public/assets/css/fonts/museo/museosans-300italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-300italic-webfont.svg b/public/assets/css/fonts/museo/museosans-300italic-webfont.svg deleted file mode 100755 index d4b9b1f..0000000 --- a/public/assets/css/fonts/museo/museosans-300italic-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2008 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwjosbuivengademonnl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museosans-300italic-webfont.ttf b/public/assets/css/fonts/museo/museosans-300italic-webfont.ttf deleted file mode 100755 index 81c2e31..0000000 Binary files a/public/assets/css/fonts/museo/museosans-300italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-300italic-webfont.woff b/public/assets/css/fonts/museo/museosans-300italic-webfont.woff deleted file mode 100755 index abf4a1d..0000000 Binary files a/public/assets/css/fonts/museo/museosans-300italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-700italic-webfont.eot b/public/assets/css/fonts/museo/museosans-700italic-webfont.eot deleted file mode 100755 index 102b114..0000000 Binary files a/public/assets/css/fonts/museo/museosans-700italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-700italic-webfont.svg b/public/assets/css/fonts/museo/museosans-700italic-webfont.svg deleted file mode 100755 index 19546c5..0000000 --- a/public/assets/css/fonts/museo/museosans-700italic-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2008 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwjosbuivengademonnl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museosans-700italic-webfont.ttf b/public/assets/css/fonts/museo/museosans-700italic-webfont.ttf deleted file mode 100755 index 0a6dc6b..0000000 Binary files a/public/assets/css/fonts/museo/museosans-700italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-700italic-webfont.woff b/public/assets/css/fonts/museo/museosans-700italic-webfont.woff deleted file mode 100755 index 4f80c18..0000000 Binary files a/public/assets/css/fonts/museo/museosans-700italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-900italic-webfont.eot b/public/assets/css/fonts/museo/museosans-900italic-webfont.eot deleted file mode 100755 index ba1bb17..0000000 Binary files a/public/assets/css/fonts/museo/museosans-900italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-900italic-webfont.svg b/public/assets/css/fonts/museo/museosans-900italic-webfont.svg deleted file mode 100755 index d533514..0000000 --- a/public/assets/css/fonts/museo/museosans-900italic-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2008 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwjosbuivengademonnl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museosans-900italic-webfont.ttf b/public/assets/css/fonts/museo/museosans-900italic-webfont.ttf deleted file mode 100755 index c79b126..0000000 Binary files a/public/assets/css/fonts/museo/museosans-900italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans-900italic-webfont.woff b/public/assets/css/fonts/museo/museosans-900italic-webfont.woff deleted file mode 100755 index 8be9d65..0000000 Binary files a/public/assets/css/fonts/museo/museosans-900italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_500-webfont.eot b/public/assets/css/fonts/museo/museosans_500-webfont.eot deleted file mode 100755 index d274bfd..0000000 Binary files a/public/assets/css/fonts/museo/museosans_500-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_500-webfont.svg b/public/assets/css/fonts/museo/museosans_500-webfont.svg deleted file mode 100755 index 3e36560..0000000 --- a/public/assets/css/fonts/museo/museosans_500-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2008 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwjosbuivengademonnl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museosans_500-webfont.ttf b/public/assets/css/fonts/museo/museosans_500-webfont.ttf deleted file mode 100755 index 70a5979..0000000 Binary files a/public/assets/css/fonts/museo/museosans_500-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_500-webfont.woff b/public/assets/css/fonts/museo/museosans_500-webfont.woff deleted file mode 100755 index 3227d60..0000000 Binary files a/public/assets/css/fonts/museo/museosans_500-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_500_italic-webfont.eot b/public/assets/css/fonts/museo/museosans_500_italic-webfont.eot deleted file mode 100755 index f7df376..0000000 Binary files a/public/assets/css/fonts/museo/museosans_500_italic-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_500_italic-webfont.svg b/public/assets/css/fonts/museo/museosans_500_italic-webfont.svg deleted file mode 100755 index 48e68e7..0000000 --- a/public/assets/css/fonts/museo/museosans_500_italic-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2008 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwjosbuivengademonnl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museosans_500_italic-webfont.ttf b/public/assets/css/fonts/museo/museosans_500_italic-webfont.ttf deleted file mode 100755 index 1b810b2..0000000 Binary files a/public/assets/css/fonts/museo/museosans_500_italic-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_500_italic-webfont.woff b/public/assets/css/fonts/museo/museosans_500_italic-webfont.woff deleted file mode 100755 index 9694a9a..0000000 Binary files a/public/assets/css/fonts/museo/museosans_500_italic-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_700-webfont.eot b/public/assets/css/fonts/museo/museosans_700-webfont.eot deleted file mode 100755 index b414c1f..0000000 Binary files a/public/assets/css/fonts/museo/museosans_700-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_700-webfont.svg b/public/assets/css/fonts/museo/museosans_700-webfont.svg deleted file mode 100755 index 822a04e..0000000 --- a/public/assets/css/fonts/museo/museosans_700-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2008 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwjosbuivengademonnl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museosans_700-webfont.ttf b/public/assets/css/fonts/museo/museosans_700-webfont.ttf deleted file mode 100755 index 8c2876f..0000000 Binary files a/public/assets/css/fonts/museo/museosans_700-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_700-webfont.woff b/public/assets/css/fonts/museo/museosans_700-webfont.woff deleted file mode 100755 index 790e90a..0000000 Binary files a/public/assets/css/fonts/museo/museosans_700-webfont.woff and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_900-webfont.eot b/public/assets/css/fonts/museo/museosans_900-webfont.eot deleted file mode 100755 index 770a823..0000000 Binary files a/public/assets/css/fonts/museo/museosans_900-webfont.eot and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_900-webfont.svg b/public/assets/css/fonts/museo/museosans_900-webfont.svg deleted file mode 100755 index 3e1ce75..0000000 --- a/public/assets/css/fonts/museo/museosans_900-webfont.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2008 by Jos Buivenga All rights reserved -Designer : Jos Buivenga -Foundry : Jos Buivenga -Foundry URL : httpwwwjosbuivengademonnl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/css/fonts/museo/museosans_900-webfont.ttf b/public/assets/css/fonts/museo/museosans_900-webfont.ttf deleted file mode 100755 index 767eaf3..0000000 Binary files a/public/assets/css/fonts/museo/museosans_900-webfont.ttf and /dev/null differ diff --git a/public/assets/css/fonts/museo/museosans_900-webfont.woff b/public/assets/css/fonts/museo/museosans_900-webfont.woff deleted file mode 100755 index 54bbe9a..0000000 Binary files a/public/assets/css/fonts/museo/museosans_900-webfont.woff and /dev/null differ diff --git a/public/assets/css/include.css b/public/assets/css/include.css index 646279a..8e37dc7 100755 --- a/public/assets/css/include.css +++ b/public/assets/css/include.css @@ -1,5 +1,6 @@ @charset "utf-8"; @import "reset.css"; +@import "sprite.css"; @import "screen.css"; -@import "ie.css"; \ No newline at end of file +@import "ie.css"; diff --git a/public/assets/css/reset.css b/public/assets/css/reset.css index af828f6..38e4ae5 100755 --- a/public/assets/css/reset.css +++ b/public/assets/css/reset.css @@ -18,7 +18,6 @@ audio:not([controls]) { display: none; } * 3. Prevent iOS text size adjust on device orientation change, without disabling user zoom: h5bp.com/g */ -* { font-family: "helvetica neue", "helvetica", "arial", "Sans-serif"; } html { overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } diff --git a/public/assets/css/screen.css b/public/assets/css/screen.css index 56d10d7..93fbea6 100755 --- a/public/assets/css/screen.css +++ b/public/assets/css/screen.css @@ -1,5 +1,5 @@ /* -Title: Master styles for screen media +Title: Master styles for screen media Author: Jordan Cooperman, jordan@vectormediagroup.com Year: 2011 @@ -12,11 +12,9 @@ If you have any questions, Don't be shy. Send me a line! 0.General 1.Layout - 2.Navigation - 3.Header - 4.Footer + a.Header + b.Footer 5.Pages - i. 6.Modules 7.Forms 8.Sprites @@ -28,127 +26,98 @@ If you have any questions, Don't be shy. Send me a line! /* borders made from backgrounds */ /* triangles */ /* css3 */ -/* grid container -============================================== */ -.container-12 { - width: 960px; - margin: 0 auto; - position: relative; } - .container-12:after { +.wrapper { + width: 930px; + margin: 0 auto; } + .wrapper:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -/* grid divisions -============================================== */ -.grid-1, -.grid-2, -.grid-3, -.grid-4, -.grid-5, -.grid-6, -.grid-7, -.grid-8, -.grid-9, -.grid-10, -.grid-11, -.grid-12 { - margin: 5px 5px; +.grid-1 { + width: 9.274%; padding: 0; - display: inline; + margin: 0 1.613%; float: left; } -.grid-1 { - width: 7.292%; } - .grid-2 { - width: 15.625%; } + width: 21.774%; + padding: 0; + margin: 0 1.613%; + float: left; } .grid-3 { - width: 23.958%; } + width: 34.274%; + padding: 0; + margin: 0 1.613%; + float: left; } -.grid-4 { - width: 32.292%; } +.grid-4, #site-logo, #nav-masthead { + width: 46.774%; + padding: 0; + margin: 0 1.613%; + float: left; } .grid-5 { - width: 40.625%; } + width: 59.274%; + padding: 0; + margin: 0 1.613%; + float: left; } .grid-6 { - width: 48.958%; } + width: 71.774%; + padding: 0; + margin: 0 1.613%; + float: left; } .grid-7 { - width: 57.292%; } + width: 84.274%; + padding: 0; + margin: 0 1.613%; + float: left; } .grid-8 { - width: 65.625%; } - -.grid-9 { - width: 73.958%; } - -.grid-10 { - width: 82.292%; } - -.grid-11 { - width: 90.625%; } - -.grid-12 { - width: 98.958%; } - -.from-left-1 { - margin-left: 70px; } - -.from-left-2 { - margin-left: 150px; } - -.from-left-3 { - margin-left: 230px; } - -.from-left-4 { - margin-left: 310px; } - -.from-left-5 { - margin-left: 390px; } - -.from-left-6 { - margin-left: 470px; } - -.from-left-7 { - margin-left: 550px; } + width: 96.774%; + padding: 0; + margin: 0 1.613%; + float: left; } -.from-left-8 { - margin-left: 630px; } +.futura, .futura-italic, .futura-light, .futura-bold, #masthead { + font-family: "futura-pt", "Helvetica Neue", "Helvetica", "Arial", sans-serif; + font-weight: 500; + -webkit-font-smoothing: antialiased; } -.from-left-9 { - margin-left: 710px; } +.futura-italic { + font-style: italic; } -.from-left-10 { - margin-left: 790px; } +.futura-light { + font-weight: 300; } -.from-left-11 { - margin-left: 870px; } +.futura-bold { + font-weight: 700; } -.from-left-12 { - margin-left: 950px; } +.minion, .minion-italic, p { + font-family: "minion-pro", "Georgia", serif; + font-weight: 400; + -webkit-font-smoothing: antialiased; } -.grid-centered { - display: block; - float: none; - margin: 0 auto; } +.minion-italic { + font-style: italic; } -* { - font-family: "Verdana", "Helvetica Neue", "Arial", "Sans-serif"; } +.minion-bold { + font-weight: 700; } body { /* 16px / 24px */ font-size: 1em; line-height: 1.5em; } -.small { - /* 13px / 18px */ - font-size: 0.813em; - line-height: 1.385em; } +.small, #nav-user { + /* 14px / 18px */ + font-size: 0.875em; + line-height: 1.286em; } .normal, h3 { /* 16px / 24px */ @@ -156,23 +125,11 @@ body { line-height: 1.5em; /* 24 */ } -.normal-large { - /* 18 / 30 */ - font-size: 1.125em; - line-height: 1.667em; } - -.large, h2, h1 { +.large { /* 26 / 36px */ font-size: 1.625em; line-height: 1.385em; } -.large-huge { - /* 30 / 42px */ - font-size: 1.875em; - line-height: 1.4em; } - .large-huge.spaced { - line-height: 2.4em; } - .huge { /* 42px / 48px */ font-size: 2.625em; @@ -188,47 +145,10 @@ body { font-size: 6.875em; line-height: 1.091em; } -p { - font-size: 1.125em; - /* 18 / 16 */ - font-family: "minion-pro"; } - p .drop-cap { - font-size: 2em; - /* 24 / 12 */ } - -h1, h2, h3, h4, h5, h6 { - font-family: "museo-slab"; - font-weight: 700; - margin: 0; } - -h1 .small { - font-size: 0.66666666666667em; - /* 20 / 30 */ - font-family: "museo-sans"; - font-weight: 300; } - -#user-nav li { - font-family: "museo-sans"; - font-weight: 500; - font-style: italic; } -#user-nav a { - font-family: "museo-sans"; - font-weight: 500; - font-style: normal; } +.tight-line-height, #nav-user ul { + line-height: 1em; } -#main-nav a { - font-family: "museo-slab"; - font-weight: 700; } - -button, -#footer-nav a { - font-family: "museo-sans"; - font-weight: 500; } - -/* - * media queries included - * at end of document - */ +/* media queries included at end of document */ /* 0.`general ============================================== */ ::-moz-selection { @@ -241,22 +161,8 @@ button, color: #fff; text-shadow: none; } -hr.stripes { - margin: 0; - height: 16px; - clear: both; - border-top: 1px solid #e5e5e5; - border-bottom: 1px solid #fff; - background-image: url("../img/bg-stripes.png"); - background-repeat: repeat; - background-color: #fff; } -hr.spacer { - padding: 0; - margin: 10px 0 30px 0; } -hr.heading { - margin-bottom: 16px; } -hr.bordered { - border-bottom: 2px solid #f2b83b; } +h1, h2, h3, h4, h5, h6 { + margin: 0; } button { -moz-border-radius: 5px; @@ -283,119 +189,98 @@ button { -webkit-box-shadow: 2px 2px 0 #4f901b; box-shadow: 2px 2px 0 #4f901b; } -h3.heading { - margin-bottom: 16px; - padding-left: 12px; } - -em { - font-family: "Georgia", "serif"; } - -/* 1.`layout -============================================== */ html, body { height: 100%; margin: 0; } body { - background-image: url("../img/bg-black-noise.gif"); - background-repeat: repeat; } - -.header { - -moz-box-shadow: 0 1px 1px #888888; - -webkit-box-shadow: 0 1px 1px #888888; - box-shadow: 0 1px 1px #888888; - border-top: 1px solid #f2b83b; - position: relative; - z-index: 10; - border-bottom: 2px solid #333; } - .header .container-12 > div { - margin-top: 0; - margin-bottom: 0; } + background-image: url("../img/bg.gif"); + background-position: 20% 0; + border-top: 3px solid #1f1e1c; } .content { - background-color: #fff; - padding: 1em 3%; - min-height: 25em; } + background-color: #fff; } -/* 2.`navigation -============================================== */ -#user-nav { - border-bottom-left-radius: 5px; - -moz-border-radius-bottomleft: 5px; - -webkit-border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px; - -moz-border-radius-bottomright: 5px; - -webkit-border-bottom-right-radius: 5px; +#masthead { + border-top: 1px solid #4c4a46; + border-top: 1px solid rgba(255, 255, 255, 0.2); + border-bottom: 3px solid #ffcd58; } + +#site-logo a { + display: block; + padding: 1.5em; } + +#nav-masthead { + margin-top: -1px; } + +#nav-user { float: right; - background-color: #f2b83b; } - #user-nav li { + padding: 0.375em 0.75em 0.75em; + background-color: #1f1e1c; + border-bottom-left-radius: 8px; + -moz-border-radius-bottomleft: 8px; + -webkit-border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + -moz-border-radius-bottomright: 8px; + -webkit-border-bottom-right-radius: 8px; } + #nav-user li { display: inline-block; + *display: inline; + *zoom: 1; vertical-align: middle; - float: none; - padding: 3px 12px; - color: #fff; } - #user-nav li a { - display: block; - color: #fff; } - -#main-nav { + color: #818181; + border-left: 1px solid #222; + border-left: 1px solid rgba(0, 0, 0, 0.2); } + #nav-user li.first, #nav-user li.first a { + border: 0; } + #nav-user a { + display: block; + padding: 0 0.375em; + color: #818181; + border-left: 1px solid #2a2a2a; + border-left: 1px solid rgba(255, 255, 255, 0.1); } + #nav-user a.username { + font-style: italic; } + +#nav-main { clear: both; } - #main-nav:after { + #nav-main:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } - #main-nav ul { - float: right; } - #main-nav li { + #nav-main ul { + float: right; + padding: 0.375em 0; } + #nav-main li { display: inline-block; vertical-align: middle; float: none; } - #main-nav li a { - -webkit-transition: color 0.25s ease-in-out; - -moz-transition: color 0.25s ease-in-out; - -o-transition: color 0.25s ease-in-out; - -ms-transition: color 0.25s ease-in-out; - transition: color 0.25s ease-in-out; + #nav-main li a { + position: relative; display: block; - padding: 10px; - padding-left: 20px; - text-transform: uppercase; - color: #aaa; } - #main-nav li a.active { - position: relative; - color: #fff; } - #main-nav li a.active em { - position: absolute; - left: 0; - top: 50%; - margin-top: -8px; - background-position: 0 0; - width: 14px; - height: 14px; - background-repeat: no-repeat; } - #main-nav li a em { - text-transform: none; } - #main-nav li a:hover { - color: #eee; } - -/* 3.`header -============================================== */ -#logo { - float: left; - padding: 5px; - margin-left: 10px; - margin-top: 5px; } - -#header { - margin-top: 20px; } - -.highlight { - background-image: url("../img/logo-bg.png"); - background-position: left bottom; - background-repeat: no-repeat; } + padding: 0.375em; + margin-left: 1.5em; + color: #fff; } + #nav-main li a:hover { + color: #ffcd58; } + #nav-main li a .icon { + position: absolute; + left: 0; } + #nav-main li #school_link { + padding-left: 2.1em; } + #nav-main li #school_link .icon { + top: 50%; + margin-top: -10px; } + #nav-main li #blog_link { + padding-left: 1.8em; } + #nav-main li #blog_link .icon { + top: 50%; + margin-top: -9px; } + #nav-main li #archive_link { + padding-left: 1.8em; } /* 4.`footer ============================================== */ @@ -485,6 +370,30 @@ body { .sprite-school { background-image: url("../img/finalsclub-sprite-schools.gif"); } +.paperclip, #nav-main li #school_link .icon, .paperclip-active, #nav-main li #school_link:hover .icon { + background-position: 0 0; + width: 22px; + height: 20px; } + +.paperclip-active, #nav-main li #school_link:hover .icon { + background-position: -24px 0; } + +.align-lines, #nav-main li #blog_link .icon { + background-position: 0 -25px; + width: 24px; + height: 17px; } + +.align-lines-active, #nav-main li #blog_link:hover .icon { + background-position: -27px -25px; } + +.book, #nav-main li #archive_link .icon, .book-active, #nav-main li #archive_link:hover .icon { + background-position: 0 -46px; + width: 19px; + height: 26px; } + +.book-active, #nav-main li #archive_link:hover .icon { + background-position: -24px -46px; } + .brown { background-position: 0 0; width: 61px; @@ -560,9 +469,6 @@ body { padding-top: 16px; padding-bottom: 32px; } -.yellow { - color: #f2b83b; } - .half-width { width: 50%; } @@ -571,203 +477,3 @@ body { .centered-rt-parent { margin: 0 auto; } - - - - -#messages { - text-align: center; - background: #adf; - color: black; - font-weight: bold; - padding: 0.5em 0; -} - -div.school { - - cursor: pointer; cursor: hand; - margin: 1%; - padding: 2%; - border: solid 1px #888; - -moz-border-radius: 0.20em; - -webkit-border-radius: 0.20em; - -webkit-box-shadow: 0 0.2em 0.3em rgba(0, 0, 0, .1); - -moz-box-shadow: 0 0.2em 0.3em rgba(0, 0, 0, .1); - /* - */ -} - -div.school div.name { - font-weight: bold; - font-size: 120%; - margin: 0 0; -} - -div.school div.desc { - font-size: 90%; - color: #888; - font-style: italic; - margin: 0 0; -} - - -div.course { - margin: 1em 0; -} - - -div.press { - margin: 2em 0; -} -img.press { - height: 2.5em; - float: left; - zborder: solid 1px #aaa; - margin: 0 2em 1em 0; -} - -div.press p.date { - font-size: 90%; - color: #68a; -} - -div.press p.readmore { - font-size: 90%; - font-style: italic; -} - -div.press p.readmore a { - color: #48c; -} - -div.conduct { text-align: center; } -div.conduct p.academic { - padding: 2em 0; -} -div.conduct img { - display: inline; - padding: 20px; - border: solid 1px #888; - background: -webkit-gradient(linear, left top, left bottom, from(#fdfdfd), to(#f8f8f8)); - background: -moz-linear-gradient(top, #fdfdfd, #f8f8f8); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcff', endColorstr='#f4f4ff'); - -webkit-border-radius: .2em; - -moz-border-radius: .2em; - border-radius: .2em; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.5); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.5); - box-shadow: 0 1px 2px rgba(0,0,0,.5); -} -div.conduct p.vague { - font-style: italic; - font-size: 80%; - color: #888; -} - - - -.row { - display: table-row; -} -.row .label { - width: 50%; - text-align: right; - display: table-cell; - padding: 0.8em 3% 0.8em 0%; - white-space: nowrap; - font-weight: bold; -} -.row .field { - width: 300px; - - display: table-cell; - padding: 0.2em 0; -} -.row .field input { - width: 90%; -} - -div.content h1 { - color: #000; - text-align: left; - font-weight: bold; - font-family: Georgia, Helvetica; -} - -.content h1 { - border-bottom: 2px solid #5c6572; - zbackground: transparent url("/images/bg_main-heading.gif") 0 100% repeat-x; - font-family: Georgia, helvetica; - font-weight: normal; - font-size: 140%; - padding: 0.2em 0; - margin-bottom: 1em; -} - -#pg_courses { - min-height:700px; -} -#pg_courses #right { - float:right; - width:500px; -} - -.note, .notes_instructor, .notes_head { - margin: 1.0em 0; -} - -.notes_head { - font-weight: bold; -} - -.notes_instructor, .notes_head { - color: #888; -} - -.notes_instructor { - padding-bottom: 1.0em; - border-bottom: solid 1px #aaa; -} - -.note .name { - font-size: 110%; -} -.note .visits { - font-style: italic; - color: #aaa; -} - - -.lecture, .lectures_instructor, .lectures_head { - margin: 1.0em 0; -} - -.lectures_head { - font-weight: bold; -} - -.lectures_instructor, .lectures_head { - color: #888; -} - -.lectures_instructor { - padding-bottom: 1.0em; - border-bottom: solid 1px #aaa; -} - -.lecture .name { - font-size: 110%; -} -.lecture .created { - font-style: italic; - color: #aaa; -} - -.lecture { - margin: 0.5em 0; - padding: 0.5em 1em; - border: solid 1px #888; - -moz-border-radius: 0.20em; - -webkit-border-radius: 0.20em; -} - diff --git a/public/assets/css/scss/includes/grid.scss b/public/assets/css/scss/includes/grid.scss deleted file mode 100755 index ef13c06..0000000 --- a/public/assets/css/scss/includes/grid.scss +++ /dev/null @@ -1,56 +0,0 @@ - -/* grid container -============================================== */ -$cols: 12; -$margin: 5; -$layout-width: 950 + $margin * 2; -$col-width: $layout-width / $cols - $margin * 2; - - -.container-#{$cols} { - @include group; -// width: $layout-width + px; - max-width: 1200px; - min-width: $layout-width + px; - margin: 0 auto; - position: relative; -} - -/* grid divisions -============================================== */ - -.grid-1, -.grid-2, -.grid-3, -.grid-4, -.grid-5, -.grid-6, -.grid-7, -.grid-8, -.grid-9, -.grid-10, -.grid-11, -.grid-12 { - margin: $margin + px $margin + px; - padding: 0; - display: inline; - float: left; -} - -@for $i from 1 through $cols { - .grid-#{$i} { - width: (( ($col_width * $i) + ($margin * 2 * ($i - 1)) ) / $layout-width)*100%; - } -} - -@for $i from 1 through $cols { - .from-left-#{$i} { - margin-left: ($col_width * $i) + ($margin * 2 * ($i - 1)) + px; - } -} - -.grid-centered { - display: block; - float: none; - margin: 0 auto; -} \ No newline at end of file diff --git a/public/assets/css/scss/includes/media.scss b/public/assets/css/scss/includes/media.scss deleted file mode 100755 index 3e13534..0000000 --- a/public/assets/css/scss/includes/media.scss +++ /dev/null @@ -1,11 +0,0 @@ -/* media queries -============================================== */ - -@media only screen and (min-width: 480px) { - - -} - -@media only screen and (min-width: 768px) { - -} diff --git a/public/assets/css/scss/includes/mixins.scss b/public/assets/css/scss/includes/mixins.scss deleted file mode 100755 index c4789c2..0000000 --- a/public/assets/css/scss/includes/mixins.scss +++ /dev/null @@ -1,126 +0,0 @@ -/* positioning */ - -@mixin group { - - &:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; - } -} - -@mixin text-hidden { - text-indent: 0; - line-height: 0; - font-size: 0; -} - -@mixin inline-block { - display: inline-block; - *display: inline; - *zoom: 1; -} - -/* sprites */ - -@mixin sprite-icon { - text-indent: -9999px; - line-height: 0; - font-size: 0; - overflow: hidden; - display: block; - background-image: url("../img/greentech-sprite-icons.png"); - background-repeat: no-repeat; -} - -@mixin sprite-image { - text-indent: -9999px; - line-height: 0; - font-size: 0; - overflow: hidden; - display: block; - background-image: url("../img/greentech-sprite-images.png"); - background-repeat: no-repeat; -} - -/* borders made from backgrounds */ - -@mixin border-vertical-dotted($position) { - background-image: url("../img/border-vertical-dotted.png"); - background-repeat: repeat-y; - background-position: $position top; -} - -@mixin border-horizontal-dotted($position) { - background-image: url("../img/border-horizontal-dotted.png"); - background-repeat: repeat-x; - background-position: left $position; -} - -/* triangles */ - -@mixin triangle-vertical($size: 7px, $position: "bottom", $color: #999, $rgba: rgba(0, 0, 0, 0.7)) { - @include text-hidden; - position : absolute; - height : 0; - width : 0; - border-style : solid; - border-width : $size; - border-color : transparent transparent $color transparent; - border-color : transparent transparent $rgba transparent; - left : 50%; - margin-left : $size * -2; - #{$position} : 0; - -} - -@mixin triangle-angled($size: 4px, $position: "bottom", $color: #333, $rgba: "") { - @include text-hidden; - position : absolute; - height : 0; - width : 0; - border-style : solid; - border-width : $size; - border-color : $color transparent transparent $color; - @if $rgba != "" { - border-color : $rgba transparent transparent $rgba; - } - left : 50%; - margin-left : $size * -2; - #{$position} : $size * -2; -} - -/* css3 */ - -@mixin rounded($radius: 5px) { - -moz-border-radius: $radius; - border-radius: $radius; -} - -@mixin rounded-side($horizontal, $vertical, $magnitude: 5px) { - border-#{$vertical}-#{$horizontal}-radius: $magnitude; - -moz-border-radius-#{$vertical}#{$horizontal}: $magnitude; - -webkit-border-#{$vertical}-#{$horizontal}-radius: $magnitude; -} - -@mixin transition($property, $time: 0.25s) { - -webkit-transition: $property $time ease-in-out; - -moz-transition: $property $time ease-in-out; - -o-transition: $property $time ease-in-out; - -ms-transition: $property $time ease-in-out; - transition: $property $time ease-in-out; -} - -@mixin inner-shadow($horizontal: -5px, $vertical: -5px, $magnitude: 5px, $color: #888) { - -moz-box-shadow: inset $horizontal $vertical $magnitude $color; - -webkit-box-shadow: inset $horizontal $vertical $magnitude $color; - box-shadow: inset $horizontal $vertical $magnitude $color; -} - -@mixin drop-shadow($horizontal: 5px, $vertical: 5px, $magnitude: 5px, $color: #888) { - -moz-box-shadow: $horizontal $vertical $magnitude $color; - -webkit-box-shadow: $horizontal $vertical $magnitude $color; - box-shadow: $horizontal $vertical $magnitude $color; -} diff --git a/public/assets/css/scss/includes/type.scss b/public/assets/css/scss/includes/type.scss deleted file mode 100755 index 71bb9a1..0000000 --- a/public/assets/css/scss/includes/type.scss +++ /dev/null @@ -1,115 +0,0 @@ -$line: 24; -$column: 100% / 18; -$font-size: 16; -$em: $font-size * 1; - -* { - font-family: "Verdana", "Helvetica Neue", "Arial", "Sans-serif"; -} - -body { - /* 16px / 24px */ - font-size: $font-size / 16 * 1em; - line-height: #{$line / $em}em; -} - -.small { - /* 13px / 18px */ - font-size: #{($font-size*0.8125) / $em}em; - line-height: ($line*0.75) / ($font-size*0.8125) * 1em; -} - -.normal, h3 { - /* 16px / 24px */ - font-size: #{$font-size / $em}em; - line-height: #{$line / $em}em; /* 24 */ -} - -.normal-large { - /* 18 / 30 */ - font-size: #{18 / $em}em; - line-height: ($line*1.25) / 18 * 1em; -} - -.large, h2, h1 { - /* 26 / 36px */ - font-size: #{26 / $em}em; - line-height: ($line*1.5) / 26 * 1em; -} - -.large-huge { - /* 30 / 42px */ - font-size: #{30 / $em}em; - line-height: ($line*1.75) / 30 * 1em; - - &.spaced { - line-height: ($line*3) / 30 * 1em; - } -} - -.huge { - /* 42px / 48px */ - font-size: #{42 / $em}em; - line-height: ($line*2) / 42 * 1em; -} - -.massive { - /* 68px / 72px */ - font-size: #{68 / $em}em; - line-height: ($line*2.8) / 68 * 1em; -} - -.gigantic { - /* 110px / 120px */ - font-size: #{110 / $em}em; - line-height: ($line*5) / 110 * 1em; -} - -p { - font-size: 1.125em; /* 18 / 16 */ - font-family: "minion-pro"; - - .drop-cap { - font-size: 2em; /* 24 / 12 */ - } -} - -h1, h2, h3, h4, h5, h6 { - font-family: "museo-slab"; - font-weight: 700; - margin: 0; -} - -h1 { - .small { - font-size: 0.66666666666667em; /* 20 / 30 */ - font-family: "museo-sans"; - font-weight: 300; - } -} - -#user-nav { - li { - font-family: "museo-sans"; - font-weight: 500; - font-style: italic; - } - a { - font-family: "museo-sans"; - font-weight: 500; - font-style: normal; - } -} - -#main-nav { - a { - font-family: "museo-slab"; - font-weight: 700; - } -} - -button, -#footer-nav a { - font-family: "museo-sans"; - font-weight: 500; -} \ No newline at end of file diff --git a/public/assets/css/scss/partials/_grid.scss b/public/assets/css/scss/partials/_grid.scss new file mode 100755 index 0000000..3c64a72 --- /dev/null +++ b/public/assets/css/scss/partials/_grid.scss @@ -0,0 +1,35 @@ +// edit these values +$cols: 8; +$margin: 15; +$layout-width: 900; + +// do not edit these values +$layout-margin-width: $layout-width + $margin * 2; +$col-width: $layout-margin-width / $cols; +$percent-margin: $margin / $layout-margin-width; + +// Grid Container +.wrapper { + width: $layout-margin-width + px; + margin: 0 auto; + + &:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } +} + +// Grid Columns +@for $i from 1 through $cols { + .grid-#{$i} { + width: ( ($col_width * $i / $layout-margin-width) - 2 * $percent-margin) * 100%; + padding: 0; + margin: 0 $percent-margin * 100%; + float: left; + } +} + + diff --git a/public/assets/css/scss/partials/_media.scss b/public/assets/css/scss/partials/_media.scss new file mode 100755 index 0000000..3e13534 --- /dev/null +++ b/public/assets/css/scss/partials/_media.scss @@ -0,0 +1,11 @@ +/* media queries +============================================== */ + +@media only screen and (min-width: 480px) { + + +} + +@media only screen and (min-width: 768px) { + +} diff --git a/public/assets/css/scss/partials/_mixins.scss b/public/assets/css/scss/partials/_mixins.scss new file mode 100755 index 0000000..346553b --- /dev/null +++ b/public/assets/css/scss/partials/_mixins.scss @@ -0,0 +1,129 @@ +/* positioning */ + +@mixin group { + + &:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } +} + +@mixin inline-block( $vertical-align: middle ) { + display: inline-block; + *display: inline; + *zoom: 1; + @if ($vertical-align) { + vertical-align: $vertical-align; + } +} + +@mixin text-hidden { + text-indent: 0; + line-height: 0; + font-size: 0; +} + +/* sprites */ + +@mixin sprite-icon { + text-indent: -9999px; + line-height: 0; + font-size: 0; + overflow: hidden; + display: block; + background-image: url("../img/greentech-sprite-icons.png"); + background-repeat: no-repeat; +} + +@mixin sprite-image { + text-indent: -9999px; + line-height: 0; + font-size: 0; + overflow: hidden; + display: block; + background-image: url("../img/greentech-sprite-images.png"); + background-repeat: no-repeat; +} + +/* borders made from backgrounds */ + +@mixin border-vertical-dotted($position) { + background-image: url("../img/border-vertical-dotted.png"); + background-repeat: repeat-y; + background-position: $position top; +} + +@mixin border-horizontal-dotted($position) { + background-image: url("../img/border-horizontal-dotted.png"); + background-repeat: repeat-x; + background-position: left $position; +} + +/* triangles */ + +@mixin triangle-vertical($size: 7px, $position: "bottom", $color: #999, $rgba: rgba(0, 0, 0, 0.7)) { + @include text-hidden; + position : absolute; + height : 0; + width : 0; + border-style : solid; + border-width : $size; + border-color : transparent transparent $color transparent; + border-color : transparent transparent $rgba transparent; + left : 50%; + margin-left : $size * -2; + #{$position} : 0; + +} + +@mixin triangle-angled($size: 4px, $position: "bottom", $color: #333, $rgba: "") { + @include text-hidden; + position : absolute; + height : 0; + width : 0; + border-style : solid; + border-width : $size; + border-color : $color transparent transparent $color; + @if $rgba != "" { + border-color : $rgba transparent transparent $rgba; + } + left : 50%; + margin-left : $size * -2; + #{$position} : $size * -2; +} + +/* css3 */ + +@mixin rounded($radius: 5px) { + -moz-border-radius: $radius; + border-radius: $radius; +} + +@mixin roundedSide($horizontal, $vertical, $magnitude: 5px) { + border-#{$vertical}-#{$horizontal}-radius: $magnitude; + -moz-border-radius-#{$vertical}#{$horizontal}: $magnitude; + -webkit-border-#{$vertical}-#{$horizontal}-radius: $magnitude; +} + +@mixin transition($property, $time: 0.25s) { + -webkit-transition: $property $time ease-in-out; + -moz-transition: $property $time ease-in-out; + -o-transition: $property $time ease-in-out; + -ms-transition: $property $time ease-in-out; + transition: $property $time ease-in-out; +} + +@mixin inner-shadow($horizontal: -5px, $vertical: -5px, $magnitude: 5px, $color: #888) { + -moz-box-shadow: inset $horizontal $vertical $magnitude $color; + -webkit-box-shadow: inset $horizontal $vertical $magnitude $color; + box-shadow: inset $horizontal $vertical $magnitude $color; +} + +@mixin drop-shadow($horizontal: 5px, $vertical: 5px, $magnitude: 5px, $color: #888) { + -moz-box-shadow: $horizontal $vertical $magnitude $color; + -webkit-box-shadow: $horizontal $vertical $magnitude $color; + box-shadow: $horizontal $vertical $magnitude $color; +} diff --git a/public/assets/css/scss/partials/_type.scss b/public/assets/css/scss/partials/_type.scss index 8e6bbc5..8515e26 100755 --- a/public/assets/css/scss/partials/_type.scss +++ b/public/assets/css/scss/partials/_type.scss @@ -1,11 +1,44 @@ +.futura { + font-family: "futura-pt", "Helvetica Neue", "Helvetica", "Arial", sans-serif; + font-weight: 500; + -webkit-font-smoothing: antialiased; +} + +.futura-italic { + @extend .futura; + font-style: italic; +} + +.futura-light { + @extend .futura; + font-weight: 300; +} + +.futura-bold { + @extend .futura; + font-weight: 700; +} + +.minion { + font-family: "minion-pro", "Georgia", serif; + font-weight: 400; + -webkit-font-smoothing: antialiased; +} + +.minion-italic { + @extend .minion; + font-style: italic; +} + +.minion-bold { + font-weight: 700; +} + $line: 24; $column: 100% / 18; $font-size: 16; $em: $font-size * 1; - -* { - font-family: "Verdana", "Helvetica Neue", "Arial", "Sans-serif"; -} +$base: ($line/$font-size*1em); body { /* 16px / 24px */ @@ -14,9 +47,9 @@ body { } .small { - /* 13px / 18px */ - font-size: #{($font-size*0.8125) / $em}em; - line-height: ($line*0.75) / ($font-size*0.8125) * 1em; + /* 14px / 18px */ + font-size: #{($font-size*0.875) / $em}em; + line-height: ($line*0.75) / ($font-size*0.875) * 1em; } .normal, h3 { @@ -25,28 +58,12 @@ body { line-height: #{$line / $em}em; /* 24 */ } -.normal-large { - /* 18 / 30 */ - font-size: #{18 / $em}em; - line-height: ($line*1.25) / 18 * 1em; -} - -.large, h2, h1 { +.large { /* 26 / 36px */ font-size: #{26 / $em}em; line-height: ($line*1.5) / 26 * 1em; } -.large-huge { - /* 30 / 42px */ - font-size: #{30 / $em}em; - line-height: ($line*1.75) / 30 * 1em; - - &.spaced { - line-height: ($line*3) / 30 * 1em; - } -} - .huge { /* 42px / 48px */ font-size: #{42 / $em}em; @@ -65,51 +82,6 @@ body { line-height: ($line*5) / 110 * 1em; } -p { - font-size: 1.125em; /* 18 / 16 */ - font-family: "minion-pro"; - - .drop-cap { - font-size: 2em; /* 24 / 12 */ - } -} - -h1, h2, h3, h4, h5, h6 { - font-family: "museo-slab"; - font-weight: 700; - margin: 0; -} - -h1 { - .small { - font-size: 0.66666666666667em; /* 20 / 30 */ - font-family: "museo-sans"; - font-weight: 300; - } -} - -#user-nav { - li { - font-family: "museo-sans"; - font-weight: 500; - font-style: italic; - } - a { - font-family: "museo-sans"; - font-weight: 500; - font-style: normal; - } -} - -#main-nav { - a { - font-family: "museo-slab"; - font-weight: 700; - } -} - -button, -#footer-nav a { - font-family: "museo-sans"; - font-weight: 500; +.tight-line-height { + line-height: 1em; } diff --git a/public/assets/css/scss/screen.scss b/public/assets/css/scss/screen.scss index 6b19f66..76308fe 100755 --- a/public/assets/css/scss/screen.scss +++ b/public/assets/css/scss/screen.scss @@ -1,5 +1,5 @@ /* -Title: Master styles for screen media +Title: Master styles for screen media Author: Jordan Cooperman, jordan@vectormediagroup.com Year: 2011 @@ -12,11 +12,9 @@ If you have any questions, Don't be shy. Send me a line! 0.General 1.Layout - 2.Navigation - 3.Header - 4.Footer + a.Header + b.Footer 5.Pages - i. 6.Modules 7.Forms 8.Sprites @@ -24,21 +22,20 @@ If you have any questions, Don't be shy. Send me a line! ----------------------------------------------------------------*/ -$gold: #f2b83b; $blue: #367da9; $dark-blue: #16567e; $green: #78b343; $dark-green: #4f901b; -@import "includes/mixins.scss"; -@import "includes/grid.scss"; -@import "includes/type.scss"; +$dark: #1f1e1c; +$yellow-gold: #ffcd58; +$gold: #ffcd58; -/* - * media queries included - * at end of document - */ +@import "partials/mixins"; +@import "partials/grid"; +@import "partials/type"; +/* media queries included at end of document */ /* 0.`general ============================================== */ @@ -46,28 +43,12 @@ $dark-green: #4f901b; ::-moz-selection { background: #44a1dd; color: #fff; text-shadow: none; } ::selection { background: #44a1dd; color: #fff; text-shadow: none; } - -hr { - &.stripes { +h1, h2, h3, h4, h5, h6 { margin: 0; - height: 16px; - clear: both; - border-top: 1px solid #e5e5e5; - border-bottom: 1px solid #fff; - background-image: url("../img/bg-stripes.png"); - background-repeat: repeat; - background-color: #fff; - } - &.spacer { - padding: 0; - margin : 10px 0 30px 0; - } - &.heading { - margin-bottom: 16px; - } - &.bordered { - border-bottom: 2px solid $gold; - } +} + +p { + @extend .minion; } button { @@ -96,135 +77,161 @@ button { } } -h3.heading { - margin-bottom: 16px; - padding-left: 12px; -} -em { - font-family: "Georgia", "serif"; -} +//************************************* -/* 1.`layout -============================================== */ +// 1.`Layout + +//************************************* html, body { - height : 100%; + height: 100%; margin: 0; } body { - background-image: url("../img/bg-black-noise.gif"); - background-repeat: repeat; + background-image: url("../img/bg.gif"); + background-position: 20% 0; + border-top: 3px solid $dark; } -.header { - @include drop-shadow(0, 1px, 1px, #888); - border-top: 1px solid $gold; - position: relative; - z-index: 10; - border-bottom: 2px solid #333; +.content { background-color: #fff; } + + +//********************* + +// a.`Header + +//********************* + +#masthead { + @extend .futura; + border-top: 1px solid #4c4a46; + border-top: 1px solid rgba( 255, 255, 255, 0.2 ); + border-bottom: 3px solid $gold; +} - .container-#{$cols} { - > div { - margin-top: 0; - margin-bottom: 0; +#site-logo { + @extend .grid-4; + + a { + display: block; + padding: $base; } - } } -.content { background-color: #fff; } +#nav-masthead { + @extend .grid-4; + margin-top: -1px; +} -/* 2.`navigation -============================================== */ +#nav-user { + float: right; + padding: $base/4 $base/2 $base/2; + @extend .small; + background-color: $dark; + @include roundedSide('left', 'bottom', 8px); + @include roundedSide('right', 'bottom', 8px); -#user-nav { - @include rounded-side("left", "bottom"); - @include rounded-side("right", "bottom"); - float: right; - background-color: $gold; + ul { + @extend .tight-line-height; + } - li { - display: inline-block; - vertical-align: middle; - float: none; - padding: 3px 12px; - color: #fff; + li { + @include inline-block( middle ); + color: #818181; + border-left: 1px solid #222; + border-left: 1px solid rgba(0, 0, 0, 0.2); + + &.first, &.first a { + border: 0; + } + } a { - display: block; - color: #fff; + display: block; + padding: 0 $base/4; + color: #818181; + border-left: 1px solid #2a2a2a; + border-left: 1px solid rgba(255, 255, 255, 0.1); + + &.username { + font-style: italic; + } } - } } -#main-nav { +#nav-main { @include group; clear: both; ul { - float: right; + float: right; + padding: $base/4 0; } + li { display: inline-block; vertical-align: middle; float: none; a { - @include transition(color); - display: block; - padding: 10px; - padding-left: 20px; - text-transform: uppercase; - color: #aaa; - - &.active { position: relative; + display: block; + padding: $base/4; + margin-left: $base; color: #fff; - em { - position: absolute; - left: 0; - top: 50%; - margin-top: -8px; - background-position: 0 0; - width: 14px; - height: 14px; - background-repeat: no-repeat; + &:hover { + color: $gold; + } + + .icon { + position: absolute; + left: 0; } - } - em { - text-transform: none; - } - - &:hover { - color: #eee; - } } - } -} + #school_link { + padding-left: $base*1.4; + &:hover .icon { @extend .paperclip-active; } + + .icon { + @extend .paperclip; + top: 50%; + margin-top: -10px; + } + } + + #blog_link { + padding-left: $base*1.2; + + &:hover .icon { @extend .align-lines-active; } + + .icon { + top: 50%; + margin-top: -9px; + @extend .align-lines; + } + } + + #archive_link { + padding-left: $base*1.2; + + &:hover { + + .icon { @extend .book-active; } + } + + .icon { @extend .book; } + } -/* 3.`header -============================================== */ -#logo { - float: left; - padding: 5px; - margin-left: 10px; - margin-top: 5px; -} -#header { - margin-top: 20px; -} -.highlight { - background-image: url("../img/logo-bg.png"); - background-position: left bottom; - background-repeat: no-repeat; -} + } +} /* 4.`footer ============================================== */ @@ -329,6 +336,39 @@ body { .icon { background-image : url('../img/finalsclub-sprite-icons.png'); } .sprite-school { background-image : url("../img/finalsclub-sprite-schools.gif"); } +.paperclip { + background-position: 0 0; + width: 22px; + height: 20px; +} + +.paperclip-active { + @extend .paperclip; + background-position: -24px 0; +} + +.align-lines { + background-position: 0 -25px; + width: 24px; + height: 17px; +} + +.align-lines-active { + @extend align-lines; + background-position: -27px -25px; +} + +.book { + background-position: 0 -46px; + width: 19px; + height: 26px; +} + +.book-active { + @extend .book; + background-position: -24px -46px; +} + .brown { background-position: 0 0; width: 61px; @@ -391,7 +431,7 @@ body { } /* media queries */ -@import "includes/media.scss"; +@import "partials/media"; /* *.`user defined ============================================== */ @@ -402,7 +442,6 @@ body { padding-top: 16px; padding-bottom: 32px; } -.yellow { color: $gold; } .half-width { width: 50%; } .centered { text-align: center;} -.centered-rt-parent { margin: 0 auto;} \ No newline at end of file +.centered-rt-parent { margin: 0 auto;} diff --git a/public/assets/css/sprite.css b/public/assets/css/sprite.css new file mode 100644 index 0000000..9dd6747 --- /dev/null +++ b/public/assets/css/sprite.css @@ -0,0 +1,36 @@ +.book { + display: block; + background: url(../img/finalsclub-sprite-icons.png) no-repeat -26px 0px; + width: 24px; + height: 26px; +} +.book-yellow { + display: block; + background: url(../img/finalsclub-sprite-icons.png) no-repeat 0px 0px; + width: 24px; + height: 26px; +} +.lines { + display: block; + background: url(../img/finalsclub-sprite-icons.png) no-repeat -26px -28px; + width: 24px; + height: 17px; +} +.lines-yellow { + display: block; + background: url(../img/finalsclub-sprite-icons.png) no-repeat 0px -28px; + width: 24px; + height: 17px; +} +.paperclip { + display: block; + background: url(../img/finalsclub-sprite-icons.png) no-repeat -52px -22px; + width: 24px; + height: 20px; +} +.paperclip-yellow { + display: block; + background: url(../img/finalsclub-sprite-icons.png) no-repeat -52px 0px; + width: 24px; + height: 20px; +} diff --git a/public/assets/img/bg-black-noise.gif b/public/assets/img/bg-black-noise.gif deleted file mode 100755 index 34dbe6a..0000000 Binary files a/public/assets/img/bg-black-noise.gif and /dev/null differ diff --git a/public/assets/img/bg.gif b/public/assets/img/bg.gif new file mode 100644 index 0000000..b788bfe Binary files /dev/null and b/public/assets/img/bg.gif differ diff --git a/public/assets/img/finalsclub-sprite-icons.png b/public/assets/img/finalsclub-sprite-icons.png old mode 100755 new mode 100644 index 57d8144..61395a6 Binary files a/public/assets/img/finalsclub-sprite-icons.png and b/public/assets/img/finalsclub-sprite-icons.png differ diff --git a/public/assets/img/logo-bg.png b/public/assets/img/logo-bg.png deleted file mode 100755 index aa5adfa..0000000 Binary files a/public/assets/img/logo-bg.png and /dev/null differ diff --git a/public/assets/img/logo-light.png b/public/assets/img/logo-light.png deleted file mode 100755 index 1952605..0000000 Binary files a/public/assets/img/logo-light.png and /dev/null differ diff --git a/public/assets/img/logo.png b/public/assets/img/logo.png new file mode 100644 index 0000000..9dabd82 Binary files /dev/null and b/public/assets/img/logo.png differ diff --git a/public/index.html b/public/index.html index 557fdbc..ed28d47 100644 --- a/public/index.html +++ b/public/index.html @@ -4,9 +4,9 @@ FinalsClub.org: Online Social Note-Taking + - @@ -17,37 +17,37 @@ -
-
-
- -
-
- - -
+
+
+ +
-
-
+
__msg__
@@ -90,7 +90,6 @@
-

Check out our Screencasts

@@ -646,7 +645,6 @@ Sorry, there is no content for this page.
-