Author: ips Date: 2009-08-11 19:49:51 -0400 (Tue, 11 Aug 2009) New Revision: 668 Modified: trunk/core/src/main/webapp/css/console-style.css trunk/core/src/main/webapp/login.xhtml Log: fix the CSS for the welcome message on the login page and fix the color of the product name header Modified: trunk/core/src/main/webapp/css/console-style.css =================================================================== --- trunk/core/src/main/webapp/css/console-style.css 2009-08-11 23:29:31 UTC (rev 667) +++ trunk/core/src/main/webapp/css/console-style.css 2009-08-11 23:49:51 UTC (rev 668) @@ -106,8 +106,11 @@ /* ------- Common Elements ---------- */ -p { - margin: 0px; +p + p { + /* Only set a top margin on paragraphs that follow other paragraphs + (i.e. it will not set the margin of the first paragraph on the page, + or the first paragraph in a section). */ + margin-top: 0.5em; } a { @@ -164,6 +167,7 @@ .headerText { font-size: 24px; font-weight: normal; + color: #DDD; } .tabmenubox { Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2009-08-11 23:29:31 UTC (rev 667) +++ trunk/core/src/main/webapp/login.xhtml 2009-08-11 23:49:51 UTC (rev 668) @@ -61,18 +61,21 @@ <h:messages layout="table" styleClass="loginerror-msg"/> <h:form id="login_form"> <div> - <h2>#{messages['login.welcome.paragraph1']} #{messages['product.name']}#{messages['login.welcome.paragraph2']}</h2> - - <h2>#{messages['login.loginToProceed']}</h2> - - <p/> - <h:outputLabel for="name" value="#{messages['security.username']}"/><br/> - <h:inputText id="name" value="#{identity.username}" size="20"/></div> - <div style="padding-top: 10px;"><h:outputLabel for="password" value="#{messages['security.password']}"/><br/> - <h:inputSecret id="password" value="#{identity.password}" size="20"/></div> - <div style="padding-top: 10px;"><h:commandButton value="#{messages['security.login']}" id="submit" - action="#{identity.login()}" styleClass="buttonmed"/> + <p>#{messages['login.welcome.paragraph1']} #{messages['product.name']}#{messages['login.welcome.paragraph2']}</p> + <p>#{messages['login.loginToProceed']}</p> + <p> + <h:outputLabel for="name" value="#{messages['security.username']}"/><br/> + <h:inputText id="name" value="#{identity.username}" size="20"/> + </p> </div> + <div style="padding-top: 10px;"> + <h:outputLabel for="password" value="#{messages['security.password']}"/><br/> + <h:inputSecret id="password" value="#{identity.password}" size="20"/> + </div> + <div style="padding-top: 10px;"> + <h:commandButton value="#{messages['security.login']}" id="submit" + action="#{identity.login()}" styleClass="buttonmed"/> + </div> </h:form> </div> <div style="margin-top:130px;">