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

Resolve merge conflicts

Browse source
This commit is contained in:
Julius Rapp 2013-07-07 14:58:57 +02:00
commit a5565b436f
18 changed files with 72 additions and 880 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/application.css
View file

@ -2,4 +2,4 @@
*= require bootstrap_and_overrides
*= require select2
*= require token-input-bootstrappy
*/
*= require bootstrap-datepicker

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

@ -31,10 +31,6 @@ body {
// Example:
// @linkColor: #ff0000;
// Bootstrap datepicker
@import "datepicker";
// Custom styles
// Fix empty dd tags in horizontal dl, see https://github.com/twitter/bootstrap/issues/4062