Update to Twitter Bootstrap 3

src-clj/grub/core.clj

@@ -9,8 +9,6 @@
              [page :refer [html5]]
              [page :refer [include-js include-css]]]))
 
-
-
 (defn async-handler [request]
   (if-not (:websocket? request)
     {:status 200 :body "WebSocket server"}
@@ -25,8 +23,7 @@
    [:head
     [:title "Grub"]
     [:meta {:name "viewport" :content "width=device-width, initial-scale=1.0"}]
-    (include-css "/css/bootstrap.css")
-    (include-css "/css/bootstrap-responsive.css")]
+    (include-css "/css/bootstrap.css")]
     [:body
      (include-js "http://code.jquery.com/jquery.js")
      (include-js "/js/bootstrap.js")

src-cljs/grub_client/core.cljs

@@ -19,25 +19,28 @@
 (deftemplate grub-template [grub]
   [:tr 
    [:td 
-    [:label.checkbox [:input {:type "checkbox"}] grub]]])
+    [:div.checkbox [:label [:input {:type "checkbox"}] grub]]]])
 
 (def add-grub-text 
-  (node [:input.input-medium {:type "text" :placeholder "2 grubs"}]))
+  (node [:input.form-control {:type "text" :placeholder "2 grubs"}]))
 
 (def add-grub-btn 
-  (node [:button.btn {:type "button"} "Add"]))
+  (node [:button.btn.btn-default {:type "button"} "Add"]))
 
 (deftemplate main-template [grubs]
   [:div.container
-   [:div.row-fluid
-    [:div.span8.offset2
-     [:h2 "Grub List"]
-     [:table.table 
-      [:tbody#grubList
-       (for [grub grubs] (grub-template grub))]]
-     [:div.input-append
+   [:div.row.show-grid
+    [:div.col-lg-4]
+    [:div.col-lg-4
+     [:h3 "Grub List"]
+     [:div.input-group
       add-grub-text
-      add-grub-btn]]]])
+      [:span.input-group-btn
+       add-grub-btn]]
+     [:table.table.table-condensed
+      [:tbody#grubList
+       (for [grub grubs] (grub-template grub))]]]
+    [:div.col-lg-4]]])
 
 (def add-grub-chan (chan))