Author: dward Date: 2007-11-13 18:22:51 +0100 (Tue, 13 Nov 2007) New Revision: 5849
Modified: xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/ie6.css xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css Log: - Merge styles from wiki page into css files Modified: xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/ie6.css =================================================================== --- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/ie6.css 2007-11-13 16:23:43 UTC (rev 5848) +++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/ie6.css 2007-11-13 17:22:51 UTC (rev 5849) @@ -7,6 +7,7 @@ margin-right: 10px; } .contenthideright { + margin-right: 0px; margin-left: auto; } /* end ie6 menu */ @@ -15,6 +16,8 @@ .help #contentcolumn { padding-left: 0px; float: right; + margin-left: 20px; + margin-right: -5px; } .help #leftPanels.left { margin-left: 0px; @@ -23,4 +26,46 @@ border-left: 0px; margin-left: auto; } -/* end ie6 help */ \ No newline at end of file +/* end ie6 help */ + +/* View mode - fixing the floating assets issue */ +#contentcolumn { + width: 615px !important; + margin-left: 4px; +} +#contentcolumn .layoutsubsection { + width: 615px !important; +} +.leftsidecolumns .asset-contents { + margin-right: -20px; +} +.leftsidecolumns .asset-metadatas .titlebar { + width:593px !important; +} +.leftsidecolumns .asset-metadatas { + width: 585px !important; + padding: 0; + margin-right: -10px; +} +.leftsidecolumns .asset-contents .asset-content-body-composite-source, .leftsidecolumns .asset-contents .asset-content-body-composite-composite { + width: 572px; +} +.leftsidecolumns .asset-metadatas-block .strong { + font-size: 12px; +} +.dialog-next, .gwt-ButtonOrange { + background: #FF7F00; + border: 1px solid #FF4100; + color: #FFFFFF; +} +.my-curriki-table .righttext { + font-size: 12px; +} + +/* Help fixing content width issues */ +.help #contentcolumn, .help #contentcolumn .layoutsubsection, .leftsidecolumns .help .asset-metadatas, .leftsidecolumns .help .asset-metadatas, .leftsidecolumns .help .asset-metadatas .titlebar, .leftsidecolumns .help .asset-content-body-composite-source, .leftsidecolumns .help .asset-content-body-composite-composite { + width: auto !important; +} +.leftsidecolumns .help .asset-metadatas { + margin-right: 0px !important; +} Modified: xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css =================================================================== --- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css 2007-11-13 16:23:43 UTC (rev 5848) +++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/style.css 2007-11-13 17:22:51 UTC (rev 5849) @@ -4579,6 +4579,7 @@ float: left; } +/* Added 2007-11-13 */ /* Fixing the grey outer border in the cb help */ .help .asset-page { padding: 10px; @@ -4586,3 +4587,65 @@ .help .titlebar_red { margin: 0; } + +/* Fixing the grey outer border in the cb help */ +#currikimaincontainer .asset-page { + padding: 10px; +} +#currikimaincontainer .titlebar_red { + margin: 0; +} +#printcontainer .asset-display { + margin-top: 10px; +} + +/* fixing the main site print and view alignment issues */ +.leftsidecolumns .asset-contents { + width: 595px; + background: #FFF; +} +.leftsidecolumns .asset-metadatas { + width: 595px; +} +.leftsidecolumns .asset-metadatas .titlebar { + width: 595px; +} +.leftsidecolumns .asset-content-body { + padding: 10px 0px !important; +} +.asset-contents .asset-content-body-composite-source, .asset-contents .asset-content-body-composite-composite { + width: 810px important; +} +.leftsidecolumns .asset-contents .asset-content-body-composite-source, .leftsidecolumns .asset-contents .asset-content-body-composite-composite { + margin: 0 0 10px 0 !important; + position: relative; + left: 10px; + background: #FFF; + width: 565px; +} +.help .leftsidecolumns .asset-contents .asset-content-body-composite-source { + float: none; +} +.asset-content-body-composite-source .righttext div { + float: right; +} +.asset-content-body-composite-source .righttext .lefttext { + float: none; +} +.asset-content-body-composite-source .righttext .titlebar_left { + padding: 0 !important; +} +.contentcolumn { + width: 620px; +} + +/* Fixing the cb help */ +.leftsidecolumns .help .asset-metadatas, .leftsidecolumns .help .asset-metadatas, .leftsidecolumns .help .asset-metadatas .titlebar, .leftsidecolumns .help .asset-content-body-composite-source, .leftsidecolumns .help .asset-content-body-composite-composite { + width: auto; +} +.leftsidecolumns .help .asset-content-body-composite-source, .leftsidecolumns .help .asset-content-body-composite-composite { + position: static; +} +.leftsidecolumns .help .asset-content-body { + padding: 10px 10px 0 !important; +} _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications