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

Merge pull request #163 from bsinno/fix_filter_icon_not_centered

Browse Source 
Filter icon (succes/error) not centered
This commit is contained in:
Michael Hirsch
2016-05-11 09:15:16 +02:00
parent 130c018cb7 f89b7e4beb
commit cd96916d67
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,20 +150,20 @@ public abstract class AbstractTableDetailsLayout<T extends NamedEntity> extends
private void buildLayout() { private void buildLayout() {
final HorizontalLayout nameEditLayout = new HorizontalLayout(); final HorizontalLayout nameEditLayout = new HorizontalLayout();
nameEditLayout.setWidth(100.0f, Unit.PERCENTAGE); nameEditLayout.setWidth(100.0F, Unit.PERCENTAGE);
nameEditLayout.addComponent(caption); nameEditLayout.addComponent(caption);
nameEditLayout.setComponentAlignment(caption, Alignment.MIDDLE_LEFT); nameEditLayout.setComponentAlignment(caption, Alignment.TOP_LEFT);
if (hasEditPermission()) { if (hasEditPermission()) {
nameEditLayout.addComponent(editButton); nameEditLayout.addComponent(editButton);
nameEditLayout.setComponentAlignment(editButton, Alignment.MIDDLE_RIGHT); nameEditLayout.setComponentAlignment(editButton, Alignment.TOP_RIGHT);
} }
nameEditLayout.setExpandRatio(caption, 1.0f); nameEditLayout.setExpandRatio(caption, 1.0F);
nameEditLayout.addStyleName(SPUIStyleDefinitions.WIDGET_TITLE); nameEditLayout.addStyleName(SPUIStyleDefinitions.WIDGET_TITLE);
addComponent(nameEditLayout); addComponent(nameEditLayout);
setComponentAlignment(nameEditLayout, Alignment.MIDDLE_CENTER); setComponentAlignment(nameEditLayout, Alignment.TOP_CENTER);
addComponent(detailsTab); addComponent(detailsTab);
setComponentAlignment(nameEditLayout, Alignment.MIDDLE_CENTER); setComponentAlignment(nameEditLayout, Alignment.TOP_CENTER);
setSizeFull(); setSizeFull();
setHeightUndefined(); setHeightUndefined();

9
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
View File

@@ -54,7 +54,6 @@ public abstract class AbstractTableHeader extends VerticalLayout {
@Autowired @Autowired
protected transient EventBus.SessionEventBus eventbus; protected transient EventBus.SessionEventBus eventbus;
private Label headerCaption; private Label headerCaption;
private TextField searchField; private TextField searchField;
@@ -171,8 +170,8 @@ public abstract class AbstractTableHeader extends VerticalLayout {
} }
titleFilterIconsLayout.addComponent(maxMinIcon); titleFilterIconsLayout.addComponent(maxMinIcon);
titleFilterIconsLayout.setComponentAlignment(maxMinIcon, Alignment.TOP_RIGHT); titleFilterIconsLayout.setComponentAlignment(maxMinIcon, Alignment.TOP_RIGHT);
titleFilterIconsLayout.setExpandRatio(headerCaption, 0.4f); titleFilterIconsLayout.setExpandRatio(headerCaption, 0.4F);
titleFilterIconsLayout.setExpandRatio(searchField, 0.6f); titleFilterIconsLayout.setExpandRatio(searchField, 0.6F);
addComponent(titleFilterIconsLayout); addComponent(titleFilterIconsLayout);
@@ -192,10 +191,10 @@ public abstract class AbstractTableHeader extends VerticalLayout {
dropHintDropFilterLayout.addComponent(dropFilterLayout); dropHintDropFilterLayout.addComponent(dropFilterLayout);
dropHintDropFilterLayout.setComponentAlignment(dropFilterLayout, Alignment.TOP_CENTER); dropHintDropFilterLayout.setComponentAlignment(dropFilterLayout, Alignment.TOP_CENTER);
dropHintDropFilterLayout.setExpandRatio(dropFilterLayout, 1.0f); dropHintDropFilterLayout.setExpandRatio(dropFilterLayout, 1.0F);
} }
addComponent(dropHintDropFilterLayout); addComponent(dropHintDropFilterLayout);
setComponentAlignment(dropHintDropFilterLayout, Alignment.MIDDLE_CENTER); setComponentAlignment(dropHintDropFilterLayout, Alignment.TOP_CENTER);
addStyleName("bordered-layout"); addStyleName("bordered-layout");
addStyleName("no-border-bottom"); addStyleName("no-border-bottom");
} }

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
View File

