diff --git a/resources/public/css/fonts.css b/resources/public/css/fonts.css new file mode 100644 index 0000000..f76c645 --- /dev/null +++ b/resources/public/css/fonts.css @@ -0,0 +1,61 @@ +@font-face { + font-family: 'Input Sans'; + font-style: normal; + font-weight: 400; + src: url('/fonts/input-sans/Input-Regular_(InputSans-Regular).ttf'); + +} + +@font-face { + font-family: 'Input Sans'; + font-style: italic; + font-weight: 400; + src: url('/fonts/input-sans/Input-Italic_(InputSans-Italic).ttf'); + +} + +@font-face { + font-family: 'Input Sans'; + font-style: normal; + font-weight: 700; + src: url('/fonts/input-sans/Input-Bold_(InputSans-Bold).ttf'); + +} + +@font-face { + font-family: 'Input Sans'; + font-style: italic; + font-weight: 700; + src: url('/fonts/input-sans/Input-BoldItalic_(InputSans-BoldItalic).ttf'); +} + +@font-face { + font-family: 'Input Serif'; + font-style: normal; + font-weight: 400; + src: url('/fonts/input-serif/Input-Regular_(InputSerif-Regular).ttf'); + +} + +@font-face { + font-family: 'Input Serif'; + font-style: italic; + font-weight: 400; + src: url('/fonts/input-serif/Input-Italic_(InputSerif-Italic).ttf'); + +} + +@font-face { + font-family: 'Input Serif'; + font-style: normal; + font-weight: 700; + src: url('/fonts/input-serif/Input-Bold_(InputSerif-Bold).ttf'); + +} + +@font-face { + font-family: 'Input Serif'; + font-style: italic; + font-weight: 700; + src: url('/fonts/input-serif/Input-BoldItalic_(InputSerif-BoldItalic).ttf'); +} diff --git a/resources/public/fonts/input-sans/Input-BoldItalic_(InputSans-BoldItalic).ttf b/resources/public/fonts/input-sans/Input-BoldItalic_(InputSans-BoldItalic).ttf new file mode 100644 index 0000000..4fe57c8 Binary files /dev/null and b/resources/public/fonts/input-sans/Input-BoldItalic_(InputSans-BoldItalic).ttf differ diff --git a/resources/public/fonts/input-sans/Input-Bold_(InputSans-Bold).ttf b/resources/public/fonts/input-sans/Input-Bold_(InputSans-Bold).ttf new file mode 100644 index 0000000..e8f1b82 Binary files /dev/null and b/resources/public/fonts/input-sans/Input-Bold_(InputSans-Bold).ttf differ diff --git a/resources/public/fonts/input-sans/Input-Italic_(InputSans-Italic).ttf b/resources/public/fonts/input-sans/Input-Italic_(InputSans-Italic).ttf new file mode 100644 index 0000000..0a80f99 Binary files /dev/null and b/resources/public/fonts/input-sans/Input-Italic_(InputSans-Italic).ttf differ diff --git a/resources/public/fonts/input-sans/Input-Regular_(InputSans-Regular).ttf b/resources/public/fonts/input-sans/Input-Regular_(InputSans-Regular).ttf new file mode 100644 index 0000000..d5e349d Binary files /dev/null and b/resources/public/fonts/input-sans/Input-Regular_(InputSans-Regular).ttf differ diff --git a/resources/public/fonts/input-serif/Input-BoldItalic_(InputSerif-BoldItalic).ttf b/resources/public/fonts/input-serif/Input-BoldItalic_(InputSerif-BoldItalic).ttf new file mode 100644 index 0000000..51443e4 Binary files /dev/null and b/resources/public/fonts/input-serif/Input-BoldItalic_(InputSerif-BoldItalic).ttf differ diff --git a/resources/public/fonts/input-serif/Input-Bold_(InputSerif-Bold).ttf b/resources/public/fonts/input-serif/Input-Bold_(InputSerif-Bold).ttf new file mode 100644 index 0000000..3fd5ef8 Binary files /dev/null and b/resources/public/fonts/input-serif/Input-Bold_(InputSerif-Bold).ttf differ diff --git a/resources/public/fonts/input-serif/Input-Italic_(InputSerif-Italic).ttf b/resources/public/fonts/input-serif/Input-Italic_(InputSerif-Italic).ttf new file mode 100644 index 0000000..effd09f Binary files /dev/null and b/resources/public/fonts/input-serif/Input-Italic_(InputSerif-Italic).ttf differ diff --git a/resources/public/fonts/input-serif/Input-Regular_(InputSerif-Regular).ttf b/resources/public/fonts/input-serif/Input-Regular_(InputSerif-Regular).ttf new file mode 100644 index 0000000..69ab4ce Binary files /dev/null and b/resources/public/fonts/input-serif/Input-Regular_(InputSerif-Regular).ttf differ diff --git a/src_clj/sketchbook/handler.clj b/src_clj/sketchbook/handler.clj index 4208110..3035231 100644 --- a/src_clj/sketchbook/handler.clj +++ b/src_clj/sketchbook/handler.clj @@ -49,6 +49,7 @@ (GET "/:sketch" [sketch] (let [sketch-item ((keyword sketch) sketches/sketches)] (views/sketch-page (:title sketch-item) sketch))) + (route/resources "/") (route/not-found "Not Found")) (def app diff --git a/src_clj/sketchbook/style.clj b/src_clj/sketchbook/style.clj index 12d8d94..2c8e667 100644 --- a/src_clj/sketchbook/style.clj +++ b/src_clj/sketchbook/style.clj @@ -8,16 +8,16 @@ :large "21px" :huge "28px"}) -(defn sketch-thumbnail-styles - "Styles for sketch thumbnails" - [] - [:h3.sketch-thumbnail-title - {:font-size (:small sizes) - :margin-bottom 0 - :text-transform "uppercase"}]) - -(def stylesheet-css - (css (sketch-thumbnail-styles))) +(def fonts + {:input-sans ["'Input Sans'" "'Helvetica Neue'" "sans-serif"] + :input-serif ["'Input Serif'" "'Times New Roman'" "serif"]}) (defn stylesheet [] - stylesheet-css) + (css + [:h1 :h2 :h3 :h4 :h5 + {:font-family (:input-serif fonts)}] + [:h3.sketch-thumbnail-title + {:font-size (:small sizes) + :font-weight "normal" + :margin-bottom 0 + :text-transform "uppercase"}])) diff --git a/src_clj/sketchbook/views.clj b/src_clj/sketchbook/views.clj index be679c5..15ba6f6 100644 --- a/src_clj/sketchbook/views.clj +++ b/src_clj/sketchbook/views.clj @@ -7,6 +7,7 @@ [& body] `(html5 [:head + (include-css "/css/fonts.css") (include-css "stylesheet")] [:body ~@body]))