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

Merge branch 'master' into updated-gems

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
wvengen 2013-07-18 20:28:56 +02:00
commit b9599ce455
22 changed files with 342 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -219,3 +219,21 @@ tr.unavailable {
dt { width: 160px; }
dd { margin-left: 170px; }
}
.settings {
.settings-group {
margin-bottom: 10px;
.control-label {
margin: 5px 0 0 0;
}
}
.control-group {
margin-bottom: 5px;
}
.control-group.h_wrapper {
margin-bottom: 5px;
}
.control-group.select {
margin-bottom: 15px
}
}