Fix use min configuration not to depend on the bower_components direc…

…tory in dist.
getredash · Oct 28, 2013 · 604a294 · 604a294
1 parent 6cf580e
commit 604a294
Show file tree

Hide file tree

Showing 7 changed files with 233 additions and 5 deletions.
diff --git a/rd_ui/Gruntfile.js b/rd_ui/Gruntfile.js
@@ -249,7 +249,7 @@ module.exports = function (grunt) {
             '.htaccess',
             'bower_components/**/*',
             'images/{,*/}*.{gif,webp}',
-            'styles/fonts/*'
+            'fonts/*'
           ]
         }, {
           expand: true,

diff --git a/rd_ui/app/fonts/glyphicons-halflings-regular.eot b/rd_ui/app/fonts/glyphicons-halflings-regular.eot
diff --git a/rd_ui/app/fonts/glyphicons-halflings-regular.svg b/rd_ui/app/fonts/glyphicons-halflings-regular.svg
diff --git a/rd_ui/app/fonts/glyphicons-halflings-regular.ttf b/rd_ui/app/fonts/glyphicons-halflings-regular.ttf
diff --git a/rd_ui/app/fonts/glyphicons-halflings-regular.woff b/rd_ui/app/fonts/glyphicons-halflings-regular.woff
diff --git a/rd_ui/app/index.html b/rd_ui/app/index.html
@@ -8,12 +8,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+    <!-- build:css /styles/main.css -->
     <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.css">
     <link rel="stylesheet" href="/bower_components/codemirror/lib/codemirror.css">
     <link rel="stylesheet" href="/bower_components/gridster/dist/jquery.gridster.css">
     <link rel="stylesheet" href="/bower_components/pivottable/examples/pivot.css">
     <link rel="stylesheet" href="/bower_components/cornelius/src/cornelius.css">
-    <!-- build:css(.tmp) /styles/main.css -->
     <link rel="stylesheet" href="/styles/redash.css">
     <!-- endbuild -->
 </head>
@@ -66,10 +66,9 @@
 <div ng-view></div>
 
 <script src="/bower_components/jquery/jquery.js"></script>
-<script src="/bower_components/angular/angular.js"></script>
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
 
 <!-- build:js /scripts/plugins.js -->
+<script src="/bower_components/angular/angular.js"></script>
 <script src="/bower_components/jquery-ui/ui/jquery-ui.js"></script>
 <script src="/bower_components/bootstrap/js/collapse.js"></script>
 <script src="/bower_components/bootstrap/js/modal.js"></script>

diff --git a/rd_ui/bower.json b/rd_ui/bower.json
@@ -16,7 +16,8 @@
     "angular-resource": "1.0.7",
     "angular-growl": "~0.3.1",
     "pivottable": "git@github.com:arikfr/pivottable.git#master",
-    "cornelius": "git@github.com:restorando/cornelius.git"
+    "cornelius": "git@github.com:restorando/cornelius.git",
+    "gridster": "~0.2.0"
   },
   "devDependencies": {
     "angular-mocks": "~1.0.7",