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

Correct the button's style on rollout view

Browse Source 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-07-15 16:25:02 +02:00
parent 0244c1ded1
commit c8f307cf33
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/client/renderers/HtmlButtonRenderer.java
View File

@@ -8,6 +8,8 @@
*/ */
package org.eclipse.hawkbit.ui.customrenderers.client.renderers; package org.eclipse.hawkbit.ui.customrenderers.client.renderers;
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Button;
import com.vaadin.client.renderers.ButtonRenderer; import com.vaadin.client.renderers.ButtonRenderer;
import com.vaadin.client.ui.VButton; import com.vaadin.client.ui.VButton;
@@ -29,11 +31,8 @@ public class HtmlButtonRenderer extends ButtonRenderer {
applystyles(button, buttonEnable); applystyles(button, buttonEnable);
// this is to allow the button to disappear, if the text is null // this is to allow the button to disappear, if the text is null
button.setVisible(text != null); button.setVisible(text != null);
button.getElement().setId(SPUIComponentIdProvider.ROLLOUT_ACTION_ID + "." + cell.getColumnIndex());
button.getElement().setId("rollout.action.button.id." + cell.getColumnIndex());
button.setEnabled(buttonEnable); button.setEnabled(buttonEnable);
} }
/** /**
@@ -48,11 +47,12 @@ public class HtmlButtonRenderer extends ButtonRenderer {
} }
private void applystyles(final Button button, final boolean buttonEnable) { private void applystyles(final Button button, final boolean buttonEnable) {
button.setStyleName(VButton.CLASSNAME); button.setStyleName(VButton.CLASSNAME);
button.addStyleName(getStyle("tiny")); button.addStyleName(getStyle("tiny"));
button.addStyleName(getStyle("borderless")); button.addStyleName(getStyle("borderless"));
button.addStyleName(getStyle("icon-only"));
button.addStyleName(getStyle("button-no-border")); button.addStyleName(getStyle("button-no-border"));
button.addStyleName(getStyle("action-type-padding"));
if (buttonEnable) { if (buttonEnable) {
return; return;

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

@@ -52,6 +52,10 @@
opacity: 0.5; opacity: 0.5;
} }
.action-type-padding{
padding: 0 0px !important;
}
.rollout-caption-links{ .rollout-caption-links{
font-weight: 400; font-weight: 400;
height: 25px ; height: 25px ;