Greg Sheremeta has uploaded a new change for review. Change subject: webadmin: fixed configure dialog misc issues ......................................................................
webadmin: fixed configure dialog misc issues PatternFly patch caused multiple alignment issues in the Configure dialog. Fixed. Change-Id: I862051b41bf076b6f745f2adfafa6d29562a22d8 Bug-Url: https://bugzilla.redhat.com/1096845 Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml M packaging/branding/ovirt.brand/patternfly-custom-hacks.css 4 files changed, 46 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/28199/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml index 75b56dc..ff7cf19 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml @@ -514,7 +514,7 @@ </g:HorizontalPanel> </g:FlowPanel> </g:FlowPanel> - <ge:EntityModelDetachableWidget ui:field="isSmartcardEnabledEditorWithDetachable" addStyleNames="{style.floatLeft}" /> + <ge:EntityModelDetachableWidget ui:field="isSmartcardEnabledEditorWithDetachable" addStyleNames="{style.floatLeft} avmpw_smartcard_pfly_fix" /> <g:Label ui:field="nativeUsbWarningMessage" text="{constants.nativeUsbSupportWarning}" addStyleNames="{style.warningMessageLabel}" /> <g:Label ui:field="ssoMethodLabel" text="{constants.ssoMethod}" addStyleNames="{style.sectionLabel} {style.floatLeft} {style.fullWidth}" /> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.ui.xml index 442e912..f33eb56 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.ui.xml @@ -20,12 +20,15 @@ } .buttonPanel { - padding-left: 5px; + margin-left: 5px; vertical-align: middle; } .radioButton { vertical-align: middle; + position: relative; + top: 2px; + padding-left: 5px; } .radioButton label { @@ -34,6 +37,7 @@ padding-bottom: 7px; padding-left: 1px; padding-right: 2px; + padding-top: 3px; } .label { @@ -53,6 +57,16 @@ right: 2px; width: 325px; } + + .expandAllButton { + line-height: 16px; + margin-right: 10px; + } + + .collapseAllButton { + line-height: 16px; + } + </ui:style> <d:SimpleDialogPanel width="650px" height="500px"> @@ -71,8 +85,8 @@ <g:HTML><hr style="width:100%;" /></g:HTML> <g:Label ui:field="explainationLabel" addStyleNames="{style.explanationLabel}"/> <g:HorizontalPanel addStyleNames="{style.buttonPanel}"> - <g:Button ui:field="expandAllButton"/> - <g:Button ui:field="collapseAllButton"/> + <g:Button ui:field="expandAllButton" addStyleNames="{style.expandAllButton}"/> + <g:Button ui:field="collapseAllButton" addStyleNames="{style.collapseAllButton}"/> </g:HorizontalPanel> <g:ScrollPanel height="300px" addStyleNames="{style.treePanel} rpv_treePanel_pfly_fix"> <we:EntityModelCellTree ui:field="tree"/> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml index 91af71f..8304092 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml @@ -86,16 +86,16 @@ <d:content> <g:VerticalPanel> <g:FlowPanel> - <g:HorizontalPanel> + <g:HorizontalPanel addStyleNames="cppv_editors_pfly_fix"> <ge:StringEntityModelTextBoxEditor ui:field="nameEditor" /> <ge:StringEntityModelTextBoxEditor ui:field="descriptionEditor" /> </g:HorizontalPanel> <g:HorizontalPanel> <g:Label addStyleNames="{style.sectionLabel}" text="{constants.clusterPolicyFilterLabel}" /> - <g:Label addStyleNames="{style.labelStyle}" + <g:Label addStyleNames="{style.labelStyle} cppv_labelStyle_pfly_fix" text="{constants.clusterPolicyExplanationMessage}" /> - <d:InfoIcon ui:field="filterInfoIcon" addStyleNames="{style.iconInfoStyle}"/> + <d:InfoIcon ui:field="filterInfoIcon" addStyleNames="{style.iconInfoStyle} cppv_infoIcon_pfly_fix"/> </g:HorizontalPanel> <g:HTML> <hr style="width:100%;" /> @@ -125,9 +125,9 @@ <g:HorizontalPanel> <g:Label addStyleNames="{style.sectionLabel}" text="{constants.clusterPolicyFunctionLabel}" /> - <g:Label addStyleNames="{style.labelStyle}" + <g:Label addStyleNames="{style.labelStyle} cppv_labelStyle_pfly_fix" text="{constants.clusterPolicyExplanationMessage}" /> - <d:InfoIcon ui:field="functionInfoIcon" addStyleNames="{style.iconInfoStyle}"/> + <d:InfoIcon ui:field="functionInfoIcon" addStyleNames="{style.iconInfoStyle} cppv_infoIcon_pfly_fix"/> </g:HorizontalPanel> <g:HTML> <hr style="width:100%;" /> @@ -157,7 +157,7 @@ <g:HorizontalPanel> <g:Label addStyleNames="{style.sectionLabel}" text="{constants.clusterPolicyLoadBalancerLabel}" /> - <d:InfoIcon ui:field="loadBalancingInfoIcon" addStyleNames="{style.iconInfoStyle}"/> + <d:InfoIcon ui:field="loadBalancingInfoIcon" addStyleNames="{style.iconInfoStyle} cppv_infoIcon_pfly_fix"/> </g:HorizontalPanel> <g:HTML> <hr style="width:100%;" /> @@ -172,7 +172,7 @@ <g:HorizontalPanel> <g:Label addStyleNames="{style.sectionLabel}" text="{constants.clusterPolicyPropertiesLabel}" /> - <d:InfoIcon ui:field="propertiesInfoIcon" addStyleNames="{style.iconInfoStyle}"/> + <d:InfoIcon ui:field="propertiesInfoIcon" addStyleNames="{style.iconInfoStyle} cppv_infoIcon_pfly_fix"/> </g:HorizontalPanel> <g:HTML> <hr style="width:100%;" /> diff --git a/packaging/branding/ovirt.brand/patternfly-custom-hacks.css b/packaging/branding/ovirt.brand/patternfly-custom-hacks.css index 1d13fec..847d547 100644 --- a/packaging/branding/ovirt.brand/patternfly-custom-hacks.css +++ b/packaging/branding/ovirt.brand/patternfly-custom-hacks.css @@ -137,18 +137,24 @@ padding-left: 5px; padding-right: 5px; } +#InstanceTypesPopupWidget .avmpw_nameEditor_pfly_fix input { + line-height: 16px !important; +} .connect-automatically-checkbox_pfly_fix { margin-left: 3px; } span.label { font-family: 'Open Sans', Helvetica, Arial, sans-serif; } - .avw_contentWidget_pfly_fix span.gwt-RadioButton label { padding-left: 5px !important; } .avmpw_monitorsLabel_pfly_fix { width: 276px !important; +} +#InstanceTypesPopupWidget .avmpw_smartcard_pfly_fix { + position: relative; + left: -9px; } .cpv_panelInfo_pfly_fix { margin-left: 5px !important; @@ -478,4 +484,17 @@ top: -6px !important; right: 3px !important; } - +@media screen and (-webkit-min-device-pixel-ratio:0) { + .cppv_editors_pfly_fix input { + position: relative; + top: -31px; + } +} +.cppv_labelStyle_pfly_fix { + position: relative !important; + top: 4px !important; +} +.cppv_infoIcon_pfly_fix { + position: relative !important; + top: 3px !important; +} -- To view, visit http://gerrit.ovirt.org/28199 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I862051b41bf076b6f745f2adfafa6d29562a22d8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
