Merge branch 'master' into feature_ui_metadata

Conflicts: hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
2016-07-18 18:10:09 +02:00
parent 63884c9fcd 60efc6eedc
commit a87a219540
6 changed files with 462 additions and 467 deletions
--- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
+++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
@@ -293,8 +293,4 @@
 	padding-bottom: 12px !important;
  }
  
-  .v-button-default-color {
-  	color: #551f62;
-  }
-  
 }
--- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
+++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
@@ -60,4 +60,5 @@
  .metadata-table-margin {
       margin-top:3px;      
  }
+
 }
--- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss
+++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss
@@ -164,5 +164,6 @@
  
  .actionButtonsMargin {
  	margin-top: 30px;
+  	margin-bottom: 10px;
  }
 }