Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed fontawesome

  • Loading branch information...
commit 7272fe52278d41449dc44bf04d15524d9d0e4d22 1 parent 29c6c1c
Phillip Lackey authored
View
0  ...assets/stylesheets/bootstrap/font/FontAwesome.otf → app/assets/fonts/FontAwesome.otf
File renamed without changes
View
0  ...tylesheets/bootstrap/font/fontawesome-webfont.eot → app/assets/fonts/fontawesome-webfont.eot
File renamed without changes
View
0  ...tylesheets/bootstrap/font/fontawesome-webfont.svg → app/assets/fonts/fontawesome-webfont.svg
File renamed without changes
View
0  ...tylesheets/bootstrap/font/fontawesome-webfont.ttf → app/assets/fonts/fontawesome-webfont.ttf
File renamed without changes
View
0  ...ylesheets/bootstrap/font/fontawesome-webfont.woff → app/assets/fonts/fontawesome-webfont.woff
File renamed without changes
View
6 app/assets/stylesheets/bootstrap/bootstrap.css.scss
@@ -1942,8 +1942,10 @@ table th[class*="span"],
*/
@font-face {
font-family: 'FontAwesome';
- src: url('font/fontawesome-webfont.eot');
- src: url('font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('font/fontawesome-webfont.woff') format('woff'), url('font/fontawesome-webfont.ttf') format('truetype');
+ src: url('fontawesome-webfont.eot');
+ src: url('fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
+ font-url('fontawesome-webfont.woff') format('woff'),
+ font-url('fontawesome-webfont.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
View
2  app/assets/stylesheets/bootstrap/theme-style.css.scss
@@ -209,7 +209,7 @@ a:focus {
border-radius: 3px;
border: 0;
border-bottom: 3px solid #55a79a;
- background-image: url(../img/bg_noise-2.png);
+ background-image: url(image_path('bg_noise-2.png'));
background-position: left top;
background-repeat: repeat;
-webkit-box-shadow: 1px 1px 10px rgba(36, 36, 36, 0.6);
View
19 app/views/layouts/application.html.erb
@@ -10,23 +10,8 @@
<meta name="description" content="">
<meta name="author" content="Themelize.me">
-<!-- Bootstrap CSS -->
-<link href="assets/bootstrap/bootstrap.css" rel="stylesheet">
-<link href="assets/bootstrap/responsive.css" rel="stylesheet">
-
-<!-- Flexslider -->
-<link href="assets/bootstrap/flexslider.css" rel="stylesheet">
-
-<!-- Theme style -->
-<link href="assets/bootstrap/theme-style.css" rel="stylesheet">
-
-<!--Your custom colour override-->
-<link href="assets/bootstrap/colour-red.css" id="colour-scheme" rel="stylesheet">
-
-<!-- Your custom override -->
-<link href="assets/bootstrap/custom-style.css" rel="stylesheet">
-
-<%= stylesheet_link_tag "application" %>
+<%= stylesheet_link_tag "application", :media => "all" %>
+<%= javascript_include_tag "application" %>
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
View
5 config/environments/production.rb
@@ -19,6 +19,9 @@
# Generate digests for assets URLs
config.assets.digest = true
+
+ # Add the fonts path
+ config.assets.paths << Rails.root.join('app', 'assets', 'fonts')
# Defaults to nil and saved in location specified by config.assets.prefix
# config.assets.manifest = YOUR_PATH
@@ -46,7 +49,7 @@
# config.action_controller.asset_host = "http://assets.example.com"
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
- # config.assets.precompile += %w( search.js )
+ config.assets.precompile += %w( search.js .svg .eot .woff .ttf )
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
Please sign in to comment.
Something went wrong with that request. Please try again.