Merge branch 'new-examplea'

merging new example
bhauman · Feb 13, 2015 · 1975983 · 1975983
1 parent c14f2fd
commit 1975983
Show file tree

Hide file tree

Showing 14 changed files with 130 additions and 16,904 deletions.
diff --git a/example/dev/example/core.cljs → example/dev/example/dev.cljs b/example/dev/example/core.cljs → example/dev/example/dev.cljs
@@ -12,11 +12,12 @@
 (fw/start {
            :websocket-url "ws://localhost:3449/figwheel-ws"
            :build-id "example"
-           :debug true
+           ;; :debug true
            :on-jsload (fn []
-                        (core/ex2-restart)
+
                         ;; this is a better way to reload the cube example
                         ;; which will reload even for non-local changes
                         ;; (example.cube/stop-and-start-ex3)
                         )
            })
+
diff --git a/example/project.clj b/example/project.clj
@@ -5,9 +5,9 @@
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[org.clojure/clojure "1.6.0"]
                  [org.clojure/clojurescript "0.0-2843"]
-                 [sablono "0.2.16"]
-                 [crate "0.2.4"]
-                 [jayq "2.4.0"]
+                 [sablono "0.3.1"]
+                 [org.omcljs/om "0.8.8"]
+                 [ankha "0.1.4"]
                  [figwheel "0.2.4-SNAPSHOT"]
                  ;; for development
                  [figwheel-sidecar "0.2.4-SNAPSHOT"]]
@@ -28,7 +28,7 @@
 
   :cljsbuild {
               :builds [{ :id "example"
-                         :source-paths ["src" "dev" "../support/src"]
+                         :source-paths ["src" "dev"]
                          :compiler {:main example.dev
                                     :asset-path "js/out"
                                     :output-to "resources/public/js/example.js"

diff --git a/example/resources/public/css/example.css b/example/resources/public/css/example.css
@@ -1,12 +1,56 @@
-@import url("imported.css");
+body {
+   color: #333;
+}
 
-@font-face {
-  font-family: 'source_sans_proregular';
-  src: url('../webfonts/sourcesanspro-regular-webfont.ttf');
-} 
+/* ankah */
+.toggle-button {
+    font-weight: bold;
+}
 
-body {
-   color: blue;
-   font-family: 'source_sans_proregular';
-   background: #fff url(../webfonts/wrap-bg.png) repeat 0 0;
+.edit-button {
+    margin-left: 2px;
 }
+
+.ellipsis {
+    color: grey;
+}
+
+.number {
+    color: forestgreen;
+}
+
+.keyword {
+    color: darkviolet;
+}
+
+.symbol {
+    color: inherit;
+}
+
+.symbol:before {
+    content: "'";
+}
+
+.string {
+    color: dodgerblue;
+}
+
+.boolean {
+    color: goldenrod;
+}
+
+.nil {
+    color: silver;
+}
+
+.function {
+    color: firebrick;
+}
+
+.regex {
+    color: darkgreen;
+}
+
+.object .key:after {
+    content: ":";
+}
diff --git a/example/resources/public/index.html b/example/resources/public/index.html
@@ -9,12 +9,8 @@
     <link href="css/example.css" rel="stylesheet" type="text/css">
   </head>
   <body>
-    <div id="main-area">
-      <div id="example-1"></div>
-      <div id="example-2"></div>
-      <div id="example-3"></div>
+    <div id="app">
     </div>
-
     <script src="js/example.js" type="text/javascript"></script>
   </body>
 </html>
diff --git a/example/resources/public/js/jquery.min.js b/example/resources/public/js/jquery.min.js