Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

update bootstrap assets

Browse source
This commit is contained in:
wvengen 2013-07-17 11:31:12 +02:00
parent eef4626107
commit ccea97c2b3
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/bootstrap.js.coffee
View file

@ -1,4 +1,3 @@
jQuery -> jQuery ->
$("a[rel=popover]").popover() $("a[rel~=popover], .has-popover").popover()
$(".tooltip").tooltip() $("a[rel~=tooltip], .has-tooltip").tooltip()
$("a[rel=tooltip]").tooltip()

12
app/assets/stylesheets/bootstrap_and_overrides.css.less vendored
View file

@ -1,13 +1,12 @@
@import "twitter/bootstrap/bootstrap"; @import "twitter/bootstrap/bootstrap";
@import "twitter/bootstrap/responsive";
body { body {
padding-top: 10px; padding-top: 10px;
} }
@import "twitter/bootstrap/responsive";
// Set the correct sprite paths // Set the correct sprite paths
@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png'); @iconSpritePath: image-url('twitter/bootstrap/glyphicons-halflings.png');
@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png'); @iconWhiteSpritePath: image-url('twitter/bootstrap/glyphicons-halflings-white.png');
// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines) // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
@fontAwesomeEotPath: asset-url('fontawesome-webfont.eot'); @fontAwesomeEotPath: asset-url('fontawesome-webfont.eot');
@ -17,13 +16,16 @@ body {
@fontAwesomeSvgPath: asset-url('fontawesome-webfont.svg#fontawesomeregular'); @fontAwesomeSvgPath: asset-url('fontawesome-webfont.svg#fontawesomeregular');
@import 'fontawesome/font-awesome'; @import 'fontawesome/font-awesome';
// Glyphicons
//@import "twitter/bootstrap/sprites.less";
// Your custom LESS stylesheets goes here // Your custom LESS stylesheets goes here
// //
// Since bootstrap was imported above you have access to its mixins which // Since bootstrap was imported above you have access to its mixins which
// you may use and inherit here // you may use and inherit here
// //
// If you'd like to override bootstrap's own variables, you can do so here as well // If you'd like to override bootstrap's own variables, you can do so here as well
// See http://twitter.github.com/bootstrap/less.html for their names and documentation // See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
// //
// Example: // Example:
// @linkColor: #ff0000; // @linkColor: #ff0000;