From 93c37971682cbcbda3139c7e8a47ca21311f8947 Mon Sep 17 00:00:00 2001 From: Morgan Astra Date: Tue, 20 Sep 2016 16:17:58 -0700 Subject: [PATCH] add 'section' CSS class for repeated declarations --- resources/pronouns.css | 17 ++++------------- src/pronouns/pages.clj | 15 +++++++-------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/resources/pronouns.css b/resources/pronouns.css index 1285cee..59160b5 100644 --- a/resources/pronouns.css +++ b/resources/pronouns.css @@ -3,32 +3,23 @@ body { background-color: #F6CEFC; } -.examples { +.section { margin: 8px; padding: 4px 6px 4px 6px; border: 4px solid #eeeeee; } +.examples { +} + .title { - margin: 8px; - padding: 4px 6px 4px 6px; - border: 4px solid #eeeeee; } .about { - margin: 8px; - padding: 4px 6px 4px 6px; - border: 4px solid #eeeeee; } .contact { - margin: 8px; - padding: 4px 6px 4px 6px; - border: 4px solid #eeeeee; } .table { - margin: 8px; - padding: 4px 6px 4px 6px; - border: 4px solid #eeeeee; } diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj index da6d46e..f9fde11 100644 --- a/src/pronouns/pages.clj +++ b/src/pronouns/pages.clj @@ -59,7 +59,7 @@ ".")) (defn title-block [title] - [:div {:class "title"} + [:div {:class "section title"} [:h1 title]]) (defn examples-block @@ -68,7 +68,7 @@ header-str (str "Here are some usage examples for my " sub-obj " pronouns")] - [:div {:class "examples"} + [:div {:class "section examples"} [:p [:h2 header-str]] (subject-example subject) (object-example object) @@ -77,7 +77,7 @@ (reflexive-example subject reflexive)])) (defn about-block [] - [:div {:class "about"} + [:div {:class "section about"} [:p "Full usage: " [:tt "http://pronoun.is/subject-pronoun/object-pronoun/possessive-determiner/possessive-pronoun/reflexive"] " displays examples of your pronouns."] @@ -86,7 +86,7 @@ (defn contact-block [] (let [twitter-name (fn [handle] (href (str "https://www.twitter.com/" handle) (str "@" handle)))] - [:div {:class "contact"} + [:div {:class "section contact"} [:p "Written by " (twitter-name "morganastra") @@ -131,8 +131,7 @@ [:li (href link label)])) (defn front [] - (let [blah (println *pronouns-table*) - abbreviations (u/abbreviate *pronouns-table*) + (let [abbreviations (u/abbreviate *pronouns-table*) links (map make-link abbreviations) title "Pronoun Island"] (html @@ -143,7 +142,7 @@ [:link {:rel "stylesheet" :href "/pronouns.css"}]] [:body (title-block title) - [:div {:class "table"} + [:div {:class "section table"} [:p "pronoun.is is a www site for showing people how to use pronouns in English."] [:p "here are some pronouns the site knows about:"] [:ul links]]] @@ -159,7 +158,7 @@ [:link {:rel "stylesheet" :href "/pronouns.css"}]] [:body (title-block title) - [:div {:class "examples"} + [:div {:class "section examples"} [:p [:h2 (str "We couldn't find those pronouns in our database." "If you think we should have them, please reach out!")]]] (about-block)