Merge remote-tracking branch 'origin/master' into

fix_introduce_consistent_button_position_in_change_dialogs

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-06-09 17:06:19 +02:00
54 changed files with 303 additions and 190 deletions

View File

@@ -181,4 +181,13 @@
visibility: hidden;
float: right;
}
.v-button-generatedColumnPadding {
height: 28px;
padding: 0 6px !important;
font-size: 12px;
border-radius: 4px;
}
}