@@ -290,7 +290,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
searchLayout.setSpacing(false); searchLayout.setSpacing(false);
searchLayout.addComponents(validationIcon, queryTextField); searchLayout.addComponents(validationIcon, queryTextField);
searchLayout.addStyleName("custom-search-layout"); searchLayout.addStyleName("custom-search-layout");
searchLayout.setComponentAlignment(validationIcon, Alignment.MIDDLE_CENTER); searchLayout.setComponentAlignment(validationIcon, Alignment.TOP_CENTER);
final HorizontalLayout iconLayout = new HorizontalLayout(); final HorizontalLayout iconLayout = new HorizontalLayout();
iconLayout.setSizeUndefined(); iconLayout.setSizeUndefined();

8
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
View File

@@ -112,9 +112,9 @@ public final class DashboardMenu extends CustomComponent {
final VerticalLayout links = buildLinksAndVersion(); final VerticalLayout links = buildLinksAndVersion();
menus.addComponent(links); menus.addComponent(links);
menus.setComponentAlignment(links, Alignment.BOTTOM_CENTER); menus.setComponentAlignment(links, Alignment.BOTTOM_CENTER);
menus.setExpandRatio(links, 1.0f); menus.setExpandRatio(links, 1.0F);
menuContent.addComponent(menus); menuContent.addComponent(menus);
menuContent.setExpandRatio(menus, 1.0f); menuContent.setExpandRatio(menus, 1.0F);
dashboardMenuLayout.addComponent(menuContent); dashboardMenuLayout.addComponent(menuContent);
return dashboardMenuLayout; return dashboardMenuLayout;
@@ -136,7 +136,7 @@ public final class DashboardMenu extends CustomComponent {
final Label logo = new Label("<strong>" + i18n.get("menu.title") + "</strong>", ContentMode.HTML); final Label logo = new Label("<strong>" + i18n.get("menu.title") + "</strong>", ContentMode.HTML);
logo.setSizeUndefined(); logo.setSizeUndefined();
final HorizontalLayout logoWrapper = new HorizontalLayout(logo); final HorizontalLayout logoWrapper = new HorizontalLayout(logo);
logoWrapper.setComponentAlignment(logo, Alignment.MIDDLE_CENTER); logoWrapper.setComponentAlignment(logo, Alignment.TOP_CENTER);
logoWrapper.addStyleName("valo-menu-title"); logoWrapper.addStyleName("valo-menu-title");
return logoWrapper; return logoWrapper;
} }
@@ -225,7 +225,7 @@ public final class DashboardMenu extends CustomComponent {
private VerticalLayout buildMenuItems() { private VerticalLayout buildMenuItems() {
final VerticalLayout menuItemsLayout = new VerticalLayout(); final VerticalLayout menuItemsLayout = new VerticalLayout();
menuItemsLayout.addStyleName("valo-menuitems"); menuItemsLayout.addStyleName("valo-menuitems");
menuItemsLayout.setHeight(100.0f, Unit.PERCENTAGE); menuItemsLayout.setHeight(100.0F, Unit.PERCENTAGE);
final List<DashboardMenuItem> accessibleViews = getAccessibleViews(); final List<DashboardMenuItem> accessibleViews = getAccessibleViews();
if (accessibleViews.isEmpty()) { if (accessibleViews.isEmpty()) {

4
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss
View File

@@ -28,12 +28,12 @@
.error-icon{ .error-icon{
color:$success-icon-color !important; color:$success-icon-color !important;
padding:2px; padding-left:2px !important;
} }
.success-icon{ .success-icon{
color:$error-icon-color !important; color:$error-icon-color !important;
padding:2px; padding-left:2px !important;
} }
.on-focus-no-border:focus::after{ .on-focus-no-border:focus::after{