Mercurial > dive4elements > river
changeset 66:a361ce81abcf
Customized style for header and mainmenu.
flys-client/trunk@1557 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Thu, 24 Mar 2011 15:48:13 +0000 |
| parents | 8f719fa1a691 |
| children | 74257b95567b |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSHeader.java flys-client/src/main/java/de/intevation/flys/client/client/ui/MainMenu.java flys-client/src/main/webapp/FLYS.css |
| diffstat | 4 files changed, 79 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Wed Mar 23 11:19:18 2011 +0000 +++ b/flys-client/ChangeLog Thu Mar 24 15:48:13 2011 +0000 @@ -1,3 +1,13 @@ +2011-03-24 Raimund Renkert <rrenkert@intevation.de> + + * src/main/java/de/intevation/flys/client/client/ui/MainMenu.java: Set styles + for label. + + * src/main/java/de/intevation/flys/client/client/ui/FLYSHeader.java: Fixed the + method to calculate the image width and resized the BfG logo. + + * src/main/webapp/FLYS.css: Introduced styles for fonts and BfG colorscheme. + 2011-03-23 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSHeader.java Wed Mar 23 11:19:18 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSHeader.java Thu Mar 24 15:48:13 2011 +0000 @@ -51,11 +51,12 @@ Img bfg = new Img( bfgRes.getURL(), - calcWidth(bfgRes, IMG_HEIGHT), - IMG_HEIGHT); + calcWidth(bfgRes, HEIGHT), + HEIGHT); Label fullname = new Label(MESSAGES.fullname()); fullname.setHeight(HEIGHT - IMG_HEIGHT); + fullname.setStyleName ("fontNormalMid"); VLayout left = new VLayout(); left.addMember(flys); @@ -83,8 +84,8 @@ int widthOrig = res.getWidth(); int heightOrig = res.getHeight(); - double factor = heightOrig / height; - double width = widthOrig / factor; + double factor = (double)heightOrig / height; + double width = (double)widthOrig / factor; return (int) width * 10 / 10; }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/MainMenu.java Wed Mar 23 11:19:18 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/MainMenu.java Thu Mar 24 15:48:13 2011 +0000 @@ -103,12 +103,20 @@ * colors and so on and appends the components. */ protected void init() { - setWidth100(); - setHeight("35px"); - setBorder("1px solid #808080"); - setBackgroundColor("#C3D9FF"); + setStyleName("bgBlueDark"); + setHeight("25px"); setLayoutMargin(5); + newProject.setStyleName("fontLightSmall"); + projectList.setStyleName("fontLightSmall"); + userText.setStyleName("fontLightSmall"); + newProject.setStyleName("fontLightSmall"); + logout.setStyleName("fontLightSmall"); + language.setStyleName("fontLightSmall"); + info.setStyleName("fontLightSmall"); + + projectList.setWidth("140px"); + HLayout leftPanel = new HLayout(); leftPanel.setWidth("80%"); leftPanel.setMembersMargin(5);
--- a/flys-client/src/main/webapp/FLYS.css Wed Mar 23 11:19:18 2011 +0000 +++ b/flys-client/src/main/webapp/FLYS.css Thu Mar 24 15:48:13 2011 +0000 @@ -32,3 +32,55 @@ #closeButton { margin: 15px 6px 6px; } + + +/** BfG Colors */ +.bgBlueLight { + background-color: #cfe1f1; +} + +.bgBlueMid { + background-color: #a9c9e6; +} + +.bgBlueDark { + background-color: #669fd1; +} + + +/** Fontstyles */ +.fontLightSmall { + font-family: Arial,Verdana,sans-serif; + font-size: 10pt; + color: #cfe1f1; +} + +.fontLightMid { + font-family: Arial,Verdana,sans-serif; + font-size: 12pt; + color: #cfe1f1; +} + +.fontLightBig { + font-family: Arial,Verdana,sans-serif; + font-size: 18pt; + color: #cfe1f1; +} + +.fontNormalSmall { + font-family: Arial,Verdana,sans-serif; + font-size: 10pt; + color: #a9c9e6; +} + +.fontNormalMid { + font-family: Arial,Verdana,sans-serif; + font-size: 12pt; + color: #a9c9e6; +} + +.fontNormalBig { + font-family: Arial,Verdana,sans-serif; + font-size: 18pt; + color: #a9c9e6; +}