You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by al...@apache.org on 2015/08/24 13:42:00 UTC
[34/50] [abbrv] incubator-taverna-databundle-viewer git commit:
Replace font-awesome and ionicons from cdn version to bower
Replace font-awesome and ionicons from cdn version to bower
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/commit/97a3082e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/tree/97a3082e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/diff/97a3082e
Branch: refs/heads/master
Commit: 97a3082eadf300e8a8b26bfad78bf1cccaa62c24
Parents: fcdd841
Author: Denis Karyakin <sa...@gmail.com>
Authored: Wed Aug 19 02:01:41 2015 +0300
Committer: Denis Karyakin <sa...@gmail.com>
Committed: Wed Aug 19 02:01:41 2015 +0300
----------------------------------------------------------------------
app/assets/stylesheets/application.scss | 2 ++
app/views/layouts/application.html.slim | 2 --
app/views/layouts/devise.html.slim | 2 --
bower.json | 2 ++
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/97a3082e/app/assets/stylesheets/application.scss
----------------------------------------------------------------------
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index f921727..548f7da 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -32,5 +32,7 @@
*= require bootstrap_theme/bootstrap/css/bootstrap.min
*= require bootstrap_theme/dist/css/AdminLTE.min
*= require bootstrap_theme/dist/css/skins/skin-blue.min
+ *= require font-awesome/css/font-awesome.min
+ *= require ionicons/css/ionicons.min
*= require data_bundle
*/
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/97a3082e/app/views/layouts/application.html.slim
----------------------------------------------------------------------
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index 1a44cbf..5e25e12 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -7,8 +7,6 @@ html
meta[content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"]
= stylesheet_link_tag 'application', media: 'all'
= csrf_meta_tags
- link[href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css"]
- link[href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css"]
body.skin-blue.layout-top-nav
.wrapper
header.main-header
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/97a3082e/app/views/layouts/devise.html.slim
----------------------------------------------------------------------
diff --git a/app/views/layouts/devise.html.slim b/app/views/layouts/devise.html.slim
index e3aa442..951dd9a 100644
--- a/app/views/layouts/devise.html.slim
+++ b/app/views/layouts/devise.html.slim
@@ -7,7 +7,5 @@ html
meta[content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"]
= stylesheet_link_tag 'application', media: 'all'
= csrf_meta_tags
- link[href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css"]
- link[href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css"]
= yield
= javascript_include_tag 'application'
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/97a3082e/bower.json
----------------------------------------------------------------------
diff --git a/bower.json b/bower.json
index 77e64ce..18bf565 100644
--- a/bower.json
+++ b/bower.json
@@ -2,6 +2,8 @@
"name": "data-bundle_viewer",
"dependencies": {
"bootstrap_theme": "almasaeed2010/AdminLTE",
+ "font-awesome": "4.4.0",
+ "ionicons": "2.0.1",
"d3": "3.5.6"
}
}