Browse Source

layout improved, JS simplified

master
Christian Mueller 14 years ago
parent
commit
2eef1b0150
  1. 22
      src-cljs/main.cljs
  2. 15
      src/NoteHub/views/common.clj
  3. 6
      src/NoteHub/views/pages.clj

22
src-cljs/main.cljs

@ -6,22 +6,16 @@
[clojure.browser.event :as event] [clojure.browser.event :as event]
[goog.editor.focus :as focus])) [goog.editor.focus :as focus]))
(defn log [obj] (defn $
(.log js/console obj)) "The DOM-element selector."
[selector]
(dom/get-element selector))
(defn $ [selector] (if-let [write-textarea ($ "write-textarea")]
(let [type (first selector) name (apply str (rest selector))]
(cond (= \# type) (dom/get-element name)
(= \. type) (gdom/getElementByClass name))))
(if-let [write-textarea ($ "#write-textarea")]
(focus/focusInputField write-textarea)) (focus/focusInputField write-textarea))
(defn show-form-buttons [] ; Show the Preview button as soon as the user starts typing.
(style/setStyle ($ ".form-button") "display" "block")) (event/listen ($ "write-textarea")
(event/listen ($ "#write-textarea")
:keypress :keypress
(fn [e] (fn [e]
(show-form-buttons))) (style/setStyle ($ "form-button") "display" "block")))

15
src/NoteHub/views/common.clj

@ -11,13 +11,14 @@
(css (css
(rule ".centerized" (rule ".centerized"
:text-align :center) :text-align :center)
(rule ".helvetica-neue" (def helvetica-neue
(mixin
:font-weight 300 :font-weight 300
:font-family (gen-comma-list ["'Helvetica Neue'" :font-family (gen-comma-list ["'Helvetica Neue'"
"Helvetica" "Helvetica"
"Arial" "Arial"
"'Lucida Grande'" "'Lucida Grande'"
"sans-serif"])) "sans-serif"])))
(rule ".button" (rule ".button"
:box-shadow [0 :2px :5px :#aaa] :box-shadow [0 :2px :5px :#aaa]
:text-decoration :none :text-decoration :none
@ -27,8 +28,9 @@
:border :none :border :none
:border-radius :10px :border-radius :10px
:padding :10px :padding :10px
helvetica-neue
(rule "&:hover" (rule "&:hover"
:background :#0b2)) :background :#2b3))
(rule "html, body" (rule "html, body"
:color :#333 :color :#333
:margin 0 :margin 0
@ -36,7 +38,9 @@
(rule "#hero" (rule "#hero"
:padding-top :5em :padding-top :5em
:padding-bottom :5em :padding-bottom :5em
:text-align :center) :text-align :center
(rule "h2"
helvetica-neue))
(rule ".article-font" (rule ".article-font"
:font-family :Georgia :font-family :Georgia
:font-size :1.3em) :font-size :1.3em)
@ -49,7 +53,8 @@
:font-size :1.3em :font-size :1.3em
:border :none :border :none
:height :600px) :height :600px)
(rule ".form-button" (rule "#form-button"
helvetica-neue
:display :none :display :none
:cursor :pointer :cursor :pointer
:border [:1px :solid] :border [:1px :solid]

6
src/NoteHub/views/pages.clj

@ -7,14 +7,14 @@
(common/layout "Free Markdown Hosting" (common/layout "Free Markdown Hosting"
[:div#hero [:div#hero
[:h1 "NoteHub"] [:h1 "NoteHub"]
[:h2.helvetica-neue "Free hosting for markdown pages."] [:h2 "Free hosting for markdown pages."]
[:br] [:br]
[:br] [:br]
[:a.button.helvetica-neue {:href "/new"} "New Page"]])) [:a.button {:href "/new"} "New Page"]]))
(defpage "/new" [] (defpage "/new" []
(common/layout "New Markdown Note" (common/layout "New Markdown Note"
[:div.central-body.max-width [:div.central-body.max-width
(text-area {:class "max-width"} :write-textarea) (text-area {:class "max-width"} :write-textarea)
(submit-button {:class "helvetica-neue form-button"} "Publish")])) (submit-button {:id "form-button"} "Preview")]))

Loading…
Cancel
Save