lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into feature_ui_metadata

Browse Source 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/resources/messages_en.properties
	
Resolved the conflicts.
This commit is contained in:
gah6kor
2016-07-15 14:40:55 +02:00
parent 22076aba8a 84e5361a82
commit db753b5c3d
83 changed files with 2020 additions and 1717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
View File

@@ -53,4 +53,7 @@
font-size: 16px;
}
.marginTop {
margin-top: 20px !important;
}
}