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

Merge remote-tracking branch 'origin/master' into

Browse Source 
fix_Consitent_table_muliselect

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-10 10:53:50 +02:00
parent c2d1e37a16 8086a2c576
commit dbdf3c7ab4
108 changed files with 2770 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,4 +288,13 @@
font-style:normal;
font-weight:normal;
}
.form-lastrow {
padding-bottom: 12px !important;
}
.v-button-default-color {
color: #551f62;
}
}

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

@@ -11,8 +11,7 @@
//Color picker layout position adjustment
.rgb-vertical-layout {
margin-top: 100px !important;
padding-bottom: 50px;
padding-bottom: 12px;
}
//Discard icon in create/update popup
@@ -47,4 +46,11 @@
box-shadow: none !important;
height: 75px !important;
}
.v-window-fontsize .v-window-closebox,
.v-window-fontsize .v-window-maximizebox,
.v-window-fontsize .v-window-restorebox {
font-size: 16px;
}
}

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

@@ -161,4 +161,8 @@
.v-slot-bulk-upload-label{
line-height:0;
}
.actionButtonsMargin {
margin-top: 30px;
}
}

9
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-common.scss
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;
}
}

1
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-content.scss
View File

@@ -133,6 +133,7 @@
//Create/update popup footer button layout style
.window-style {
margin-bottom: 4px !important;
margin-top: 4px !important;
}
//Table details style

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

@@ -466,7 +466,7 @@ rollout.group.label.target.truncated = {0} targets has been truncated in the lis
prompt.number.of.groups = Number of groups
prompt.tigger.thresold = Trigger threshold
prompt.tigger.threshold = Trigger threshold
prompt.error.threshold = Error threshold
prompt.distribution.set = Distribution set
caption.configure.rollout = Configure rollout

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

@@ -452,7 +452,7 @@ menu.title = Software Provisioning
#Rollout management
prompt.number.of.groups = Number of groups
prompt.tigger.thresold = Trigger threshold
prompt.tigger.threshold = Trigger threshold
prompt.error.threshold = Error threshold
prompt.distribution.set = Distribution set
caption.configure.rollout = Configure rollout

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

@@ -446,7 +446,7 @@ menu.title = Software Provisioning
#Rollout management
prompt.number.of.groups = Number of groups
prompt.tigger.thresold = Trigger threshold
prompt.tigger.threshold = Trigger threshold
prompt.error.threshold = Error threshold
prompt.distribution.set = Distribution set
caption.configure.rollout = Configure rollout