allow to edit GroupOrderArticle result from orders screen

Conflicts:
	app/assets/javascripts/application.js
This commit is contained in:
wvengen 2014-01-23 16:17:16 +01:00
parent f9d2c20aaa
commit 60826ceedc
34 changed files with 393 additions and 220 deletions

View file

@ -1,5 +1,7 @@
@import "twitter/bootstrap/bootstrap";
@import "twitter/bootstrap/responsive";
@import "delta_input";
body {
padding-top: 10px;
}
@ -253,6 +255,15 @@ td.symbol, th.symbol {
.unused .symbol { color: tint(@articleUnusedColor, @nonessentialDim); }
.unavailable .symbol { color: @articleUnavailColor; }
// hide symbols completely on small screens to save space
@media (max-width: 768px) {
.symbol {
font-size: 0;
padding: 0;
margin: 0;
}
}
// ********* Tweaks & fixes

View file

@ -0,0 +1,33 @@
// needs @import "twitter/bootstrap/bootstrap";
form.delta-input, .delta-input form {
margin: 0;
padding: 0;
}
.delta-input {
.btn {
padding: 0;
width: 24px;
height: 28px;
vertical-align: middle;
}
input[data-delta] {
text-align: center;
height: 18px;
}
// handle error class outside of bootstrap controls
input[data-delta].error {
// relevant bootstrap portion of: .formFieldState(@errorText, @errorText, @errorBackground);
border-color: @errorText;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus {
border-color: darken(@errorText, 10%);
@shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@errorText, 20%);
.box-shadow(@shadow);
}
}
}