Author: vmassol Date: 2008-02-06 21:27:07 +0100 (Wed, 06 Feb 2008) New Revision: 7328
Added: xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/images/black-edit.png xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/usersandgroups.css Removed: xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/htmlheader.vm xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/macros.vm Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style.css Log: XSTOUCAN-1: Create Toucan skin from xwiki.org * Applied latest changes from Laurent Lunati: - edit section icon added - fixed floating box style (still some issues to be fixed tomorrow) - fixed RMUI styles by adding the usersandgroups.css CSS - fixed some IE6 issues - removed vm that could be removed Deleted: xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/htmlheader.vm =================================================================== --- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/htmlheader.vm 2008-02-06 20:24:47 UTC (rev 7327) +++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/htmlheader.vm 2008-02-06 20:27:07 UTC (rev 7328) @@ -1,56 +0,0 @@ -### In non-Servlet mode (in Portlet mode for example) we don't display the <HTML>, <HEAD> and <BODY> -### elements. -#if($context.getMode()==0) -<?xml version="1.0" encoding="$xwiki.encoding" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> -<html xmlns="http://www.w3.org/1999/xhtml"; lang="$context.language" xml:lang="$context.language"> - <head> - - <title> - #if(!$title) - #set( $title = $!xwiki.getWebPreference("title")) - #if ( $title != "") - $xwiki.parseContent($title) - #else - XWiki - $!doc.web - $!doc.displayTitle - #end - #else - $title - #end - </title> - - <meta http-equiv="Content-Type" content="text/html; charset=$xwiki.encoding" /> - <meta http-equiv="imagetoolbar" content="no"/> - $xwiki.parseContent($!xwiki.getWebPreference("meta")) - - #template("stylesheets.vm") - #template("analytics.vm") - #template("javascript.vm") -<!--[if lt IE 7]> - <link href="$xwiki.getSkinFile("ie.css")" rel="stylesheet" type="text/css" /> -<![endif]--> - </head> - - #if(($context.action=="inline")||($context.action=="edit") || ($context.action=="admin")) - <body onunload="return false; cancelEdit()" - onload="prepareCancelEdit(); createColorPicker();" id="body" class="$context.database ${context.action}body #if($showLeftPanels == "0")hideleft#end#if($showRightPanels == "0")hideright#end#if($hidecolumns && ($!hidecolumns == 1))hidelefthideright#end"> - #else - <body id="body" class="$context.database ${context.action}body #if($showLeftPanels == "0")hideleft#end#if($showRightPanels == "0")hideright#end#if($hidecolumns && ($!hidecolumns == 1))hidelefthideright#end"> - #end - -#else - - #template("stylesheets2.vm") - #template("javascript.vm") - - <!-- This is a hack for Exo which needs this for the XWiki portlet to fit in the Portlet window - properly. In the future Exo should modifies its behavior so that this is not necessary and - this will need to be removed --> - <div class="UIApplication" style="overflow: auto"> - -#end - -<!-- These elements will be closed in the footer vm file --> -<div id="xwikimaincontainer" class="$context.database"> -<div id="xwikimaincontainerinner" class="$context.database"> Added: xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/images/black-edit.png =================================================================== (Binary files differ) Property changes on: xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/images/black-edit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/macros.vm =================================================================== --- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/macros.vm 2008-02-06 20:24:47 UTC (rev 7327) +++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/macros.vm 2008-02-06 20:27:07 UTC (rev 7328) @@ -1,283 +0,0 @@ -### -### Panel header -### -### Generate the starting html code for a panel -### -### @param title The panel caption title -### -#macro(panelheader $title) -#set($cookieName = "${context.user}_${panel}") -#set($expanded = "expanded") -#set($expanded = $xwiki.getUserPreferenceFromCookie($cookieName)) -## Note: We pass the Panel name as an HTML class attribute so that it's possible to style -## the Panels selectively using CSS. -#set ($specialClassAttribute = "") -#if ($paneldoc && $paneldoc != "") - #set ($specialClassAttribute = $util.convertToAlphaNumeric($paneldoc.name)) -#end -<div class="panel $expanded $specialClassAttribute"> -<h5 class="xwikipaneltitle" onclick="if(eltHasClass(this.parentNode, 'expanded')) createCookie('$cookieName','collapsed', ''); else eraseCookie('$cookieName'); togglePanelVisibility(this.parentNode);">$title</h5> -<div class="xwikipanelcontents"> -#end - -#macro(panelhiddenheader $title) -## Note: We pass the Panel name as an HTML class attribute so that it's possible to style -## the Panels selectively using CSS. -#set ($specialClassAttribute = "") -#if ($paneldoc && $paneldoc != "") - #set ($specialClassAttribute = $util.convertToAlphaNumeric($paneldoc.name)) -#end -<div class="panel expanded $specialClassAttribute"> -<h5 class="xwikipaneltitle hidden" onclick="togglePanelVisibility(this.parentNode);">$title</h5> -<div class="xwikipanelcontents"> -#end - -#macro(largepanelheader $title) -#set($cookieName = "${context.user}_${panel}") -#set($expanded = "expanded") -#set($expanded = $xwiki.getUserPreferenceFromCookie($cookieName)) -## Note: We pass the Panel name as an HTML class attribute so that it's possible to style -## the Panels selectively using CSS. -#set ($specialClassAttribute = "") -#if ($paneldoc && $paneldoc != "") - #set ($specialClassAttribute = $util.convertToAlphaNumeric($paneldoc.name)) -#end -<div class="large panel $expanded $specialClassAttribute"> -<h5 class="xwikipaneltitle" onclick="if(eltHasClass(this.parentNode, 'expanded')) createCookie('$cookieName','collapsed', ''); else eraseCookie('$cookieName'); togglePanelVisibility(this.parentNode);">$title</h5> -<div class="xwikipanelcontents"> -#end - -### -### Panel footer -### -### Generate the ending html code for a panel -### -#macro(panelfooter) -</div> -</div> -#end - -### -### Display Panel -### -### Extract and display the panel code from the panel object -### -#macro(displaypanel $name) - #set ($pobj = "") - ## Since Velocity does not do any assignment if the RHS is null we need to reset the paneldoc - ## as otherwise the previously set panel will be displayed. getDocument() returns null if the - ## user doesn't have the right to view a document. - #set ($paneldoc = "") - #set ($paneldoc = $xwiki.getDocument($name)) - #if ($paneldoc != "") - #set ($pobj = $paneldoc.getObject("Panels.PanelClass")) - #if (!$pobj) - ## discarded - #else - $!doc.display("content", "view", $pobj) - #end - #end -#end - -#macro(displayPropName $prop) -#if($msg.get("$class.getName()_$prop.name") == "$class.getName()_$prop.name") -$prop.prettyName#else -$msg.get($prop.name)#end -#end - -### -### Display Panel content -### -### -#macro(displaypanelcontent $doc $obj) -$doc.display("content", $obj) -#end - -### -### Toplevel Menu entry with subitems -### -### Generate a menu entry and start the subitem section -### -### @param actionurl The URL this entry points to -### @param linktext The menu item text -### -#macro(xwikitopmenuentrystart $actionurl $linktext $id) -<div class="topmenuentry" onmouseover="showsubmenu(this);" onmouseout="hidesubmenu(this);" id="$id"> -<a class="tme" #if ($actionurl != "") href="$actionurl" #else style="cursor:default;" #end><strong>$linktext</strong></a><span class="hidden menucolon">: </span><span class="submenu hidden"> -#end - -### -### Toplevel Menu entry without subitems -### -### Generate a menu entry withut subitems -### -### @param actionurl The URL this entry points to -### @param linktext The menu item text -### -#macro(xwikitopmenuentry $actionurl $linktext $id) -<div class="topmenuentry" id="$id"><a href="$actionurl"><strong>$linktext</strong></a></div> -#end - -### -### Menu subitem entry -### -### Generate a submenu entry -### -### @param actionurl The URL this entry points to -### @param linktext The menu item text -### -#macro(submenuitem $actionurl $linktext) -<span class="submenuitem"><a href="$actionurl">$linktext</a></span> -#end - -### -### Menu disabled subitem entry -### -### Generate a disabled submenu entry -### -### @param text The menu item text -### -#macro(submenuitemdisabled $text) -<span class="submenuitem disable">$text</span> -#end - - -### -### Menu submenu separator -### -#macro(submenuseparator) -<span class="submenuseparator"> </span> -#end - -### -### Toplevel Menu entry end -### -### End the subitem section -### -#macro(xwikitopmenuentryend) -</span></div> -#end - -### -### Message box -### -#macro(xwikimessageboxstart $title $message) - <div class="centered"> - <div class="xwikimessage"> - <h3>$title</h3> - <p class="xwikimessage">$message</p> -#end -#macro(xwikimessageboxend) - </div> - </div> -#end - -#macro(xwikimessagebox $title $message $urlyes $urlno $msgyes $msgno) -#xwikimessageboxstart($title $message) - <div class="buttons"><a href="$urlyes"><input type="button" class="button" value="$msgyes" onclick="location='$urlyes'; return false;"/></a><a href="$urlno"><input type="button" class="button" value="$msgno" onclick="location='$urlno'; return false;"/></a></div> -#xwikimessageboxend() -#end - -#macro(xwikimessageboxfield $fielddoc $fieldname $fieldtext $html) -<div class="xmblabel">$fieldtext</div> -<div class="xmbfield"> -#if($fieldname!="") -$fielddoc.display($fieldname, "edit") -#end -#if($html!="") -$html -#end -</div> -#end - -#macro(xwikimessageboxsubmit $submittext) -<div class="xmbbutton"> -<input type="submit" value="$submittext" /> -</div> -#end - - -### -### message -### - -#macro(warning $text) -<div class="warningmessage"><span class="messagetype">$msg.get("warning"): </span>$text</div> -#end - -#macro(error $text) -<div class="errormessage"><span class="messagetype">$msg.get("error"): </span>$text</div> -#end - -#macro(info $text) -<div class="infomessage">$text</div> -#end - -#macro(message $text) -<div class="plainmessage">$text</div> -#end - -#macro (floatingbox $text) -<div class="floatinginfobox"><div class='floatingboxinner'>$text</div></div> -#end - -#macro (startfloatingbox) -<div class="floatinginfobox"> - <div class='floatingboxinner'> -#end - -#macro (endfloatingbox) -</div></div> -#end - -### -### CSS properties -### -#macro(csscolorproperty $csspropname $fieldname) -#set($objcolor = $colors.get($fieldname)) -#if($objcolor && $objcolor != "") - $csspropname: $objcolor; -#end -#end -## -## -## -#macro(csscolorpropertyimportant $csspropname $fieldname) -#set($objcolor = $colors.get($fieldname)) -#if($objcolor && $objcolor != "") - $csspropname: $objcolor !important; -#end -#end - -#macro(displayPropName $prop) -#if($msg.get("$class.getName()_$prop.name") == "$class.getName()_$prop.name") -$prop.prettyName#else -$msg.get($prop.name)#end -#end - -### -### Display Panel content -### -### -#macro(displaypanelcontent $doc $obj) -$doc.display("content", $obj) -#end - -### -### Display in page panels layout -### -### -#macro(displayPanelLayout $nbcolumns $panelNameList) - <div class="panellayoutcontainer-${nbcolumns}col"> - #set($lastColumnId = ($nbcolumns - 1)) - #foreach($colId in [0..$lastColumnId]) - <div class="panellayoutcol"> - #foreach($panelName in $panelNameList) - #if($panelName && ($panelName != "") && (((($velocityCount - 1) + $nbcolumns) % $nbcolumns) == $colId)) - #displaypanel($panelName) - #end - #end - </div> - #end - </div> -#end Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style.css =================================================================== --- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style.css 2008-02-06 20:24:47 UTC (rev 7327) +++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style.css 2008-02-06 20:27:07 UTC (rev 7328) @@ -1,3 +1,5 @@ +/* @override http://192.168.1.11:8080/xwiki/bin/skin/skins/toucan/style.css */ + @import "microformats.css"; @import "fullscreenEdit.css"; @import "css/table/table.css"; @@ -86,6 +88,7 @@ em {font-style: italic;} strong, .strong {font-weight: bold;} /* @end */ + /* @group XWIKI */ #doctitle { font-size: 2.8em; @@ -123,7 +126,7 @@ h1 { margin-top: 5px; font-size: 2.6em; - font-weight: normalmal; + font-weight: normal; letter-spacing: -1px; line-height: 1.1em; } @@ -161,23 +164,36 @@ line-height: 1.1em; } -.edit_section{ + +span.edit_section{ position: relative; - float: right; + display: block; + background: #ccc; + margin-top: -20px !important; visibility: hidden; overflow: hidden; height: 24px; - width: 24px; line-height: 24px; - margin-top:-20px; + margin-bottom: -1em; + border: 1px solid red; } .edit_section a{ - position: relative; - padding: 20px 0 0 20px; + position: absolute; + top: 0px; + right: 0px; + margin: 0; + margin-right: -52px; + padding-left: 50px; + line-height: 24px; visibility: visible; - background: transparent url("icons/black-edit.png") left bottom no-repeat; + background: transparent url("images/black-edit.png") left top no-repeat; +overflow: hidden; +border: 0px solid blue; +} -} + + + .quote { font-style: italic; color: inherit; @@ -264,6 +280,7 @@ font:bold 1.2em/2em Arial,Helvetica,sans-serif; color:#66a3d3 } + table.xwikilogintable th {background-color: transparent;} .main tfoot th { text-align:center; background:#f4f9fe; @@ -291,6 +308,7 @@ line-height : 1.4em; margin-top: 1em; margin-bottom:1em; + list-style-position: inside; } .main ol ol, .main ul ul { margin-top: 0em; @@ -562,6 +580,8 @@ background-repeat: repeat-y; border-bottom: 1px solid #ccc; } +body.eportbody #xwikimaincontainer, +body.importbody #xwikimaincontainer, body.adminbody #xwikimaincontainer, body.hidelefthideright #xwikimaincontainer, body.hideleft #xwikimaincontainer, @@ -594,8 +614,8 @@ background-image: url( images/colors/gray/bg-GRAY3.png ); } - - +body.importbody #xwikimaincontainerinner, +body.exportbody #xwikimaincontainerinner, body.adminbody #xwikimaincontainerinner, body.hidelefthideright #xwikimaincontainerinner { margin: 0 0 0 30px; @@ -620,14 +640,20 @@ width: 220px; margin-left: -220px; } +body.exportbody #companylogo, +body.importbody #companylogo, body.adminbody #companylogo{ margin-right: 30px; padding-right: 220px; } +body.exportbody #globallinks, +body.importbody #globallinks, body.adminbody #globallinks{ margin-left: -250px; background-image: none; } +body.exportbody #globallinks a, +body.importbody #globallinks a, body.adminbody #globallinks a{ color: #888; font-size: 0.9em; @@ -641,6 +667,8 @@ #headerspace {margin-right: 220px;} body.editbody #headerspace {} body.hideleft #headerspace {margin-right: 220px;} +body.exportbody #headerspace, +body.importbody #headerspace, body.adminbody #headerspace {margin-right:30px;} @@ -674,6 +702,7 @@ #xwikicontent { overflow: auto; padding: 0; + position: relative; } @@ -711,7 +740,12 @@ width: 200px; margin-left: -100%; } +body.exportbody #editPanels.panels, +body.importbody #editPanels.panels, body.adminbody #editPanels.panels { display: none;} + + + #editPanels.panels{ position: relative; float: left; @@ -788,6 +822,7 @@ float: left; width: 100%; } +#companylogo {width: 740px;}/*IE*/ #companylogo{ padding: 0; background-color: #FFF; @@ -805,17 +840,17 @@ #companylogo a:hover { border: none; } + #companylogo a img { height: 100px; width: 300px; } + #companylogo a img {position: relative; float: left;}/*IE*/ - - #globaldoctitle { display: none; /*pour éviter pb dans IE -- a regler*/ } @@ -844,9 +879,13 @@ margin-right: 220px; border-top: 1px solid #000; } +#headerspace {height: 24px; overflow:hidden;}/*ie*/ + #headerspace a{line-height: 25px;} +body#body.exportbody #footerglobal, +body#body.importbody #footerglobal, body#body.adminbody #footerglobal{ - margin-right: 0px; + margin-right: 30px; } #footerglobal { clear:both; @@ -879,7 +918,7 @@ border: none; text-align: right; font-size: 0.9em; - margin-top: 1em 0; + margin: 1em 0; padding: 5px 10px; background-color: #F9F9F9; color: #888; @@ -1208,12 +1247,16 @@ border-bottom: none; overflow:auto; } +#xwikieditor ul.xwikitabbar{ + overflow: hidden; + } #xwikicontent ul.xwikitabbar{ overflow: hidden; margin: 0px; border-bottom: 2px solid #555; } .xwikitabbar li{ + position: relative; display: inline; padding: 5px 0px; list-style-type: none; @@ -1225,7 +1268,7 @@ display: block; float: left; width: 106px; - background: transparent url( images/tab.png ) top left no-repeat; + background: transparent url(images/tab.png ) top left no-repeat; border: none; } .xwikitabbar li#xwikiorphansview{ @@ -1259,7 +1302,9 @@ background-position:top right; border: none; } - +#xwikichangespace { + padding:10px 5px; +} /* @end */ /* -- @@ -1277,40 +1322,28 @@ -#download .xwikipanelcontents a { - display: block; - width: 190px; - height: 50px; - background-image: url( images/downloadxwiki.png ); -} -#download .xwikipanelcontents a span {display: none;} -#globalsearch form div { + + +#rightPanels .Search #globalsearch { text-align: center; margin: 0px ; - padding:18px 15px 0; - line-height: 1em; + padding:15px 15px 0; +line-height: 12px; background-color: transparent; height:50px; background-image: url( images/search-bg.png ); background-repeat: no-repeat; + margin:0 ; } -#download .xwikipanelcontents, -#globalsearch .xwikipanelcontents { +.Search .xwikipanelcontents, +.Search .xwikipaneltitle { background-image:none; padding:0px; } -#globalsearch div.expanded{ +#globalsearch{ margin: 0px 0px 0px 10px; } - - - - - - - - .xwikipanelcontents form{margin: 0;padding: 0px;} #rightPanels #globalsearch input{ font-size: 0.9em; @@ -1327,7 +1360,7 @@ width: auto; } #leftPanels , -#rightPanels{padding: 0 0 100px 0;} +#rightPanels{padding: 0 0 100px 0; height: 1%;} .panels{} html > body .panels{ margin-top: 0px; @@ -1532,7 +1565,11 @@ .placeholder{width: 200px;} html > body #dragbox {width: 198px !important;} -#xwikinavcontainer{ margin : -6px 0;} +#xwikinavcontainer{ +margin : 0 0 0; +border: 1px solid #999; +border-width: 0 0 1px 0; +} span.pitemseparator{ display: none; @@ -1595,6 +1632,23 @@ color: #FFF; background-color: #8799b3; } +#xwikinav .accordionTabTitleBar h6{ + background-color: #fff; + color: #333; + border: 1px solid #999; + margin-top: 0px; + border-width: 1px 0 0 0; +} + +#xwikinavcontainer #xwikinav .tbexpanded h6 { + border-width: 1px 0; +} + + + + + + #xwikieditcontent .accordionTabTitleBar h6{ margin: 0px; padding:4px 21px; @@ -1829,8 +1883,10 @@ margin: 60px 240px 20px 20px; border: 1px solid #ddd; } +body.importbody .alleditcontent, +body.exportbody .alleditcontent, body.adminbody .alleditcontent{ - margin: 20px 50px 20px 20px; + margin: 30px 50px 20px 20px; } .alleditcontent label { display: block; @@ -2098,7 +2154,46 @@ border-color: #94ad12; color: #333; } + + +body.importbody .alleditcontent .padded h3, +body.exportbody .alleditcontent .padded h3{ + font-size: 1.4em; + margin: 1em 0; + border-bottom: 1px solid #ccc; +} +body.importbody #editcolumn .alleditcontent .padded fieldset, +body.exportbody #editcolumn .alleditcontent .padded fieldser{ +background-color: #eaeaf3; +border: 5px solid #eaeaf3; +border-width:25px 5px 5px; +} +body.importbody #editcolumn .alleditcontent .padded label, +body.exportbody #editcolumn .alleditcontent .padded label{ +text-align: left; +margin: 0; +} + + + + + + + /* @end */ + + + + + + + + + + + + + table#searchTableUnique {width: 99.8%;} table#searchTableUnique td span.wikilink { display:block; @@ -2187,19 +2282,19 @@ display: none; } -div.floatingboxinner, fieldset.floatingboxinner{ - background-color: #FAFAFD; - padding: 10px; -} + div.floatinginfobox, fieldset.floatinginfobox { - width:auto; + width:auto; float: right; border-left: 20px solid #FFF; border-bottom: 40px solid #FFF; - background-color:#E4E4E5; - padding: 1px; - margin: 0 0 0.5em 0 ; +background-color: #f1f1fc; + padding: 10px; + margin: 1em 0 0.5em 0 ; } +div.floatingboxinner, fieldset.floatingboxinner{ +} + div.floatinginfobox .strong, fieldset.floatinginfobox .strong { display: block; text-align: center; @@ -2217,6 +2312,8 @@ list-style-image:url( images/bullet-1.png ); list-style-position:outside; } + + /* --------------------------------------- Images @@ -2275,18 +2372,19 @@ #treeview table td{ text-align: left; padding: 0px;} .roundedbox { - margin: 0 auto; - background: url( images/rounded.png ) no-repeat bottom right; - font-size: 100%; + margin: 0em; + border: 1em solid #fff; + border-width: 0 1em; + background:transparent url(images/rounded.png ) no-repeat bottom right; } .roundedheader { - background: url( images/rounded.png ) no-repeat top right; + background:transparent url(images/rounded.png ) no-repeat top right; margin: 0; padding: 0; text-align: left; } .roundedheader h3 { - background: url( images/rounded.png ) no-repeat top left; + background:transparent url(images/rounded.png ) no-repeat top left; margin: 0; padding: 10px 10px 5px; color: white; @@ -2295,26 +2393,14 @@ line-height: 1em; } .roundedbody { - background: url( images/rounded.png ) no-repeat bottom left; + width: auto; + background:transparent url(images/rounded.png ) no-repeat bottom left; margin: 0; padding: 5px 30px 31px; } - - - -. - - - - - - - - #changescontent {} - #changescontent table{ width: 100%; margin: 0;} @@ -2360,7 +2446,7 @@ } div#changes-info{ background-color: #919dac; - background-image: url( images/DIFF-header.png ); + background-image: url(images/DIFF-header.png ); background-position:50% -35px ; background-repeat: no-repeat; } @@ -2368,7 +2454,7 @@ #changes-title { margin-top: 2em; background-color: #6b747f; - background-image: url( images/rounded.png ) !important; + background-image: url(images/rounded.png ) !important; background-image: url( images/rounded.gif ) ; } #changes-title h1{ @@ -2376,8 +2462,8 @@ font-size: 1.4em; letter-spacing: 1px; text-align: center; - background-image: url( images/rounded.png ) !important; - background-image: url( images/rounded.gif ) ; + background-image: url(images/rounded.png ) !important; + background-image: url(images/rounded.gif ) ; background-position: top right; color: #fff; border-bottom: 4px solid #fff; @@ -2421,3 +2507,47 @@ padding: 1em 0; color: #FFF; } +/*IE 6 ONLY*/ +/* IE 6 */ +* html * {zoom:1; } +* html a {position:relative; z-index:1;} +* html #rightPanels, #editPanels { margin-top: -27px;} +* html #globalsearch{margin-bottom: 1em} + +* html h5.xwikipaneltitle, +* html .collapsed h5.xwikipaneltitle, +* html .xwikipanelcontents {background-image: url(images/panel-v.gif);} +* html #rightPanels .Search #globalsearch {background-image:url(images/search-bg.gif);} + + +* html #xwikihelpsyntax {background-image: url(images/panel-e.gif);} +* html #editPanels .expanded h5.xwikipaneltitle {background-image: url(images/panel-e.gif);} +* html #editPanels .xwikipanelcontents {background-image: url(images/panel-e.gif);} +* html #editPanels .editmodes .xwikipanelcontents ul li.active {background-image: url();} +* html #editPanels .editmodes h5, #editPanels .editmodes .xwikipanelcontents {background-image: url(images/panel-m.gif);} +* html #xwikicontent{overflow-y: hidden;} + +* html #headerglobal .minwithd {display: none;} +* html .minwidth,* html .minwidthb,* html .minwidthc{} +* html #contentcolumn .minwidthb{ display:block; width:740px; margin-right:220px;} +* html #headerspace .minwidth{ display:block; width:710px;}/* 740 - 30 padding */ +* html .minwidthc{} + +* html body #show-dialog-btn { +right:1px; +top:1px; +} +* html ul.xwikitabbar{margin: 0;} +* html .roundedbox , +* html .roundedheader , +* html .roundedheader h3 , +* html .roundedbody { background-image: url(images/rounded.gif) ;} + +* html div.floatinginfobox, +* html fieldset.floatinginfobo, +* html div.floatingboxinner, +* html fieldset.floatingboxinner, +* html div.floatingboxinner *, +* html fieldset.floatingboxinner *{ + zoom: normal; +} Added: xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/usersandgroups.css =================================================================== --- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/usersandgroups.css (rev 0) +++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/usersandgroups.css 2008-02-06 20:27:07 UTC (rev 7328) @@ -0,0 +1,184 @@ +/* USERS SCROLLING SYSTEM */ + +div.scrollbar { + overflow: auto; + height: 250px; + margin:0px; + padding:0px; + width: 25px; + left: -10px; + position: relative; +} + +div.inscrollbar { + width:1px; + margin:0px; + padding:0px; + height:3000px; +} + +.display { + border-collapse: collapse; + border: 1px solid #e8e8e8; + width: 100%; +} + +.display td { + border: 1px solid #e8e8e8; + padding: 3px; +} + + +#showLimits { + font-size: 12px; + padding-top: 5px; + padding-bottom: 5px; +} + +.icon-manage { + cursor: pointer; + padding-right: 10px; +} + +.icon-manageg { + padding-right: 10px; +} + +#ajax-loader { + margin: 0px; + padding: 0px; + position: absolute; + top: 50%; + left: 35%; + z-index: 1000000000; + display: none; + width: 220px; + background-color: #fff; + border: 1px solid #999; + font-size: 11px; + padding: 8px; + text-indent: 5px; +} + + +.theader { + background-color: #ccc; + color: #FFF; + font-weight: bold; + font-size: 1em; +} + +#table-filters { + background-color: #efefef; +} + +.filter { + width: 70%; +} + +.theader td { + padding: 3px 0 3px 10px; +} + +#userstable, #groupstable, #usersandgroupstable { + width: auto; + position: relative; + border: 5px solid #fff; + margin: 0px; + left: 0px; +} + +#memberstable { + width: 500px; + margin-bottom: 5px; +} + +#specialusersandgroups { + border-collapse: collapse; + border: 1px solid #7c7c7c; + width: 100%; +} + +#specialusersandgroups td { + border: 1px solid #7c7c7c; +} + +.manage { + text-align: center; + width: 15%; +} + +.hmanage { + width: 15%; + padding-left: 10px; +} + + +.rights { + text-align: center; + padding-left: 0px !important; + padding-top: 4px; + width: 9%; +} + +#usersandgroupstable.spacerights .rights { + width: 12% !important; +} + +#usersandgroupstable.rights .rights { + width: 15% !important; +} + +.spaceName { + padding: 10px 5px; +} + +#tdAddNewUserOrGroup { + padding-top: 11px; +} + + +#tdAddNewUserOrGroup a { +display: inline-block; +display:inline; +font-size: 12px; +padding: 3px 10px; + line-height: 24px; + font-weight: bold; +margin:0px !important; +min-height:24px !important; +background:transparent url( images/buttons3.png ) repeat-x scroll right top; +border: 1px solid #8f908e; +color: #FFF; +white-space: nowrap; + background:transparent url( images/buttons3.png ) repeat-x scroll left 25%; +border-color: #94ad12; +} + +#errMsg { + color: #DD7700; + font-size: 12px; + font-weight: bold; +} + +#XWikiGuestSpecial { + background-color: #fff; + color: #000; +} + +.suorg { + padding-left: 10px; + padding-top: 4px; +} + +.username { + padding-left:10px; +} + +#addNewMember { + margin-top: 5px; +} + +.addlabel { + font-weight: bold; +} \ No newline at end of file _______________________________________________ notifications mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/notifications
