From 289dad9c272c6dd17339bade88cad94d3b2275f9 Mon Sep 17 00:00:00 2001 From: Andrew Suzuki Date: Tue, 31 May 2016 11:39:43 -0400 Subject: [PATCH] nicer comment headers --- src/cljs/ulysses/pages/builder.cljs | 12 ++++++-- src/cljs/ulysses/pages/home.cljs | 12 ++++++-- src/cljs/ulysses/pages/profile.cljs | 12 ++++++-- src/cljs/ulysses/views.cljs | 2 -- src/sass/app.scss | 47 +++++++++++++++++++++++------ 5 files changed, 65 insertions(+), 20 deletions(-) diff --git a/src/cljs/ulysses/pages/builder.cljs b/src/cljs/ulysses/pages/builder.cljs index f4b4ddb..654942b 100644 --- a/src/cljs/ulysses/pages/builder.cljs +++ b/src/cljs/ulysses/pages/builder.cljs @@ -7,12 +7,16 @@ [clojure.string :as string] [cljs.pprint :as pprint])) -; helpers ----------- +;; ---------------------------------------------------------------------------- +; helpers +;; ---------------------------------------------------------------------------- (defn- get-grant-op-id [page-with-args] (-> page-with-args second :grant-op-id str->int)) -; components -------- +;; ---------------------------------------------------------------------------- +; components +;; ---------------------------------------------------------------------------- (defn faculty-years-uconn [{:keys [faculty-years-uconn]}] @@ -142,6 +146,10 @@ [:div.inner [:h3 "Word Cloud"]]]]]) +;; ---------------------------------------------------------------------------- +;; main +;; ---------------------------------------------------------------------------- + (defn main [] (let [page-with-args (subscribe [:page-with-args]) builder-filters (subscribe [:builder-filters]) diff --git a/src/cljs/ulysses/pages/home.cljs b/src/cljs/ulysses/pages/home.cljs index f18c483..77f0283 100644 --- a/src/cljs/ulysses/pages/home.cljs +++ b/src/cljs/ulysses/pages/home.cljs @@ -14,7 +14,9 @@ [ulysses.lib.moment :as m] [ulysses.routes :as routes])) -;; helper sub-components --------------------------- +;; ---------------------------------------------------------------------------- +;; helper sub-components +;; ---------------------------------------------------------------------------- ; grant-op-box ---------- @@ -75,7 +77,9 @@ (name mechanism) [:div.inside]]) -;; primary sub-components -------------------------- +;; ---------------------------------------------------------------------------- +;; primary sub-components +;; ---------------------------------------------------------------------------- (defn grant-op-box [grant] (let [{:keys [id title purpose due-date funding-mechanism initial-team]} grant @@ -128,7 +132,9 @@ [:div.pagination-info "page " current-n " / " n]) -;; main -------------------------------------------- +;; ---------------------------------------------------------------------------- +;; main +;; ---------------------------------------------------------------------------- (defn main [] (let [grant-ops (subscribe [:grant-ops]) diff --git a/src/cljs/ulysses/pages/profile.cljs b/src/cljs/ulysses/pages/profile.cljs index 36009ba..faa48b4 100644 --- a/src/cljs/ulysses/pages/profile.cljs +++ b/src/cljs/ulysses/pages/profile.cljs @@ -6,12 +6,16 @@ [ulysses.components.word-cloud :refer [word-cloud]] [reagent.core :as r])) -;; helpers ----------------------------------------- +;; ---------------------------------------------------------------------------- +;; helpers +;; ---------------------------------------------------------------------------- (defn get-person-id [page-with-args] (-> page-with-args second :person-id str->int)) -;; helper sub-components --------------------------- +;; ---------------------------------------------------------------------------- +;; helper sub-components +;; ---------------------------------------------------------------------------- (defn profile [{:keys [name title department year_hired keywords] :as faculty}] [:div.container @@ -26,7 +30,9 @@ [label :default "hired in " year_hired]] [word-cloud 50 keywords]]]]) -;; main -------------------------------------------- +;; ---------------------------------------------------------------------------- +;; main +;; ---------------------------------------------------------------------------- (defn main [] (let [page-with-args (subscribe [:page-with-args]) diff --git a/src/cljs/ulysses/views.cljs b/src/cljs/ulysses/views.cljs index 41f05fa..aa4af28 100644 --- a/src/cljs/ulysses/views.cljs +++ b/src/cljs/ulysses/views.cljs @@ -6,8 +6,6 @@ [ulysses.pages.profile :as page-profile] [ulysses.pages.not-found :as page-not-found])) -;; main - (defmulti pages identity) (defmethod pages :home [] [page-home/main]) (defmethod pages :builder [] [page-builder/main]) diff --git a/src/sass/app.scss b/src/sass/app.scss index 55073b6..e81bd22 100644 --- a/src/sass/app.scss +++ b/src/sass/app.scss @@ -1,30 +1,57 @@ -// Sass root file +// sass root file + +// ---------------------------------------------------------------------------- +// fonts +// ---------------------------------------------------------------------------- -// Fonts @import 'fonts'; -// Variables +// ---------------------------------------------------------------------------- +// variables +// ---------------------------------------------------------------------------- + @import 'variables'; -// Bootstrap +// ---------------------------------------------------------------------------- +// bootstrap +// ---------------------------------------------------------------------------- + @import '../../node_modules/bootstrap/scss/bootstrap'; -// Font Awesome +// ---------------------------------------------------------------------------- +// font awesome +// ---------------------------------------------------------------------------- + @import '../../node_modules/font-awesome/scss/font-awesome'; -// Mixins +// ---------------------------------------------------------------------------- +// mixins +// ---------------------------------------------------------------------------- + @import 'mixins'; -// Bootstrap Overrides +// ---------------------------------------------------------------------------- +// bootstrap overrides +// ---------------------------------------------------------------------------- + @import 'bootstrap-overrides'; -// Common +// ---------------------------------------------------------------------------- +// common +// ---------------------------------------------------------------------------- + @import 'common'; -// Layout +// ---------------------------------------------------------------------------- +// layout +// ---------------------------------------------------------------------------- + @import 'layout'; -// Components +// ---------------------------------------------------------------------------- +// components +// ---------------------------------------------------------------------------- + @import 'components/builder-panel'; @import 'components/faculties-pool'; @import 'components/footer';