Changeset 7388

Timestamp:

03/10/09 17:13:53 (17 months ago)

Author:

stoomey

Message:

css updates and images to support article page redesign.

References #1115

Location:

head/ambra

Files:

• journals/journal-overlay/src/main/resources/struts/journals/overlayJournal/css/screen.css (modified) (17 diffs)
• journals/journal-overlay/src/main/resources/struts/journals/overlayJournal/images/dialog_pb.gif (modified) (previous)
• webapp/src/main/webapp/article/article_content.ftl (modified) (1 diff)
• webapp/src/main/webapp/css/screen.css (modified) (6 diffs)

head/ambra/journals/journal-overlay/src/main/resources/struts/journals/overlayJournal/css/screen.css

@@ -20 +20 @@
 /*      -------------------------------------------------------------
 
-        GLOBAL STYLE SHEET FOR : Ambra Journal
+        GLOBAL STYLE SHEET FOR : Ambra Overlay Journal
         CREATED ON  : 08-26-2006
         CREATED BY      : MARGARET SHEAR
@@ -56 +56 @@
 strong          { font-weight: bold; }
 h1 sup          { font-size: .75em; }
-ul, ol, dl      { margin: 20px; position: relative; }
 ol.simple {list-style-type: none; margin: 20px; position: relative; }
 ol.roman-lower {list-style-type: lower-roman; margin: 20px; position: relative; }
@@ -67 +66 @@
 th                      { padding: 6px; background-color: #fdae7a; border: 4px solid #FFF; border-width: 0 3px 3px 0; font-weight: bold;}
 td                      { padding: 6px; background-color: #fcd3b8; border: 4px solid #FFF; border-width: 0 3px 3px 0; }
+table.layout { margin:0; }
+table.layout td { padding:0; background-color:transparent; border:0; vertical-align:top; }
+
 /* Default Headings */
 h1, h2, h3      { font-family: Georgia, "Times New Roman", Times, serif; color: #333; /*position: relative; Note: this was causing links in floated articleMenu to be covered up and unclickable in Firefox2 */ }
@@ -81 +83 @@
 */
 .noshow { display:block; height:0px; line-height:0em; } /* can be applied to elements that need to be present in the flow but not impact vertical spacing, e.g. in-page anchors */
-.clearer  { clear:both; line-height:0; height:0; display:none; }
 .clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 .clearfix { zoom:1; } /*zoom allows self-clearing floats to work in IE*/
@@ -124 +125 @@
 a.advanced              { background-image: url(../images/icon_advanced.gif); }
 a.browse                { background-image: url(../images/icon_browse.gif); }
+a.info { background:url(../images/button_info.png); }
 
 /* Article Icons */
@@ -331 +333 @@
 */
 
-/*TEMP STYLE: suppresses 2nd instance of research article title on the article page*/
-div#articleMenu + h1 { display:none; }
-
 /* article page tabs */
-div.horizontalTabs      { position:relative; border:0; margin-top:15px; padding:0; background:transparent; width:100%; }
+div.horizontalTabs      { /*position:relative;*/ border:0; margin-top:15px; padding:0; background:transparent; width:99%; }
 div.horizontalTabs:after  { content:"."; display: block; height:0; clear:left; visibility:hidden; }
-/*div#articleContainer div#researchArticle*/ ul#tabsContainer  { float:left;  margin:0!important; padding:0 0 0 10px!important; /* "!important" required for IE7 */ line-height:normal; background:transparent url("../images/tab_bg.gif") repeat-x bottom; width:640px; }
+/*div#articleContainer div#researchArticle*/ ul#tabsContainer  { float:left; clear:none; margin:0!important; padding:0 0 0 10px!important; /* "!important" required for IE7 */ line-height:normal; background:transparent url("../images/tab_bg.gif") repeat-x bottom; width:640px; }
 ul#tabsContainer ul { margin:0; padding:10px 10px 0; }
 ul#tabsContainer li             { cursor:pointer; float:left; background:url("../images/tab_left.gif") no-repeat 0% 0%; margin:0 2px; padding:0 0 0 8px; list-style:none; font-size:.9em; font-weight:bold; color:#666; }
@@ -351 +350 @@
 div.static h1,
 div.content h1,
-div.search h1 { /* article title */font-size: 2.2em;    line-height: 1.1em;     margin: 10px 0 0 0;font-weight: normal; }
+div.search h1 { font-size:1.7em; line-height:1.2em;     margin:10px 0 0 0; font-weight:bold; }
 
 
@@ -359 +358 @@
 div.pageerror p         { margin-left: 8px; }
 div.content h2  { /* article sub-title */ margin: 10px 0; font-style: italic; font-size: 1.5em; background: none; padding: 0;}
-
 div.static h2,
 div.content h3  { /* article main body heading */ font-size: 1.6em; margin: 20px 0 0 0; border-bottom: 1px solid #ccc; padding-bottom: 3px;}
+div.content h2 a,
+div.content h3 a { font-family: Verdana,Arial,Helvetica,sans-serif; font-size:0.6em; }
 
 div.static h3,
@@ -397 +397 @@
 div#contentHeader p { margin: 0; padding:0; text-indent: -9999px; }
 div#contentHeader p#articleType { text-transform:uppercase; text-indent:7px; margin-top:-13px; font-weight:bold; color:#fff; background-color:transparent; }
+div#contentHeader a.info { background-position:0 0.3em; background-repeat:no-repeat; display:inline-block; text-indent:-9999px; width:14px; }
 
 div#publisher { border-bottom:1px dashed #c60; background-color:#fff; } /* background color allows bottom border to display in IE6 */
@@ -408 +409 @@
 p.oa-banner             { margin: 0; padding: 5px 0;font-size: .85em; border-bottom: 8px solid #c60; color: #666; }
 p.authors               { margin: 10px 0 0 0; font-weight: bold; font-size: 1.1em; }
-p.affiliations  { font-size: .85em; margin: 0; }
+p.affiliations  { font-size: .85em; margin: 0; line-height:1.4em; }
 
 div.abstract    { margin: 15px 0; }
-div.articleinfo { font-size: .9em; padding: 10px;  margin: 10px 0; background: #DBDBDB url(../images/abstract_bg.gif) repeat-x top; }
+div.articleinfo { font-size: .9em; padding:0 10px;  margin:20px 0 40px 0; border-left:5px solid #c60; }
 div.contributions { }
 div.articleinfo p
@@ -428 +429 @@
 div.content div#articleMenu p { margin-bottom:0; padding:0 8px 0 23px; }
 div.content div#articleMenu ul { margin:0; padding:0 8px 0 23px; position:static!important; } /* position:static fixes display issues in IE6 */
-div.content div#articleMenu ul li { background-image:none; padding:2px 0; line-height:1.5em; }
+div.content div#articleMenu ul li { background-image:none; padding:2px 0; line-height:1.4em; }
 div.content div#articleMenu ul li.annotation,
 div.content div#articleMenu ul li.discuss { background-position:0 2px; background-repeat:no-repeat; padding-left:18px; }
@@ -446 +447 @@
 #rhc { font-size:0.9em; line-height:1.5em; }
 #rhc h6 { font-size:1em; }
-#rhc h6 a.info { display:inline-block; background:url(../images/button_info.png) no-repeat bottom left; text-indent:-9999px; height:15px; width:14px; }
+#rhc h6 a.info { display:inline-block; background-repeat:no-repeat; background-position:0 .1em; text-indent:-9999px; width:14px; }
 #rhc p { margin:3px 5px 5px 5px; }
 #rhc div.rhcBox_type1 { margin-bottom:18px; padding-bottom:8px; background:#fcd3b8 url(../images/rhcBox_btm.gif) no-repeat bottom left; zoom:1; }
@@ -485 +486 @@
 div.fch p.fch strong { color:#ff0000; }
 div.fch p.fch em { font-weight:bold; font-style:normal; }
-div.fch { margin: 15px 0; padding:0; border: 1px solid #ff0000; background-color: #fff4f0; }
+div.fch { margin-top:15px; padding:0; border: 1px solid #ff0000; background-color: #fff4f0; }
 div.fch p.fch,
 div.corrections td.title a,
@@ -497 +498 @@
 div.fch ol li p a:visited { font-weight:normal; color:#004e9c; }
 
+/* Retraction styles */
+div.retractionHtmlId p.retractionHtmlId strong { color:#ff0000; } 
+div.retractionHtmlId p.retractionHtmlId em { font-weight:bold; font-style:normal; } 
+div.retractionHtmlId { margin-top:15px; padding:0; border: 1px solid #ff0000; background-color: #fff4f0; } 
+div.retractionHtmlId p.retractionHtmlId, 
+div.corrections td.title a, 
+div#discussionContainer div.corrections div.original div.hd h3 { background:url(../images/icon_correction.gif) left 0% no-repeat; } 
+div.retractionHtmlId p.retractionHtmlId { margin:8px 8px 0; text-indent:20px; } 
+div.retractionHtmlId span.retractionHtmlId { margin:8px 8px 0; text-indent:0; } 
+div.retractionHtmlId span.retractionHtmlId div { margin-bottom:10px; font-weight:normal; } 
+div.retractionHtmlId span.retractionHtmlId div p { margin:0; padding:0; display:inline; font-weight:normal; } 
+div.retractionHtmlId span.retractionHtmlId div p a:link { font-weight:normal; color:#069; } 
+div.retractionHtmlId span.retractionHtmlId div p a:visited { font-weight:normal; color:#004e9c; } 
+
 div#ratingRhc1 { margin-bottom:5px;}
 div#ratingRhc1 ol,
@@ -534 +549 @@
 span.equation span span.note { display:inline; margin: 0;}
 span.equation img       { margin: 0 auto; display: block; padding-bottom: 10px;}
+
+/* ------ Related Page Styles ------- */
+div.related h2 { font-style:normal; }
+div.related h2 a.info { display:inline-block; background-repeat:no-repeat; background-position:0 .25em; text-indent:-9999px; width:14px; margin-top:15px; }
+div.related h3 { font-family:Verdana, Arial, Helvetica, sans-serif; font-size:1em; font-weight:bold; border:0; margin:1em 0 0 0; padding:0; }
+div.related ul { margin:0; }
+div.related ul li { list-style-type:none; background-image:none; display:inline; padding-left:0; padding-right:0.5em; }
+
+/* ------ Comment Page Styles ------- */
+div.comments ul { margin:10px 0 0 0; }
+div.comments ul li { list-style-type:none; background-image:none; padding:0; }
+div.comments ul li a.corrections { color:#f00; }
+div.comments div.rss { float:right; margin-top:10px; }
+div.comments div.rss a { background:transparent url(../images/icon_rss_small.gif) no-repeat scroll right 0.15em; padding-right:15px; }
+div.comments table.directory { margin:15px 0 0 0; width:100%; }
+div.comments table.directory { width:99%; }
+div.comments > table.directory { width:100%; } /* for modern browsers */
 
 /* ------ Inline Annotation Styles ------- */
@@ -552 +584 @@
 
 /* adds correction icon to bugs containing correction notes */
-span.minrcrctn a.bug span, span.frmlcrctn a.bug span {
+span.minrcrctn a.bug span, span.frmlcrctn a.bug span, span.retractionCssStyle a.bug span {
   background:url(../images/icon_correction_small.gif) left center no-repeat;
   padding-left:10px;
@@ -655 +687 @@
 #browseNav li           { font-size: .9em; font-weight: bold; padding: 0;margin: 0; }
 #browseNav li input { position: relative; }
-#browseNav ul           { padding: 0; }
+#browseNav ul           { margin:20px; padding: 0; }
 #browseNav ul li        { background: url(../images/browsenav_li.gif) no-repeat 0 8px; list-style-type: none; padding-left: 10px; }
 #browseNav ul.subjects li { float:none; } /* fix for wrapping problem in IE7 -SWT */

head/ambra/webapp/src/main/webapp/article/article_content.ftl

@@ -44 +44 @@
         <li class="discuss icon">
           <#if Session[freemarker_config.userAttributeKey]?exists>
-            <a href="${createDiscussionURL}" class="discuss icon">Make a general comment</a>
+            <a href="${createDiscussionURL}">Make a general comment</a>
           <#else>
             <a href="${freemarker_config.context}/user/secure/secureRedirect.action?goTo=${thisPage}">Make a general comment</a>

head/ambra/webapp/src/main/webapp/css/screen.css

@@ -83 +83 @@
 */
 .noshow { display:block; height:0px; line-height:0em; } /* can be applied to elements that need to be present in the flow but not impact vertical spacing, e.g. in-page anchors */
-.clearer  { clear:both; line-height:0; height:0; display:none; }
 .clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 .clearfix { zoom:1; } /*zoom allows self-clearing floats to work in IE*/
@@ -363 +362 @@
 div.static h2,
 div.content h3  { /* article main body heading */ font-size: 1.6em; margin: 20px 0 0 0; border-bottom: 1px solid #ccc; padding-bottom: 3px;}
+div.content h2 a,
+div.content h3 a { font-family: Verdana,Arial,Helvetica,sans-serif; font-size:0.6em; }
 
 div.static h3,
@@ -449 +450 @@
 #rhc h6 { font-size:1em; }
 #rhc h6 a.info { display:inline-block; background-repeat:no-repeat; background-position:0 .1em; text-indent:-9999px; width:14px; }
-#rhc p { margin:3px 5px 5px 5px; }
+#rhc p,
+#rhc dl.related { margin:10px 5px; }
 #rhc div.rhcBox_type1 { margin-bottom:18px; padding-bottom:8px; background:#fcd3b8 url(../images/rhcBox_btm.gif) no-repeat bottom left; zoom:1; }
 #rhc div.rhcBox_type1 div.wrap { background:#fcd3b8 url(../images/rhcBox_top.gif) no-repeat top left; padding-top:8px; }
@@ -487 +489 @@
 div.fch p.fch strong { color:#ff0000; }
 div.fch p.fch em { font-weight:bold; font-style:normal; }
-div.fch { margin: 15px 0; padding:0; border: 1px solid #ff0000; background-color: #fff4f0; }
+div.fch { margin-top:15px; padding:0; border: 1px solid #ff0000; background-color: #fff4f0; }
 div.fch p.fch,
 div.corrections td.title a,
@@ -502 +504 @@
 div.retractionHtmlId p.retractionHtmlId strong { color:#ff0000; } 
 div.retractionHtmlId p.retractionHtmlId em { font-weight:bold; font-style:normal; } 
-div.retractionHtmlId { margin: 15px 0; padding:0; border: 1px solid #ff0000; background-color: #fff4f0; } 
+div.retractionHtmlId { margin-top:15px; padding:0; border: 1px solid #ff0000; background-color: #fff4f0; } 
 div.retractionHtmlId p.retractionHtmlId, 
 div.corrections td.title a, 
@@ -688 +690 @@
 #browseNav li           { font-size: .9em; font-weight: bold; padding: 0;margin: 0; }
 #browseNav li input { position: relative; }
-#browseNav ul           { padding: 0; }
+#browseNav ul           { margin:20px; padding: 0; }
 #browseNav ul li        { background: url(../images/browsenav_li.gif) no-repeat 0 8px; list-style-type: none; padding-left: 10px; }
 #browseNav ul.subjects li { float:none; } /* fix for wrapping problem in IE7 -SWT */