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
	app/views/deliveries/_form.html.haml
This commit is contained in:
wvengen 2013-07-17 11:04:28 +02:00
commit eef4626107
32 changed files with 708 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
/*
*= require bootstrap_and_overrides
*= require select2
*= require token-input-bootstrappy
*= require bootstrap-datepicker
*/
*/

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

@ -35,6 +35,22 @@ body {
dd { .clearfix(); }
}
// Do not use additional margin for input in table
.form-horizontal .control-group.control-group-intable,
.form-horizontal .controls.controls-intable {
margin: 0;
}
// Light tooltips without empty space below tables
.tooltip-inner {
color: #000;
background-color: rgb(245,245,245);
border: 1px solid #ccc;
}
.tooltip-inner .table {
margin-bottom: 0;
}
@mainRedColor: #ED0606;
.logo {