From 8e8655fe35603dd26c49d0692f97a2632e4a2a42 Mon Sep 17 00:00:00 2001 From: ribeaudc <ribeaudc> Date: Thu, 30 Oct 2008 07:29:14 +0000 Subject: [PATCH] change: - Clean-up 'openbis.css' SVN: 8820 --- .../web/client/application/ui/LoginPage.java | 4 +- .../client/application/ui/SampleRenderer.java | 3 +- .../cisd/openbis/public/css/openbis.css | 75 +++++++++---------- 3 files changed, 37 insertions(+), 45 deletions(-) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPage.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPage.java index 991cd90656d..5849764aace 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPage.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPage.java @@ -37,7 +37,7 @@ public class LoginPage extends LayoutContainer public LoginPage(final GenericViewContext viewContext) { - setStyleName("start-page"); + setStyleName("login-page"); setLayout(new CenterLayout()); final VerticalPanel verticalPanel = new VerticalPanel(); verticalPanel.setSpacing(30); @@ -49,7 +49,7 @@ public class LoginPage extends LayoutContainer headerPanel.add(viewContext.getImageBundle().getLogo().createImage()); final Text welcomeLabel = new Text(viewContext.getMessage("welcome", new Date())); - welcomeLabel.setStyleName("header-title"); + welcomeLabel.setStyleName("login-welcome-text"); headerPanel.add(welcomeLabel); verticalPanel.add(headerPanel); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SampleRenderer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SampleRenderer.java index 0a7f6de2e5c..b3776ffa7a4 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SampleRenderer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SampleRenderer.java @@ -25,7 +25,6 @@ import com.google.gwt.user.client.Element; import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames; - /** * Renders sample code and marks if the sample is invalid * @@ -42,7 +41,7 @@ public class SampleRenderer implements GridCellRenderer<ModelData> if (isInvalid) { Element div = DOM.createDiv(); - div.setAttribute("class", "invalidated-sample"); + div.setAttribute("class", "invalid"); div.setInnerText(code); return DOM.toString(div); } else diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css b/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css index 01924cf6388..0f43d389558 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css +++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/css/openbis.css @@ -3,23 +3,25 @@ body,div,td { font-size: 12px; } -.header-title { +/* Login */ + +.login-welcome-text { font-size: 24px; font-weight: bold; margin-top: 30px; vertical-align: middle; } +.login-page { + background-color: white; +} + .login-widget { border: 1px solid #B5B8C8; padding-bottom: 7px; padding-right: 7px; } -.start-page { - background-color: white; -} - .footer { width: 100%; text-align: center; @@ -28,10 +30,12 @@ body,div,td { background-color: white; } -.invalidated-sample { +.invalid { text-decoration: line-through; } +/* Property grid */ + .property-grid { table-layout: auto; border-collapse: collapse; @@ -48,51 +52,40 @@ body,div,td { background-color: #dddddd; } +/* TopMenu */ + #header-user-info { - font-weight: lighter; - color: black; + font-weight: lighter; + color: black; } #header-title { - font-weight: lighter; - font-size: large; - /*color: navy;*/ - margin-left: 1em; - margin-right: 1em; + font-weight: lighter; + font-size: large; + margin-left: 1em; + margin-right: 1em; } -.intro-tab{ - color: navy; - font-size: large; - text-align: center; -} +/* MainTabPanel */ -.dummy-component{ - text-align: center; -} -/* -.left-menu-element-icon { - background-image: url(../images/favicon.png) !important; +.intro-tab { + color: navy; + font-size: large; + text-align: center; } -*/ -/* Overwrite GXT styles */ +.dummy-component { + text-align: center; +} -/*.my-tree-item-text{ - color: navy; - text-transform: capitalize; - text-decoration: underline; -}*/ +/* Overridden GXT stuff */ -.x-btn-text{ - color: navy; - text-transform: capitalize; -} -.x-accordion-hd{ - text-transform: capitalize; - color: navy; +.x-btn-text { + color: navy; + text-transform: capitalize; } -/* -.x-btn{ -}*/ +.x-accordion-hd { + text-transform: capitalize; + color: navy; +} \ No newline at end of file -- GitLab