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

Merge remote-tracking branch 'bennibu/rails3' into rails3

Browse source 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml
This commit is contained in:
wvengen 2013-03-06 01:01:12 +01:00
commit 2d382df1f1
10 changed files with 50 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,11 @@ body {
// Custom styles
// Fix empty dd tags in horizontal dl, see https://github.com/twitter/bootstrap/issues/4062
.dl-horizontal {
dd { .clearfix(); }
}
@mainRedColor: #ED0606;
.logo {
@ -196,17 +201,10 @@ tr.unavailable {
}
}
// ********* Tweaks & fixes
// https://github.com/twitter/bootstrap/issues/4062
.dl-horizontal {
dd { .clearfix(); }
}
// need more space for supplier&order information (in German, at least)
.dl-horizontal {
dt { width: 160px; }
dd { margin-left: 170px; }
}