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

CSS change

Browse Source 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-06-21 11:09:54 +02:00
parent 781a987f6e
commit 66360721e6
5 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
View File

@@ -109,9 +109,15 @@ public class CommonDialogWindow extends Window implements Serializable {
public void checkMandatoryTextField(final TextChangeEvent event, final AbstractTextField textfield) { public void checkMandatoryTextField(final TextChangeEvent event, final AbstractTextField textfield) {
if (StringUtils.isNotBlank(event.getText())) { if (StringUtils.isNotBlank(event.getText())) {
getRequiredFields().put(textfield.getCaption(), Boolean.TRUE); if (StringUtils.isNotBlank(textfield.getCaption())) {
getRequiredFields().put(textfield.getCaption(), Boolean.TRUE);
}
getRequiredFields().put(textfield.getId(), Boolean.TRUE);
} else { } else {
getRequiredFields().put(textfield.getCaption(), Boolean.FALSE); if (StringUtils.isNotBlank(textfield.getCaption())) {
getRequiredFields().put(textfield.getCaption(), Boolean.FALSE);
}
getRequiredFields().put(textfield.getId(), Boolean.FALSE);
} }
checkMandatoryFields(); checkMandatoryFields();
} }
@@ -189,7 +195,7 @@ public class CommonDialogWindow extends Window implements Serializable {
((AbstractOrderedLayout) content).setMargin(true); ((AbstractOrderedLayout) content).setMargin(true);
} }
if (content instanceof GridLayout) { if (content instanceof GridLayout) {
addStyleName(""); addStyleName("marginTop");
} }
if (null != content) { if (null != content) {

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
View File

@@ -113,7 +113,6 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout
tagDesc = SPUIComponentProvider.getTextArea(i18n.get("textfield.description"), "", tagDesc = SPUIComponentProvider.getTextArea(i18n.get("textfield.description"), "",
ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.DIST_SET_TYPE_DESC, false, "", ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.DIST_SET_TYPE_DESC, false, "",
i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH); i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
tagDesc.setId(SPUIDefinitions.NEW_DISTRIBUTION_TYPE_DESC); tagDesc.setId(SPUIDefinitions.NEW_DISTRIBUTION_TYPE_DESC);
tagDesc.setImmediate(true); tagDesc.setImmediate(true);
tagDesc.setNullRepresentation(""); tagDesc.setNullRepresentation("");

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
View File

@@ -52,9 +52,6 @@ import com.vaadin.ui.themes.ValoTheme;
/** /**
* Add and Update Target. * Add and Update Target.
*
*
*
*/ */
@SpringComponent @SpringComponent
@VaadinSessionScope @VaadinSessionScope

5
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponentIdProvider.java
View File

@@ -927,6 +927,11 @@ public final class SPUIComponentIdProvider {
*/ */
public static final String UPLOAD_STATUS_POPUP_ID = "artifact.upload.status.popup.id"; public static final String UPLOAD_STATUS_POPUP_ID = "artifact.upload.status.popup.id";
/**
* Table multiselect for selecting DistType
*/
public static final String SELECT_DIST_TYPE = "select-dist-type";
/** /**
* /* Private Constructor. * /* Private Constructor.
*/ */

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

@@ -54,7 +54,22 @@
} }
.v-gridlayout .v-gridlayout-marginTop { .v-gridlayout .v-gridlayout-marginTop {
padding-top: 20px !important; margin-top: 20px !important;
} }
.v-slot .v-slot-marginTop {
margin-top: 20px !important;
}
.v-gridlayout-marginTop {
margin-top: 20px !important;
}
.v-slot-marginTop {
margin-top: 20px !important;
}
.marginTop {
margin-top: 20px !important;
}
} }