Serve bootstrap, font awesome locally
parent
2ea0765543
commit
3a56403287
1
Gemfile
1
Gemfile
|
@ -26,6 +26,7 @@ gem "bunny"
|
||||||
gem "request_store"
|
gem "request_store"
|
||||||
gem "secure_headers"
|
gem "secure_headers"
|
||||||
gem "valid_url"
|
gem "valid_url"
|
||||||
|
gem "font-awesome-rails"
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
gem "hashdiff"
|
gem "hashdiff"
|
||||||
|
|
|
@ -130,6 +130,8 @@ GEM
|
||||||
fog-xml (0.1.3)
|
fog-xml (0.1.3)
|
||||||
fog-core
|
fog-core
|
||||||
nokogiri (>= 1.5.11, < 2.0.0)
|
nokogiri (>= 1.5.11, < 2.0.0)
|
||||||
|
font-awesome-rails (4.7.0.3)
|
||||||
|
railties (>= 3.2, < 5.2)
|
||||||
foreman (0.84.0)
|
foreman (0.84.0)
|
||||||
thor (~> 0.19.1)
|
thor (~> 0.19.1)
|
||||||
formatador (0.2.5)
|
formatador (0.2.5)
|
||||||
|
@ -344,6 +346,7 @@ DEPENDENCIES
|
||||||
faker
|
faker
|
||||||
figaro
|
figaro
|
||||||
fog-google!
|
fog-google!
|
||||||
|
font-awesome-rails
|
||||||
foreman
|
foreman
|
||||||
hashdiff
|
hashdiff
|
||||||
jwt
|
jwt
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
/*
|
||||||
|
* This is a manifest file that'll be compiled into application.css, which will include all the files
|
||||||
|
* listed below.
|
||||||
|
*
|
||||||
|
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
|
||||||
|
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
|
||||||
|
*
|
||||||
|
* You're free to add application-wide styles to this file and they'll appear at the top of the
|
||||||
|
* compiled file, but it's generally better to create a new file per style scope.
|
||||||
|
*
|
||||||
|
*= require bootstrap
|
||||||
|
*= require font-awesome
|
||||||
|
*/
|
File diff suppressed because it is too large
Load Diff
|
@ -14,10 +14,8 @@ window.process = {
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<%= render "addons" %>
|
<%= render "addons" %>
|
||||||
<meta content="farmbot-version" name="<%= %>%">
|
|
||||||
<meta content="width=device-width, initial-scale=1" name="viewport">
|
<meta content="width=device-width, initial-scale=1" name="viewport">
|
||||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
|
<%= stylesheet_link_tag 'application' %>
|
||||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
|
|
||||||
<link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,700,700i" rel="stylesheet">
|
<link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,700,700i" rel="stylesheet">
|
||||||
<%# Rails.env.production? ? javascript_include_tag(*webpack_asset_paths("new_commons")) : "" %>
|
<%# Rails.env.production? ? javascript_include_tag(*webpack_asset_paths("new_commons")) : "" %>
|
||||||
<% if false %>
|
<% if false %>
|
||||||
|
|
|
@ -95,6 +95,7 @@ module FarmBot
|
||||||
WEBPACK_URL,
|
WEBPACK_URL,
|
||||||
],
|
],
|
||||||
style_src: %w(
|
style_src: %w(
|
||||||
|
'self'
|
||||||
'unsafe-inline'
|
'unsafe-inline'
|
||||||
fonts.googleapis.com
|
fonts.googleapis.com
|
||||||
maxcdn.bootstrapcdn.com
|
maxcdn.bootstrapcdn.com
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue