zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-219

Browse source
This commit is contained in:
anhefti 2021-08-10 09:38:16 +02:00
parent eb45dcf0f3
commit 43ca2f6ba9
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/DefaultPageLayout.java
View file

@ -162,13 +162,15 @@ public class DefaultPageLayout implements TemplateComposer {
private void composeLogoBar(final PageContext pageContext) { private void composeLogoBar(final PageContext pageContext) {
final Composite logoBar = new Composite(pageContext.getParent(), SWT.NONE); final Composite logoBar = new Composite(pageContext.getParent(), SWT.NONE);
final GridData logoBarCell = new GridData(SWT.FILL, SWT.TOP, false, false); final GridData logoBarCell = new GridData(SWT.FILL, SWT.TOP, true, false);
logoBarCell.minimumHeight = 80; logoBarCell.minimumHeight = 80;
logoBarCell.heightHint = 80; logoBarCell.heightHint = 80;
logoBarCell.horizontalIndent = 0;
logoBar.setLayoutData(logoBarCell); logoBar.setLayoutData(logoBarCell);
logoBar.setData(RWT.CUSTOM_VARIANT, "logo"); logoBar.setData(RWT.CUSTOM_VARIANT, "logo");
final GridLayout logoBarLayout = new GridLayout(2, false); final GridLayout logoBarLayout = new GridLayout(2, true);
logoBarLayout.horizontalSpacing = 0; logoBarLayout.horizontalSpacing = 0;
logoBarLayout.verticalSpacing = 0;
logoBarLayout.marginHeight = 0; logoBarLayout.marginHeight = 0;
logoBar.setLayout(logoBarLayout); logoBar.setLayout(logoBarLayout);
@ -177,7 +179,7 @@ public class DefaultPageLayout implements TemplateComposer {
logoCell.minimumHeight = LOGO_IMAGE_MAX_HEIGHT; logoCell.minimumHeight = LOGO_IMAGE_MAX_HEIGHT;
logoCell.heightHint = LOGO_IMAGE_MAX_HEIGHT; logoCell.heightHint = LOGO_IMAGE_MAX_HEIGHT;
logoCell.minimumWidth = LOGO_IMAGE_MAX_WIDTH; logoCell.minimumWidth = LOGO_IMAGE_MAX_WIDTH;
logoCell.horizontalIndent = 50; logoCell.horizontalIndent = 0;
logo.setLayoutData(logoCell); logo.setLayoutData(logoCell);
// try to get institutional logo first. If no success, use default logo // try to get institutional logo first. If no success, use default logo
@ -204,8 +206,8 @@ public class DefaultPageLayout implements TemplateComposer {
contentBackground.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); contentBackground.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
contentBackground.setData(RWT.CUSTOM_VARIANT, "bgContent"); contentBackground.setData(RWT.CUSTOM_VARIANT, "bgContent");
final GridLayout innerGrid = new GridLayout(); final GridLayout innerGrid = new GridLayout();
innerGrid.marginLeft = 50; innerGrid.marginLeft = 55;
innerGrid.marginRight = 50; innerGrid.marginRight = 55;
innerGrid.marginHeight = 0; innerGrid.marginHeight = 0;
innerGrid.marginWidth = 0; innerGrid.marginWidth = 0;

3
src/main/resources/static/css/sebserver.css
View file

@ -157,6 +157,7 @@ Composite.header {
Composite.logo { Composite.logo {
background-color: #1F407A; background-color: #1F407A;
margin: 0 0 0 0;
} }
Composite.bgLogo { Composite.bgLogo {
@ -164,12 +165,14 @@ Composite.bgLogo {
background-image: url(static/images/sebserver-logo.png); background-image: url(static/images/sebserver-logo.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: left center; background-position: left center;
margin: 0 0 0 0;
} }
Composite.bgLogoNoImage { Composite.bgLogoNoImage {
background-color: transparent; background-color: transparent;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: left center; background-position: left center;
margin: 0 0 0 0;
} }
Composite.bgContent { Composite.bgContent {