Author: lukaszlenart Date: Mon Jan 21 10:54:39 2013 New Revision: 1436267 URL: http://svn.apache.org/viewvc?rev=1436267&view=rev Log: Merges /style into /css - styles used by exported docs from Confluence
Added: struts/site/trunk/content/resources/css/content-types.css struts/site/trunk/content/resources/css/default-theme.css struts/site/trunk/content/resources/css/default.css struts/site/trunk/content/resources/css/information-macros.css struts/site/trunk/content/resources/css/layout-macros.css struts/site/trunk/content/resources/css/login.css struts/site/trunk/content/resources/css/master-ie.css struts/site/trunk/content/resources/css/master.css struts/site/trunk/content/resources/css/maven-base.css struts/site/trunk/content/resources/css/maven-classic.css struts/site/trunk/content/resources/css/maven-theme.css struts/site/trunk/content/resources/css/menu-ie.css struts/site/trunk/content/resources/css/menu.css struts/site/trunk/content/resources/css/panels.css struts/site/trunk/content/resources/css/print.css struts/site/trunk/content/resources/css/readme.txt struts/site/trunk/content/resources/css/renderer-macros.css struts/site/trunk/content/resources/css/tables.css struts/site/trunk/content/resources/css/tabs.css struts/site/trunk/content/resources/css/wiki-content.css Added: struts/site/trunk/content/resources/css/content-types.css URL: http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/content-types.css?rev=1436267&view=auto ============================================================================== --- struts/site/trunk/content/resources/css/content-types.css (added) +++ struts/site/trunk/content/resources/css/content-types.css Mon Jan 21 10:54:39 2013 @@ -0,0 +1,115 @@ +a.content-type-page span, div.content-type-page, span.content-type-page { + background-image: url(../../../images/icons/docs_16.gif); + background-repeat: no-repeat; +} + +a.content-type-blogpost span, div.content-type-blogpost, span.content-type-blogpost { + background-image: url(../../../images/icons/blogentry_16.gif); + background-repeat: no-repeat; +} + +a.content-type-comment span, div.content-type-comment, span.content-type-comment { + background-image: url(../../../images/icons/comment_16.gif); + background-repeat: no-repeat; +} + +a.content-type-space span, div.content-type-space, span.content-type-space, +a.content-type-spacedesc span, div.content-type-spacedesc, span.content-type-spacedesc { + background-image: url(../../../images/icons/web_16.gif); + background-repeat: no-repeat; +} + +a.content-type-personalspacedesc span, div.content-type-personalspacedesc, span.content-type-personalspacedesc { + background-image: url(../../../images/icons/personal_space_16.gif); + background-repeat: no-repeat; +} + +a.content-type-mail span, div.content-type-mail, span.content-type-mail { + background-image: url(../../../images/icons/mail_content_16.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment span, div.content-type-attachment, span.content-type-attachment { + background-image: url(../../../images/icons/attachments/file.gif); + background-repeat: no-repeat; +} + +a.content-type-file span, div.content-type-file, span.content-type-file { + background-image: url(../../../images/icons/attachments/file.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-application-pdf span, div.content-type-attachment-application-pdf, span.content-type-attachment-application-pdf { + background-image: url(../../../images/icons/attachments/pdf.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-image span, div.content-type-attachment-image, span.content-type-attachment-image { + background-image: url(../../../images/icons/attachments/image.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-text-xml span, div.content-type-attachment-text-xml, span.content-type-attachment-text-xml { + background-image: url(../../../images/icons/attachments/xml.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-text-html span, div.content-type-attachment-text-html, span.content-type-attachment-text-html { + background-image: url(../../../images/icons/attachments/html.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-text span, div.content-type-attachment-text, span.content-type-attachment-text { + background-image: url(../../../images/icons/attachments/text.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-application-zip span, div.content-type-attachment-application-zip, span.content-type-attachment-application-zip { + background-image: url(../../../images/icons/attachments/zip.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-application-excel span, div.content-type-attachment-application-excel, span.content-type-attachment-application-excel { + background-image: url(../../../images/icons/attachments/excel.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-application-powerpoint span, div.content-type-attachment-application-powerpoint, span.content-type-attachment-application-powerpoint { + background-image: url(../../../images/icons/attachments/powerpoint.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-application-word span, div.content-type-attachment-application-word, span.content-type-attachment-application-word { + background-image: url(../../../images/icons/attachments/word.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-java span, div.content-type-attachment-java, span.content-type-attachment-java { + background-image: url(../../../images/icons/attachments/java.gif); + background-repeat: no-repeat; +} + +a.content-type-attachment-file span, div.content-type-attachment-file, span.content-type-attachment-file { + background-image: url(../../../images/icons/attachments/file.gif); + background-repeat: no-repeat; +} + +a.content-type-status span, div.content-type-status, span.content-type-status { + background-image: url(../../../images/icons/quotes.png); + background-repeat: no-repeat; +} + +div.content-type-userinfo, span.content-type-userinfo { + background-image: url(../../../images/icons/user_16.gif); + background-repeat: no-repeat; +} + +a.content-type-follow span, div.content-type-follow, span.content-type-follow { + background-image: url(../../../images/icons/fav_on_16.png); + background-repeat: no-repeat; +} + +a.content-type-favourite span, div.content-type-favourite, span.content-type-favourite { + background-image: url(../../../images/icons/fav_on_16.png); + background-repeat: no-repeat; +} Added: struts/site/trunk/content/resources/css/default-theme.css URL: http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/default-theme.css?rev=1436267&view=auto ============================================================================== --- struts/site/trunk/content/resources/css/default-theme.css (added) +++ struts/site/trunk/content/resources/css/default-theme.css Mon Jan 21 10:54:39 2013 @@ -0,0 +1,273 @@ +/* + This stylesheet defines styles that only apply to the Default theme. Styles common to all themes should go in + master.css +*/ +html, body { + height: 100%; +} + +body { + margin: 0 10px 0 10px; + font-family: Helvetica, Arial, sans-serif; + background-color:#fff; +} + +#full-height-container { + min-height: 100%; + position: relative; + background-color: #fff; +} + +#header { + margin: 0; + padding: 0 10px; + min-height: 2em; + line-height: 2; +} + +.email{ + /* offset the negative margin set by the header for emails only */ + margin: 10px; +} + +#page-view-panel { + float: right; +} + +#com-atlassian-confluence h1 img { + max-height: 2.5em; /* scale logo image with font size */ + margin-bottom: 0.3em; +} +#com-atlassian-confluence h1 img.custom { + height: auto; +} + +h1 span.title-text { + display: table; /* page title wrapping drops straight down */ +} +h1 a:hover { + color: inherit; /* inherit the colour instead of hard-coding blue */ +} +.editable-title { + margin: 0 10px 0 58px; +} + +#main { + padding: 10px 10px 6em 10px; +} +.content-preview #main { + padding-bottom: 10px; +} + +#content { + clear: left; +} +#content.space { + margin-top: 10px; +} + +.quick-search-submit { + display: none; +} + +#page-view-panel li, #page-prefs-list li { + color: #666; + float: left; + font-size: .9em; + margin: 0 0 0 .3em; + padding: 0 0 0 .3em; +} + +#navigation { + display: inline; +} + +.page-actions { + float: right; + border: solid 1px #ccc; + padding: 5px; + margin-left: 10px; +} + +.remove-control { + display: none; +} + +.page-metadata { + color: #666; + font-size: 0.9em; + margin: 10px 0; +} +.page-metadata a:link, +.page-metadata a:active, +.page-metadata a:hover, +.page-metadata a:visited { + color: #666; + font-style: normal; +} + +.section-header { + margin-bottom: 5px; + padding: 2px 0; +} + +/* All links are set to action.linkColor but section header links are grey */ +.section-header a:link, +.section-header a:active, +.section-header a:hover, +.section-header a:visited { + color: #666; +} + +h2.section-title { + font-size: 12pt; + font-weight: bold; + color: black; + margin-top: 20px; + padding: 0; + display: inline; +} + +.section-title a:link, +.section-title a:active, +.section-title a:hover, +.section-title a:visited { + color: black; +} + +#sidebar, +.sidebar { + clear: right; + float: right; + width: 16em; + margin-left: 10px; +} + +.has-sidebar #content.space, +.has-sidebar #content.edit form.markup, +.has-sidebar .wiki-content { + margin-right: 17em; +} + +.has-sidebar .wiki-content .wiki-content { + margin-right: 0; +} + +.active-richtext #content.create-page, +.active-preview #content.create-page { + margin-right: 0 !important; +} + +.sidebar-content { + margin: 10px 0 0 1em; +} +.blogcalendar { + width: 16em; +} +.blogcalendar th a.calendarhead, +.blogcalendar th.calendarhead { + font-size: 1em; +} +.blogcalendar td, +.blogcalendar th { + font-size: .85em; +} + +/* folder tab link styles */ +.tabnav .tabs a { + padding: 5px 5px 4px; + margin: 5px 3px 0 0; + border-width: 1px; + border-style: solid; + border-bottom: none; + text-decoration: none; + display: block; + float: left; +} + +.tabnav .tabs a.current { + background: white; + border-bottom: 1px solid white; + color: black; +} +.tabnav .tabs a.current:link, .tabnav .tabs a.current:visited { + color: black; +} +.tabnav .tabs a.current:hover { + background: white; + border-bottom: 1px solid white; + color: black; +} + +/* list page navigational tabs */ +.tabnav, .comment .tabnav { + padding: 0; + margin: 0; + border-bottom-width: 1px; + border-bottom-style: solid; + float: left; + display: inline; + list-style-position: outside; + width: 100%; + font-weight: bold; + font-size: 10pt; +} + +.after-tabnav { + clear: both; +} + +.tabnav li.tabs { + list-style: none; + margin: 0 0 -1px 10px; + float: left; + display: block; +} + + +/* dashboard customization */ +#spacesLabel { + padding: 4px 6px; + float: left; + margin-top: 5px; +} + +#footer { + position:absolute; + bottom:0; + width:100%; +} + +#poweredby, +#poweredby a { + font-size: 11px; +} + +/* We can't have a separate IE css file because the default theme + hard codes the location of the theme stylesheet */ + +/* IE6: treated as min-height*/ +* html #full-height-container { + height: 100%; + background-color:#F0F0F0; +} + +* html #main { + padding-bottom: 1em; + height: 88%; /* fake ie6 min height - not perfect but better than alternatives */ +} + +* html #footer { + position: relative; +} + +/* no footer in popups. */ +body.popup-window #footer { + display: none; +} + +* html .popup-window #full-height-container { + background-color:#fff; +} + + Added: struts/site/trunk/content/resources/css/default.css URL: http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/default.css?rev=1436267&view=auto ============================================================================== --- struts/site/trunk/content/resources/css/default.css (added) +++ struts/site/trunk/content/resources/css/default.css Mon Jan 21 10:54:39 2013 @@ -0,0 +1,1518 @@ +body, p, td, table, tr, .bodytext, .stepfield { + font-family: Verdana, arial, sans-serif; + font-size: 11px; + line-height: 16px; + color: #000000; + font-weight: normal; +} +#PageContent { + text-align: left; + background-color: #fff; + padding: 0px; + margin: 0px; + padding-bottom:20px; +} +/* +** when this stylesheet is used for the Tiny MCE Wysiwyg editor's edit area, we can't +** use an id=PageContent or class=wiki-content, so we must +** set the body style to that used for PageContent, and p to that used for wiki-content. +*/ + +body { + margin: 0px; + padding: 0px; + //text-align: center; really needed ? + background-color: #f0f0f0; +} + +@media print { + +body { + background-color: #fff; +} + +} + +.monospaceInput { + font:12px monospace +} + +.wiki-content p, .commentblock p { + margin: 16px 0px 16px 0px; + padding: 0px; +} + +.wiki-content-preview { + padding: 5px; + border-left: 1px solid #3c78b5; + border-right: 1px solid #3c78b5; +} + +ul, ol { + margin-top: 2px; + margin-bottom: 2px; + padding-top: 0px; + padding-bottom: 0px; +} + +pre { + padding: 0px; + margin-top: 5px; + margin-left: 15px; + margin-bottom: 5px; + margin-right: 5px; + text-align: left; +} + +.helpheading { + font-weight: bold; + background-color: #D0D9BD; + border-bottom: 1px solid #3c78b5; + padding: 4px 4px 4px 4px; + margin: 0px; + margin-top: 10px; +} +.helpcontent { + padding: 4px 4px 20px 4px; + background-color: #f5f7f1; +} + +.code { + border: 1px dashed #3c78b5; + font-size: 11px; + font-family: Courier; + margin: 10px; + line-height: 13px; +} + +.focusedComment { + background: #ffffce; +} + +.commentBox, .focusedComment { + padding: 10px; + margin: 5px 0 5px 0; + border: 1px #bbb solid; +} + +.codeHeader { + background-color: #f0f0f0; + border-bottom: 1px dashed #3c78b5; + padding: 3px; + text-align: center; +} + +.codeContent { + text-align: left; + background-color: #f0f0f0; + padding: 3px; +} + +.preformatted { + border: 1px dashed #3c78b5; + font-size: 11px; + font-family: Courier; + margin: 10px; + line-height: 13px; +} + +.preformattedHeader { + background-color: #f0f0f0; + border-bottom: 1px dashed #3c78b5; + padding: 3px; + text-align: center; +} + +.preformattedContent { + background-color: #f0f0f0; + padding: 3px; +} + +.panel { + border: 1px dashed #3c78b5; + margin: 10px; + margin-top: 0px; +} + +.panelHeader { + background-color: #f0f0f0; + border-bottom: 1px dashed #3c78b5; + padding: 3px; + text-align: center; +} + +.panelContent { + background-color: #f0f0f0; + padding: 5px; +} + +.anonymousAlert { + background-color: #f0f0f0; + border: 1px dashed red; + font-size: 11px; + padding: 10px 5px 10px 5px; + margin: 4px; + line-height: 13px; +} + +.lockAlert { + background-color: #f0f0f0; + width: 50%; + border: 1px dashed red; + font-size: 11px; + padding: 10px 5px 10px 5px; + margin: 4px; + line-height: 13px; +} + + +.code-keyword { + color: #000091; + background-color: inherit; +} + +.code-object { + color: #910091; + background-color: inherit; +} + +.code-quote { + color: #009100; + background-color: inherit; +} + +.code-comment { + color: #808080; + background-color: inherit; +} + + +.code-xml .code-keyword { + color: inherit; + font-weight: bold; +} + +.code-tag { + color: #000091; + background-color: inherit; +} + +.breadcrumbs { + background-color: #f0f0f0; + border-color: #3c78b5; + border-width: 1px 0px 1px 0px; + border-style: solid; + font-size: 11px; + padding: 3px 0px 3px 0px; +} + +.navmenu { + border: 1px solid #ccc; +} + +.menuheading { + font-weight: bold; + background-color: #f0f0f0; + border-bottom: 1px solid #3c78b5; + padding: 4px 4px 2px 4px; +} + +.menuitems { + padding: 4px 4px 20px 4px; +} + +.rightpanel { + border-left: 1px solid #ccc; + border-bottom: 1px solid #ccc; +} + +#helpheading { + text-align: left; + font-weight: bold; + background-color: #D0D9BD; + border-bottom: 1px solid #3c78b5; + padding: 4px 4px 4px 4px; + margin: 0px; +} +#helpcontent { + padding: 4px 4px 4px 4px; + background-color: #f5f7f1; +} +.helptab-unselected { + font-weight: bold; + padding: 5px; + background-color: #f5f7f1; +} +.helptab-selected { + font-weight: bold; + background-color: #D0D9BD; + padding: 5px; +} +.helptabs { + margin: 0px; + background-color: #f5f7f1; + padding: 5px; +} +.infopanel-heading { + font-weight: bold; + padding: 4px 0px 2px 0px; +} + +.pagebody { +} + +.pageheader { + padding: 5px 5px 5px 0px; + border-bottom: 1px solid #3c78b5; +} + +.pagetitle { + font-size: 22px; + font-weight: bold; + font-family: Arial, sans-serif; + color: #003366; +} + +.newpagetitle { + color: #ccc !important; +} + +.steptitle { + font-size: 18px; + font-weight: bold; + font-family: Arial, sans-serif; + color: #003366; + margin-bottom: 7px; +} + +.substeptitle { + font-size: 12px; + font-weight: bold; + font-family: Arial, sans-serif; + color: #003366; + margin: 2px 4px 4px 4px; + padding: 2px 4px 1px 4px; +} + +.stepdesc { + font-family: Verdana, arial, sans-serif; + font-size: 11px; + line-height: 16px; + font-weight: normal; + color: #666666; + margin-top: 7px; + margin-bottom: 7px; +} + +.steplabel { + font-weight: bold; + margin-right: 4px; + color: black; + float: left; + width: 15%; + text-align: right; +} + +.stepfield { + background: #f0f0f0; + padding: 5px; +} + +.submitButtons{ + margin-top:5px; + text-align:right; +} + +.formtitle { + font-size: 12px; + font-weight: bold; + font-family: Arial, sans-serif; + color: #003366; +} + +.sectionbottom { + border-bottom: 1px solid #3c78b5; +} + +.topRow { + border-top: 2px solid #3c78b5; +} + +.tabletitle { + font-size: 14px; + font-weight: bold; + font-family: Arial, sans-serif; + padding: 3px 0px 2px 0px; + margin: 8px 4px 2px 0px; + color: #003366; + border-bottom: 2px solid #3c78b5; +} +.pagesubheading { + color: #666666; + font-size: 10px; + padding: 0px 0px 5px 0px; +} + +HR { + color: 3c78b5; + height: 1; +} + +A:link, A:visited, A:active, A:hover { + color: #003366; +} + +h1 A:link, h1 A:visited, h1 A:active { + text-decoration: none; +} + +h1 A:hover { + border-bottom: 1px dotted #003366; +} + +.wiki-content > :first-child, .commentblock > :first-child { + margin-top: 3px; +} + +.logocell { + padding: 10px; +} + +input { + font-family: verdana, geneva, arial, sans-serif; + font-size: 11px; + color: #000000; +} + +textarea, textarea.editor { + font-family: verdana, geneva, arial, sans-serif; + font-size: 11px; + color: #333333; +} + +/* use logoSpaceLink instead. +.spacenametitle { + font: 21px/31px Impact, Arial, Helvetica; + font-weight: 100; + color: #999999; + margin: 0px; +} +.spacenametitle img { + margin: 0 0 -4px 0; +} +.spacenametitle a { + text-decoration: none; + color: #999999; +} +.spacenametitle a:visited { + text-decoration: none; + color: #999999; +}*/ + +.spacenametitle-printable { + font: 20px/25px Impact, Arial, Helvetica; + font-weight: 100; + color: #999999; + margin: 0px; +} +.spacenametitle-printable a { + text-decoration: none; + color: #999999; +} +.spacenametitle-printable a:visited { + text-decoration: none; + color: #999999; +} + +.blogDate { + font-weight: bold; + text-decoration: none; + color: black; +} + +.blogSurtitle { + background: #f0f0f0; + border: 1px solid #ddd; + padding: 3px; + margin: 1px 1px 10px 1px; +} + +.blogHeading { + font-size: 20px; + line-height: normal; + font-weight: bold; + padding: 0px; + margin: 0px; +} + +.blogHeading a { + text-decoration: none; + color: black; +} + +.endsection { + align: right; + color: #666666; + margin-top: 10px; +} +.endsectionleftnav { + align: right; + color: #666666; + margin-top: 10px; +} + +h1 { + font-size: 24px; + line-height: normal; + font-weight: bold; + background-color: #f0f0f0; + color: #003366; + border-bottom: 1px solid #3c78b5; + padding: 2px; + margin: 36px 0px 4px 0px; +} + +h2 { + font-size: 18px; + line-height: normal; + font-weight: bold; + background-color: #f0f0f0; + border-bottom: 1px solid #3c78b5; + padding: 2px; + margin: 27px 0px 4px 0px; +} + +h3 { + font-size: 14px; + line-height: normal; + font-weight: bold; + background-color: #f0f0f0; + padding: 2px; + margin: 21px 0px 4px 0px; +} + +h4 { + font-size: 12px; + line-height: normal; + font-weight: bold; + background-color: #f0f0f0; + padding: 2px; + margin: 18px 0px 4px 0px; +} + +h4.search { + font-size: 12px; + line-height: normal; + font-weight: normal; + background-color: #f0f0f0; + padding: 4px; + margin: 18px 0px 4px 0px; +} + +h5 { + font-size: 10px; + line-height: normal; + font-weight: bold; + background-color: #f0f0f0; + padding: 2px; + margin: 14px 0px 4px 0px; +} + +h6 { + font-size: 8px; + line-height: normal; + font-weight: bold; + background-color: #f0f0f0; + padding: 2px; + margin: 14px 0px 4px 0px; +} + +.smallfont { + font-size: 10px; +} +.descfont { + font-size: 10px; + color: #666666; +} +.smallerfont { + font-size: 9px; +} +.smalltext { + color: #666666; + font-size: 10px; +} +.smalltext a { + color: #666666; +} +.smalltext-blue { + color: #3c78b5; + font-size: 10px; +} +.surtitle { + margin-left: 1px; + margin-bottom: 5px; + font-size: 14px; + color: #666666; +} + +/* css hack found here: http://www.fo3nix.pwp.blueyonder.co.uk/tutorials/css/hacks/ */ +.navItemOver { font-size: 10px; font-weight: bold; color: #ffffff; background-color: #003366; cursor: hand; voice-family: '\'}\''; voice-family:inherit; cursor: pointer;} +.navItemOver a { color: #ffffff; background-color:#003366; text-decoration: none; } +.navItemOver a:visited { color: #ffffff; background-color:#003366; text-decoration: none; } +.navItemOver a:hover { color: #ffffff; background-color:#003366; text-decoration: none; } +.navItem { font-size: 10px; font-weight: bold; color: #ffffff; background-color: #3c78b5; } +.navItem a { color: #ffffff; text-decoration: none; } +.navItem a:hover { color: #ffffff; text-decoration: none; } +.navItem a:visited { color: #ffffff; text-decoration: none; } + +div.padded { padding: 4px; } +div.thickPadded { padding: 10px; } +h3.macrolibrariestitle { + margin: 0px 0px 0px 0px; +} + +div.centered { text-align: center; margin: 10px; } +div.centered table {margin: 0px auto; text-align: left; } + +.tableview table { + margin: 0; +} + +.tableview th { + text-align: left; + color: #003366; + font-size: 12px; + padding: 5px 0px 0px 5px; + border-bottom: 2px solid #3c78b5; +} +.tableview td { + text-align: left; + border-color: #ccc; + border-width: 0px 0px 1px 0px; + border-style: solid; + margin: 0; + padding: 4px 10px 4px 5px; +} + +.grid { + margin: 2px 0px 5px 0px; + border-collapse: collapse; +} +.grid th { + border: 1px solid #ccc; + padding: 2px 4px 2px 4px; + background: #f0f0f0; + text-align: center; +} +.grid td { + border: 1px solid #ccc; + padding: 3px 4px 3px 4px; +} +.gridHover { + background-color: #f9f9f9; +} + +td.infocell { + background-color: #f0f0f0; +} +.label { + font-weight: bold; + color: #003366; +} + +label { + font-weight: bold; + color: #003366; +} + +.error { + background-color: #fcc; +} + +.errorBox { + background-color: #fcc; + border: 1px solid #c00; + padding: 5px; + margin: 5px; +} + +.errorMessage { + color: #c00; +} + +.success { + background-color: #dfd; +} + +.successBox { + background-color: #dfd; + border: 1px solid #090; + padding: 5px; + margin-top:5px; + margin-bottom:5px; +} + +blockquote { + padding-left: 10px; + padding-right: 10px; + margin-left: 5px; + margin-right: 0px; + border-left: 1px solid #3c78b5; +} + +table.confluenceTable +{ + margin: 5px; + border-collapse: collapse; +} + +/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */ +table.confluenceTable td.confluenceTd +{ + border-width: 1px; + border-style: solid; + border-color: #ccc; + padding: 3px 4px 3px 4px; +} + +/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */ +table.confluenceTable th.confluenceTh +{ + border-width: 1px; + border-style: solid; + border-color: #ccc; + padding: 3px 4px 3px 4px; + background-color: #f0f0f0; + text-align: center; +} + +td.confluenceTd +{ + border-width: 1px; + border-style: solid; + border-color: #ccc; + padding: 3px 4px 3px 4px; +} + +th.confluenceTh +{ + border-width: 1px; + border-style: solid; + border-color: #ccc; + padding: 3px 4px 3px 4px; + background-color: #f0f0f0; + text-align: center; +} + +DIV.small { + font-size: 9px; +} + +H1.pagename { + margin-top: 0px; +} + +IMG.inline {} + +.loginform { + margin: 5px; + border: 1px solid #ccc; +} + +/* The text how the "This is a preview" comment should be shown. */ +.previewnote { text-align: center; + font-size: 11px; + color: red; } + +/* How the preview content should be shown */ +.previewcontent { background: #E0E0E0; } + +/* How the system messages should be shown (DisplayMessage.jsp) */ +.messagecontent { background: #E0E0E0; } + +/* How the "This page has been modified..." -comment should be shown. */ +.conflictnote { } + +.createlink { + color: maroon; +} +a.createlink { + color: maroon; +} +.templateparameter { + font-size: 9px; + color: darkblue; +} + +.diffadded { + background: #ddffdd; + padding: 1px 1px 1px 4px; + border-left: 4px solid darkgreen; +} +.diffdeleted { + color: #999; + background: #ffdddd; + padding: 1px 1px 1px 4px; + border-left: 4px solid darkred; +} +.diffnochange { + padding: 1px 1px 1px 4px; + border-left: 4px solid lightgrey; +} +.differror { + background: brown; +} +.diff { + font-family: lucida console, courier new, fixed-width; + font-size: 12px; + line-height: 14px; +} +.diffaddedchars { + background-color:#99ff99; + font-weight:bolder; +} +.diffremovedchars { + background-color:#ff9999; + text-decoration: line-through; + font-weight:bolder; +} + +.greybackground { + background: #f0f0f0 +} + +.greybox { + border: 1px solid #ddd; + padding: 3px; + margin: 1px 1px 10px 1px; +} + +.borderedGreyBox { + border: 1px solid #cccccc; + background-color: #f0f0f0; + padding: 10px; +} + +.greyboxfilled { + border: 1px solid #ddd; + background: #f0f0f0; + padding: 3px; + margin: 1px 1px 10px 1px; +} + +.navBackgroundBox { + padding: 5px 5px 5px 5px; + font-size: 22px; + font-weight: bold; + font-family: Arial, sans-serif; + color: white; + background: #3c78b5; + text-decoration: none; +} + +.previewBoxTop { + background-color: #f0f0f0; + border-width: 1px 1px 0px 1px; + border-style: solid; + border-color: #3c78b5; + padding: 5px; + margin: 5px 0px 0px 0px; + text-align: center; +} +.previewContent { + background-color: #fff; + border-color: #3c78b5; + border-width: 0px 1px 0px 1px; + border-style: solid; + padding: 10px; + margin: 0px; +} +.previewBoxBottom { + background-color: #f0f0f0; + border-width: 0px 1px 1px 1px; + border-style: solid; + border-color: #3c78b5; + padding: 5px; + margin: 0px 0px 5px 0px; + text-align: center; +} + +.functionbox { + background-color: #f0f0f0; + border: 1px solid #3c78b5; + padding: 3px; + margin: 1px 1px 10px 1px; +} + +.functionbox-greyborder { + background-color: #f0f0f0; + border: 1px solid #ddd; + padding: 3px; + margin: 1px 1px 10px 1px; +} + +.search-highlight { + background-color: #ffffcc; +} + +/* normal (white) background */ +.rowNormal { + background-color: #ffffff; + } + +/* alternate (pale yellow) background */ +.rowAlternate { + background-color: #f7f7f7; +} + +/* used in the list attachments table */ +.rowAlternateNoBottomColor { + background-color: #f7f7f7; +} + +.rowAlternateNoBottomNoColor { +} + +.rowAlternateNoBottomColor td { + border-bottom: 0px; +} + +.rowAlternateNoBottomNoColor td { + border-bottom: 0px; +} + +/* row highlight (grey) background */ +.rowHighlight { + background-color: #f0f0f0; + +} + +TD.greenbar {FONT-SIZE: 2px; BACKGROUND: #00df00; BORDER: 1px solid #9c9c9c; PADDING: 0px; } +TD.redbar {FONT-SIZE: 2px; BACKGROUND: #df0000; BORDER: 1px solid #9c9c9c; PADDING: 0px; } +TD.darkredbar {FONT-SIZE: 2px; BACKGROUND: #af0000; BORDER: 1px solid #9c9c9c; PADDING: 0px; } + +TR.testpassed {FONT-SIZE: 2px; BACKGROUND: #ddffdd; PADDING: 0px; } +TR.testfailed {FONT-SIZE: 2px; BACKGROUND: #ffdddd; PADDING: 0px; } + +.toolbar { + margin: 0px; + border-collapse: collapse; +} + +.toolbar td { + border: 1px solid #ccc; + padding: 2px 2px 2px 2px; + color: #ccc; +} + +td.noformatting { + border-width: 0px; + border-style: none; + text-align: center; + padding: 0px; +} + +.commentblock { + margin: 12px 0 12px 0; +} + +/* + * Divs displaying the license information, if necessary. + */ +.license-eval, .license-none, .license-nonprofit { + border-top: 1px solid #bbbbbb; + text-align: center; + font-size: 10px; + font-family: Verdana, Arial, Helvetica, sans-serif; +} + +.license-eval, .license-none { + background-color: #ffcccc; +} + +.license-eval b, .license-none b { + color: #990000 +} + +.license-nonprofit { + background-color: #ffffff; +} + +/* + * The shadow at the bottom of the page between the main content and the + * "powered by" section. + */ +.bottomshadow { + height: 12px; + background-image: url("$req.contextPath/images/border/border_bottom.gif"); + background-repeat: repeat-x; +} + +/* + * Styling of the operations box + */ +.navmenu .operations li, .navmenu .operations ul { + list-style: none; + margin-left: 0; + padding-left: 0; +} + +.navmenu .operations ul { + margin-bottom: 9px; +} + +.navmenu .label { + font-weight: inherit; +} + +/* + * Styling of ops as a toolbar + */ +.toolbar div { + display: none; +} + +.toolbar .label { + display: none; +} + +.toolbar .operations { + display: block; +} + +.toolbar .operations ul { + display: inline; + list-style: none; + margin-left: 10px; + padding-left: 0; +} + +.toolbar .operations li { + list-style: none; + display: inline; +} + +/* list page navigational tabs */ +#foldertab { +padding: 3px 0px 3px 8px; +margin-left: 0; +border-bottom: 1px solid #3c78b5; +font: bold 11px Verdana, sans-serif; +} + +#foldertab li { +list-style: none; +margin: 0; +display: inline; +} + +#foldertab li a { +padding: 3px 0.5em; +margin-left: 3px; +border: 1px solid #3c78b5; +border-bottom: none; +background: #3c78b5; +text-decoration: none; +} + +#foldertab li a:link { color: #ffffff; } +#foldertab li a:visited { color: #ffffff; } + +#foldertab li a:hover { +color: #ffffff; +background: #003366; +border-color: #003366; +} + +#foldertab li a.current { +background: white; +border-bottom: 1px solid white; +color: black; +} + +#foldertab li a.current:link { color: black; } +#foldertab li a.current:visited { color: black; } +#foldertab li a.current:hover { +background: white; +border-bottom: 1px solid white; +color: black; +} + +/* alphabet list */ +ul#squaretab { +margin-left: 0; +padding-left: 0; +white-space: nowrap; +font: bold 8px Verdana, sans-serif; +} + +#squaretab li { +display: inline; +list-style-type: none; +} + +#squaretab a { +padding: 2px 6px; +border: 1px solid #3c78b5; +} + +#squaretab a:link, #squaretab a:visited { +color: #fff; +background-color: #3c78b5; +text-decoration: none; +} + +#squaretab a:hover { +color: #ffffff; +background-color: #003366; +border-color: #003366; +text-decoration: none; +} + +#squaretab li a#current { +background: white; +color: black; +} + +.blogcalendar * { + font-family:verdana, arial, sans-serif; + font-size:x-small; + font-weight:normal; + line-height:140%; + padding:2px; +} + + +table.blogcalendar { + border: 1px solid #3c78b5; +} + +.blogcalendar th.calendarhead, a.calendarhead { + font-size:x-small; + font-weight:bold; + padding:2px; + text-transform:uppercase; + background-color: #3c78b5; + color: #ffffff; + letter-spacing: .3em; + text-transform: uppercase; +} + +.calendarhead:visited {color: white;} +.calendarhead:active {color: white;} +.calendarhead:hover {color: white;} + +.blogcalendar th { + font-size:x-small; + font-weight:bold; + padding:2px; + background-color:#f0f0f0; +} + +.blogcalendar td { + font-size:x-small; + font-weight:normal; +} + +.searchGroup { padding: 0 0 10px 0; background: #f0f0f0; } +.searchGroupHeading { font-size: 10px; font-weight: bold; color: #ffffff; background-color: #3c78b5; padding: 2px 4px 1px 4px; } +.searchItem { padding: 1px 4px 1px 4px; } +.searchItemSelected { padding: 1px 4px 1px 4px; font-weight: bold; background: #ddd; } + +/* permissions page styles */ +.permissionHeading { + border-bottom: #bbb; border-width: 0 0 1px 0; border-style: solid; font-size: 16px; text-align: left; +} +.permissionTab { + border-width: 0 0 0 1px; border-style: solid; background: #3c78b5; color: #ffffff; font-size: 10px; +} +.permissionSuperTab { + border-width: 0 0 0 1px; border-style: solid; background: #003366; color: #ffffff; +} +.permissionCell { + border-left: #bbb; border-width: 0 0 0 1px; border-style: solid; +} + +/* warning panel */ +.warningPanel { background: #FFFFCE; border:#F0C000 1px solid; padding: 8px; margin: 10px; } +/* alert panel */ +.alertPanel { background: #FFCCCC; border:#C00 1px solid; padding: 8px; margin: 10px; } +/* info panel */ +.infoPanel { background: #D8E4F1; border:#3c78b5 1px solid; padding: 8px; margin: 10px; } + +/* side menu highlighting (e.g. space content screen) */ +.optionPadded { padding: 2px; } +.optionSelected { background-color: #ffffcc; padding: 2px; border: 1px solid #ddd; margin: -1px; } +.optionSelected a { font-weight: bold; text-decoration: none; color: black; } + +/* information macros */ +.panelMacro { margin: 10px 20px } +.noteMacro { border-style: solid; border-width: 1px; border-color: #F0C000; background-color: #FFFFCE; text-align:left; margin-top: 5px; margin-bottom: 5px} +.warningMacro { border-style: solid; border-width: 1px; border-color: #c00; background-color: #fcc; text-align:left; margin-top: 5px; margin-bottom: 5px} +.infoMacro { border-style: solid; border-width: 1px; border-color: #3c78b5; background-color: #D8E4F1; text-align:left; margin-top: 5px; margin-bottom: 5px} +.tipMacro { border-style: solid; border-width: 1px; border-color: #090; background-color: #dfd; text-align:left; margin-top: 5px; margin-bottom: 5px} +.informationMacroPadding { padding: 5px 0 0 5px; } + +.noteMacro, .warningMacro, .infoMacro, .tipMacro { + padding: 10px; + width: 100%; + text-align: left; +} + +table.infoMacro td, table.warningMacro td, table.tipMacro td, table.noteMacro td, table.sectionMacro td { + border: none; +} + +table.sectionMacroWithBorder td.columnMacro { border-style: dashed; border-width: 1px; border-color: #cccccc;} + +.pagecontent +{ + padding: 10px; + text-align: left; +} + +/* styles for links in the top bar */ +.topBarDiv a:link {color: #ffffff;} +.topBarDiv a:visited {color: #ffffff;} +.topBarDiv a:active {color: #ffffff;} +.topBarDiv a:hover {color: #ffffff;} +.topBarDiv {color: #ffffff;} + +.topBar { + background-color: #003366; +} + + +/* styles for extended operations */ +.greyLinks a:link {color: #666666; text-decoration:underline;} +.greyLinks a:visited {color: #666666; text-decoration:underline;} +.greyLinks a:active {color: #666666; text-decoration:underline;} +.greyLinks a:hover {color: #666666; text-decoration:underline;} +.greyLinks {color: #666666; display:block; padding: 10px} + +.logoSpaceLink {color: #999999; text-decoration: none} +.logoSpaceLink a:link {color: #999999; text-decoration: none} +.logoSpaceLink a:visited {color: #999999; text-decoration: none} +.logoSpaceLink a:active {color: #999999; text-decoration: none} +.logoSpaceLink a:hover {color: #003366; text-decoration: none} + +/* basic panel (basicpanel.vmd) style */ +.basicPanelContainer {border: 1px solid #3c78b5; margin-top: 2px; margin-bottom: 8px; width: 100%} +.basicPanelTitle {padding: 5px; margin: 0px; background-color: #f0f0f0; color: black; font-weight: bold;} +.basicPanelBody {padding: 5px; margin: 0px} + +.separatorLinks a:link {color: white} +.separatorLinks a:visited {color: white} +.separatorLinks a:active {color: white} + +.greynavbar {background-color: #f0f0f0; border-top: 1px solid #3c78b5; margin-top: 2px} + +div.headerField { + float: left; + width: auto; + height: 100%; +} + +.headerFloat { + margin-left: auto; + width: 50%; +} + +.headerFloatLeft { + float: left; + margin-right: 20px; + margin-bottom: 10px; +} + +#headerRow { + padding: 10px; +} + +div.license-personal { + background-color: #003366; + color: #ffffff; +} + +div.license-personal a { + color: #ffffff; +} + +.greyFormBox { + border: 1px solid #cccccc; + padding: 5px; +} + +/* IE automatically adds a margin before and after form tags. Use this style to remove that */ +.marginlessForm { + margin: 0px; +} + +.openPageHighlight { + background-color: #ffffcc; + padding: 2px; + border: 1px solid #ddd; +} + +.editPageInsertLinks, .editPageInsertLinks a +{ + color: #666666; + font-weight: bold; + font-size: 10px; +} + +/* Style for label heatmap. */ +.top10 a { + font-weight: bold; + font-size: 2em; + color: #003366; +} +.top25 a { + font-weight: bold; + font-size: 1.6em; + color: #003366; +} +.top50 a { + font-size: 1.4em; + color: #003366; +} +.top100 a { + font-size: 1.2em; + color: #003366; +} + +.heatmap { + list-style:none; + width: 95%; + margin: 0px auto; +} + +.heatmap a { + text-decoration:none; +} + +.heatmap a:hover { + text-decoration:underline; +} + +.heatmap li { + display: inline; +} + +.minitab { +padding: 3px 0px 3px 8px; +margin-left: 0; +margin-top: 1px; +margin-bottom: 0px; +border-bottom: 1px solid #3c78b5; +font: bold 9px Verdana, sans-serif; +text-decoration: none; +float:none; +} +.selectedminitab { +padding: 3px 0.5em; +margin-left: 3px; +margin-top: 1px; +border: 1px solid #3c78b5; +background: white; +border-bottom: 1px solid white; +color: #000000; +text-decoration: none; +} +.unselectedminitab { +padding: 3px 0.5em; +margin-left: 3px; +margin-top: 1px; +border: 1px solid #3c78b5; +border-bottom: none; +background: #3c78b5; +color: #ffffff; +text-decoration: none; +} + +a.unselectedminitab:hover { +color: #ffffff; +background: #003366; +border-color: #003366; +} + +a.unselectedminitab:link { color: white; } +a.unselectedminitab:visited { color: white; } + +a.selectedminitab:link { color: black; } +a.selectedminitab:visited { color: black; } + +.linkerror { background-color: #fcc;} + +a.labelOperationLink:link {text-decoration: underline} +a.labelOperationLink:active {text-decoration: underline} +a.labelOperationLink:visited {text-decoration: underline} +a.labelOperationLink:hover {text-decoration: underline} + +a.newLabel:link {background-color: #ddffdd} +a.newLabel:active {background-color: #ddffdd} +a.newLabel:visited {background-color: #ddffdd} +a.newLabel:hover {background-color: #ddffdd} + +ul.square {list-style-type: square} + +.inline-control-link { + background: #ffc; + font-size: 9px; + color: #666; + padding: 2px; + text-transform: uppercase; + text-decoration: none; +} + + +.inline-control-link a:link {text-decoration: none} +.inline-control-link a:active {text-decoration: none} +.inline-control-link a:visited {text-decoration: none} +.inline-control-link a:hover {text-decoration: none} + +.inline-control-link { + background: #ffc; + font-size: 9px; + color: #666; + padding: 2px; + text-transform: uppercase; + text-decoration: none; + cursor: pointer; +} + +div.auto_complete { + width: 350px; + background: #fff; +} +div.auto_complete ul { + border: 1px solid #888; + margin: 0; + padding: 0; + width: 100%; + list-style-type: none; +} +div.auto_complete ul li { + margin: 0; + padding: 3px; +} +div.auto_complete ul li.selected { + background-color: #ffb; +} +div.auto_complete ul strong.highlight { + color: #800; + margin: 0; + padding: 0; +} + +/******* Edit Page Styles *******/ +.toogleFormDiv{ + border:1px solid #A7A6AA; + background-color:white; + padding:5px; + margin-top: 5px; +} + +.toogleInfoDiv{ + border:1px solid #A7A6AA; + background-color:white; + display:none; + padding:5px; + margin-top: 10px; +} + +.inputSection{ + margin-bottom:20px; +} + +#editBox{ + border:1px solid lightgray; + background-color:#F0F0F0; +} + +/******* Left Navigation Theme Styles ********/ +.leftnav li a { + text-decoration:none; + color:white; + margin:0px; + display:block; + padding:2px; + padding-left:5px; + background-color: #3c78b5; + border-top:1px solid #3c78b5; +} + +.leftnav li a:active {color:white;} +.leftnav li a:visited {color:white;} +.leftnav li a:hover {background-color: #003366; color:white;} + +/* Added by Shaun during i18n */ +.replaced +{ + background-color: #33CC66; +} + +.topPadding +{ + margin-top: 20px; +} + +/* new form style */ +.form-block { + padding: 6px; +} +.form-error-block { + padding: 6px; + background: #fcc; + border-top: #f0f0f0 1px solid; + border-bottom: #f0f0f0 1px solid; + margin-bottom: 6px; + padding: 0 12px 0 12px; +} +.form-element-large { + font-size: 16px; + font-weight: bold; + font-family: Arial, sans-serif; + color: #003366; +} + +.form-element-small { + font-size: 12px; + font-weight: bold; + font-family: Arial, sans-serif; + color: #003366; +} + +.form-header { + background: lightyellow; + border-top: #f0f0f0 1px solid; + border-bottom: #f0f0f0 1px solid; + margin-bottom: 6px; + padding: 0 12px 0 12px; +} +.form-header p, .form-block p, .form-error-block p { + line-height: normal; + margin: 12px 0 12px 0; +} +.form-example { + color: #888; + font-size: 11px; +} +.form-divider { + border-bottom: #ccc 1px solid; + margin-bottom: 6px; +} +.form-buttons { + margin-top: 6px; + border-top: #ccc 1px solid; + border-bottom: #ccc 1px solid; + background: #f0f0f0; + padding: 10px; + text-align: center; +} +.form-buttons input { + width: 100px; +} +.form-block .error { + padding: 6px; + margin-bottom: 6px; +} Added: struts/site/trunk/content/resources/css/information-macros.css URL: http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/information-macros.css?rev=1436267&view=auto ============================================================================== --- struts/site/trunk/content/resources/css/information-macros.css (added) +++ struts/site/trunk/content/resources/css/information-macros.css Mon Jan 21 10:54:39 2013 @@ -0,0 +1,124 @@ +/* Information plugin styles */ + +.noteMessage, .warningMessage, .infoMessage, .tipMessage { + border-style: solid; + border-width: 1px; + text-align: center; + padding: 5px; + overflow: hidden; /* fix width next to floated content */ +} + +.noteMessage { + border-color: #f0c000; + background: #ffffce; +} + +.warningMessage { + border-color: #c00; + background: #fcc; +} + +.infoMessage { + border-color: #69c; + background: #d8e4f1; +} + +.tipMessage { + border-color: #090; + background-color: #dfd; +} + +table.infoMacro td, table.warningMacro td, table.tipMacro td, table.noteMacro td { + border: none; +} + +.informationMacroPadding { + padding: 5px 0 0 5px; +} + +.noteMacro, .warningPanel { + background-color: #ffffce; +} +#addition .noteMacro { + border-style: solid; + border-width: 1px; + border-color: #f0c000; + background-color: #ffffce; + text-align:left; + padding: 10px; + width: 100%; + margin: 5px 20px; +} + +#addition .noteMacro td { + font-size: 10pt; + padding: 2px; + padding-right: 15px; +} + +#addition .noteMacro p { + font-size: 10pt; +} + +#addition .noteMacro b { + font-size: 10pt; +} + +#addition table.noteMacro td { + border: none; +} + +#replying .noteMacro { + border-style: solid; + border-width: 1px; + border-color: #f0c000; + background-color: #ffffce; + text-align:left; + padding: 10px; + width: 100%; + margin: 5px 20px; +} + +#replying .noteMacro td { + font-size: 10pt; + padding: 2px; + padding-right: 15px; +} + +#replying .noteMacro p { + font-size: 10pt; +} + +#replying .noteMacro b { + font-size: 10pt; +} + +#replying table.noteMacro td { + border: none; +} + +.tipMacro { + background-color: #dfd; +} + +.warningMacro { + background-color: #fcc; +} + +.infoMacro { + background-color: #d8e4f1; +} + +.warningPanel { + border-style: solid; + border-width: 1px; + padding: 8px; + margin: 10px; +} + +.warningPanel { + border-color: #f0c000; +} + + + Added: struts/site/trunk/content/resources/css/layout-macros.css URL: http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/layout-macros.css?rev=1436267&view=auto ============================================================================== --- struts/site/trunk/content/resources/css/layout-macros.css (added) +++ struts/site/trunk/content/resources/css/layout-macros.css Mon Jan 21 10:54:39 2013 @@ -0,0 +1,18 @@ +/* Layout plugin styles */ + +.sectionMacro, +.sectionMacro p, +.sectionMacro ul, +.sectionMacro ol { + font-size: 10pt; +} + +table.sectionMacro td { + border: none; +} + +table.sectionMacroWithBorder td.columnMacro { + border-style: dashed; + border-width: 1px; + border-color: #ccc; +} \ No newline at end of file Added: struts/site/trunk/content/resources/css/login.css URL: http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/login.css?rev=1436267&view=auto ============================================================================== --- struts/site/trunk/content/resources/css/login.css (added) +++ struts/site/trunk/content/resources/css/login.css Mon Jan 21 10:54:39 2013 @@ -0,0 +1,146 @@ +body.login, +body.login #main, +body.login #full-height-container { + background: #fafafa; +} + +* html body.login, +* html body.login #full-height-container { + background: #f0f0f0; +} + +#com-atlassian-confluence.login h1 { + width: 560px; + margin: 0 auto; +} + +#login-container { + margin: 0 auto; + width: 500px; + padding: 20px 30px; + background: #fff; +} + +body.login #header { + display: none; +} + +/* Gets rid of the break above the footer */ +body.login .clear { + display: none; +} + +body.login #main { + overflow: hidden; + padding: 10% 0 12%; +} + +#login-container .form-error-block{ + background: none; + border: none; + margin: 0; + padding: 0; +} + +#login-container, +#login-container form.aui { + color: #333; +} + +#login-container, +#login-container .captcha-image { + border: 1px solid #eee; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; +} + +#login-container div.login-form-container { + margin-bottom: 10px; + padding: 0 0 5px 20px; +} + +#login-container .login-form-container fieldset { + padding-top: 15px; +} + +#login-container .checkboxes label { + left: 0; + margin-right: 0; + float: none; + display: inline; +} + +/* Overide default label styling */ +#com-atlassian-confluence.login #login-container label { + color: #333; +} + +#login-container .login-form-container .text, +#login-container .login-form-container .password { + width: 95%; +} + +#login-container .message { + padding: 0; + width: auto; +} + +#login-container p { + margin: 0 0 1em; + color: #333; +} + +#login-container p.last { + margin: 0; +} + +#login-container p.success-message { + color: green; +} + +body.signup #main{ + padding: 5% 0 7%; +} + +#login-container .captcha-image { + margin: 10px 0; + width: 200px; + height: 100px; + float: left; +} + +#captcha-error span.errorMessage { + color: #990000; + font-weight: normal; +} + +#captcha-container .reload { + width: 16px; + height: 16px; + float: left; + position: relative; + top: 16px; + left: 10px; +} + +#captcha-container label#captcha-reponse-label { + float: none; + left: 0; + margin: 0; + width: auto; +} + +#captcha-container input { + width: 192px; +} + +#coherence-copyright { + margin: 0; + text-align: center; + font-size: 0.8em; + padding-bottom: 3px; +} + +#coherence-copyright a { + color: #666; +} \ No newline at end of file Added: struts/site/trunk/content/resources/css/master-ie.css URL: http://svn.apache.org/viewvc/struts/site/trunk/content/resources/css/master-ie.css?rev=1436267&view=auto ============================================================================== --- struts/site/trunk/content/resources/css/master-ie.css (added) +++ struts/site/trunk/content/resources/css/master-ie.css Mon Jan 21 10:54:39 2013 @@ -0,0 +1,93 @@ +html body { /* HACK: Temporary fix for CONF-15412 */ + overflow-x: visible; +} +body .dialog .button-panel { /* HACK: Temporary fix for CONF-15421 */ + bottom: 0; + top: auto; +} +img { + -ms-interpolation-mode: bicubic; +} +#header { + height: 1%; +} +#breadcrumbs { + height: 1%; /* IE6 wrapping */ + overflow: auto; + *overflow: visible; /* IE7 and below */ +} +#breadcrumbs li { + white-space: nowrap; +} +* html #breadcrumbs li { + background-image: url(../../../images/decoration/white_breadcrumbs_indicator.gif); /* IE6 */ +} +* html .page-metadata { + height: 1.2em; /* IE6 */ +} +#breadcrumbs li { + background-position: 3px 10px; +} +form { + margin: 0; + padding: 0; +} +.tab-navigation .tab { + float: left; + display: inline; + font-weight: bold; + margin: 0 5px 0 0; + position: relative; +} +.tab-navigation .tab a { + display: inline-block; /* anchors were making tabs very wide in Clickr theme in IE */ +} +a.icon { + height: 16px; +} +#tree-div { + min-height: 300px; + height: auto !important; + height: 300px; +} +h1 #content-title { + margin: 0; + display: block; + width: 90%; /* 93% and upwards breaks at least one of the IEs */ +} +h1 span.title-text { + height: 1%; +} +#com-atlassian-confluence h1 { + width: auto; +} + +#com-atlassian-confluence h1 img.logo { + *margin-bottom: 0; +} + +* html #com-atlassian-confluence h1 img.custom { + /* sets max-height for IE - roughly equivalent to what real browsers do with 2.5em max-height */ + height: expression( this.scrollHeight > 59 ? "60px" : "auto" ); +} + +#tab-navigation, +.tab-navigation { + zoom: 1; +} +.has-sidebar #content .code { + _clear: both; + _overflow: auto; +} +.menu-section-list li a:visited, +.menu-section-list li a:hover { + color: #666; +} +.menu-section-list li.active a:visited { + color: #fff; +} + +/* Don't remove or dropdowns may break in IE6. CONF-17932 */ +* html #header-menu-bar .hidden { + width: 12em; +}