Merge branch 'master' into feature_ui_metadata

Conflicts: hawkbit-ui/src/main/resources/messages.properties
2016-07-19 16:38:52 +02:00
parent ffb29206fd ba177f77c0
commit 85e22da7a2
14 changed files with 347 additions and 321 deletions
--- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss
+++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss
@@ -52,6 +52,10 @@
 		opacity: 0.5;
 	}
 	
+	.action-type-padding{
+		padding: 0 0px !important;
+	}
+	
 	.rollout-caption-links{
 		font-weight: 400;
  		height: 25px ;