Merge pull request openhab#3 from sja/paper-ui-bower

Paper ui bower
sja · Jan 28, 2015 · fe63d11 · fe63d11
2 parents eae5080 + b6eb205
commit fe63d11
Show file tree

Hide file tree

Showing 27 changed files with 44 additions and 33,921 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,7 @@ distribution/openhabhome/userdata/logs/openhab.log
 distribution/openhabhome/userdata/mapdb/storage.mapdb
 distribution/openhabhome/userdata/mapdb/storage.mapdb.p
 distribution/openhabhome/userdata/mapdb/storage.mapdb.t
-bundles/ui/org.openhab.ui.paperui/web/js/lib
+bundles/ui/org.openhab.ui.paperui/web/bower_components
+*.iml
+.idea
+distribution/openhabhome/userdata/logs
diff --git a/bundles/ui/org.openhab.ui.paperui/.bowerrc b/bundles/ui/org.openhab.ui.paperui/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "web/js/lib/"
+  "directory": "web/bower_components/"
 }
diff --git a/bundles/ui/org.openhab.ui.paperui/bower.json b/bundles/ui/org.openhab.ui.paperui/bower.json
@@ -22,6 +22,11 @@
     "angular-route": "~1.3.8",
     "sprintf": "~1.0.2",
     "underscore": "~1.7.0",
-    "jquery": "~2.1.3"
+    "jquery": "~2.1.3",
+    "bootstrap": "~3.3.2",
+    "jquery-ui": "~1.11.2",
+    "tinycolor": "~1.1.2",
+    "masonry": "~3.2.2",
+    "bootstrap-tagsinput": "~0.4.2"
   }
 }
diff --git a/bundles/ui/org.openhab.ui.paperui/web/css/bootstrap-tagsinput.css b/bundles/ui/org.openhab.ui.paperui/web/css/bootstrap-tagsinput.css