Repository: incubator-kylin Updated Branches: refs/heads/0.8.0 47c6ccd5c -> ded2415b3
KYLIN-784 update font-awesome version to 4.3.0 and update grunt.json Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/ce67cf74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/ce67cf74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/ce67cf74 Branch: refs/heads/0.8.0 Commit: ce67cf743cb0fd1b2b179488d19afa28c1ae7e84 Parents: 47c6ccd Author: jiazhong <jiazh...@ebay.com> Authored: Tue May 26 18:32:56 2015 +0800 Committer: jiazhong <jiazh...@ebay.com> Committed: Tue May 26 18:32:56 2015 +0800 ---------------------------------------------------------------------- webapp/bower.json | 2 +- webapp/grunt.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce67cf74/webapp/bower.json ---------------------------------------------------------------------- diff --git a/webapp/bower.json b/webapp/bower.json index 0c385a9..e0bccb8 100755 --- a/webapp/bower.json +++ b/webapp/bower.json @@ -10,7 +10,7 @@ "angular-chosen-localytics": "1.0.6", "animate.css": "3.0.0", "bootstrap": "3.0.0", - "font-awesome": "4.0.3", + "font-awesome": "4.3.0", "angular-ui-ace": "0.1.0", "angular-base64": "2.0.1", "angular-tree-control": "0.1.4", http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce67cf74/webapp/grunt.json ---------------------------------------------------------------------- diff --git a/webapp/grunt.json b/webapp/grunt.json index 48ed483..6ce1612 100755 --- a/webapp/grunt.json +++ b/webapp/grunt.json @@ -47,7 +47,7 @@ "css": { "src": [ "app/components/bootstrap/dist/css/bootstrap.min.css", - "app/components/font-awesome/css/font-awesome.min.css", + "app/components/components-font-awesome/css/font-awesome.css", "app/css/AdminLTE-fonts.css", "app/components/ng-grid/ng-grid.css", "app/components/angular-tree-control/css/tree-control.css", @@ -61,7 +61,8 @@ "app/css/AdminLTE.css", "app/css/skins/_all-skins.min.css", "app/components/bootstrap-sweetalert/lib/sweet-alert.css", - "tmp/css/styles.css" + "app/components/angular-bootstrap-nav-tree/dist/abn_tree.css" + "tmp/css/styles.css", ], "dest": "tmp/css/styles.min.css" }
