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

Merge branch 'master' into feature_minimize_status_popup

Browse Source 
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationwindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGridLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
This commit is contained in:
Asharani
2016-06-02 15:41:16 +05:30
parent 693c678377 1b4058850f
commit f06cfa46f2
316 changed files with 5191 additions and 3766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss
View File

@@ -237,4 +237,8 @@
.v-tooltip{
max-width:43em;
}
.breadcrumbPaddingLeft{
padding-left: 3px !important;
}
}

8
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/hawkbittheme.scss
View File

@@ -132,4 +132,12 @@ $v-included-components: remove($v-included-components, form);
left: 50%;
margin-left: -20px;
}
.v-generated-body &.v-app {
background-image: $app-background-image, linear-gradient(to bottom, $app-background-image-gradient) !important;
background-image: $app-background-image, -webkit-linear-gradient(top, $app-background-image-gradient) !important;
background-image: $app-background-image, -moz-linear-gradient(top, $app-background-image-gradient) !important;
background-position: bottom;
background-repeat: no-repeat;
}
}

3
hawkbit-ui/src/main/resources/messages.properties
View File

@@ -491,3 +491,6 @@ message.error.starting.rollout = Server error. Error starting rollout. Please co
#Menu
menu.title = Software Provisioning
#Target Filter Management
breadcrumb.target.filter.custom.filters = Custom Filters

3
hawkbit-ui/src/main/resources/messages_de.properties
View File

@@ -477,3 +477,6 @@ label.target.per.group = Targets per group :
message.dist.already.assigned = Distribution {0} is already assigned to target
message.error.creating.rollout = Server error. Error creating rollout. Please contact the administrator
message.error.starting.rollout = Server error. Error starting rollout. Please contact the administrator
#Target Filter Management
breadcrumb.target.filter.custom.filters = Custom Filters

3
hawkbit-ui/src/main/resources/messages_en.properties
View File

@@ -467,3 +467,6 @@ label.target.per.group = Targets per group :
message.dist.already.assigned = Distribution {0} is already assigned to target
message.error.creating.rollout = Server error. Error creating rollout. Please contact the administrator
message.error.starting.rollout = Server error. Error starting rollout. Please contact the administrator
#Target Filter Management
breadcrumb.target.filter.custom.filters = Custom Filters