Changeset 15000

Timestamp:

03/02/10 16:31:41 (2 years ago)

Author:

sam

Message:

stylage matrix suite

Location:

trunk/Xul_Core/content/scenariCore/widgets/matrix

Files:

• matrix.xbl.css (modified) (8 diffs)
• matrix.xbl.xml (modified) (1 diff)
• slotContents.xbl.xml (modified) (2 diffs)

trunk/Xul_Core/content/scenariCore/widgets/matrix/matrix.xbl.css

@@ -69 +69 @@
 
 hbox[anonid=header]{
-        min-height:25px;
+        min-height:20px;
 }
 hbox[anonid=tabsContainer]:empty{
@@ -105 +105 @@
         border-bottom: 1px solid ThreeDShadow;
         border-right: 1px solid ThreeDShadow;
-        border-left: 1px solid transparent;
-        padding: 3px 4px 2px 4px;
+        border-left: 0px;
+        padding: 0px;
         max-width: -moz-min-content;
 }
 
-slotTab:FIRST-CHILD,
-slotTabContent:FIRST-CHILD{
-        -moz-border-radius-topleft: 3px;
+slotTab.firstTab,
+slotTabContent.firstTab{
+        -moz-border-radius-topleft: 4px;
+}
+
+slotTab.justBeforeSelected,
+slotTabContent.justBeforeSelected{
+        border-right: 0px;
 }
 
@@ -120 +125 @@
         background: -moz-linear-gradient(top, threedhighlight,threedface);
         border-bottom: 1px solid threedface;
-}
+        border-right: 1px solid ThreeDShadow;
+        border-left: 1px solid ThreeDShadow;
+        border-top: 1px solid ThreeDShadow;
+        -moz-border-radius-topleft: 4px;
+        -moz-border-radius-topright: 4px;
+        margin-top:-1px;
+}
+slotTab.selectedTab.firstTab,
+slotTabContent.selectedTab.firstTab{
+        border-left: 0px;
+}
+
 
 slotTab:focus,
@@ -132 +148 @@
 }
 
-slotTab .tabLabel,
-slotTabContent .tabLabel{
+slotTab .tabLabelTxt,
+slotTabContent .tabLabelTxt{
         padding-left:0px;
         padding-right:0px;
@@ -143 +159 @@
         padding:0px;
 }
-
-
-
+slotTab .tabLabel,
+slotTabContent .tabLabel{
+        padding: 3px 4px 2px 4px;
+}
+slotTab .tabTools,
+slotTabContent .tabTools{
+        visibility:hidden;
+        margin:0px;
+        padding: 0px;
+}
+slotTab:hover .tabTools,
+slotTabContent:hover .tabTools {
+        visibility:visible;
+}
+slotTab *[anonid=tabToolBar],
+slotTabContent *[anonid=tabToolBar]{
+                padding: 1px 2px 1px 4px;
+        border-left: 1px solid ThreeDShadow;
+        border-bottom: 1px solid ThreeDShadow;
+        -moz-border-radius-bottomleft: 4px;
+        opacity:0.5;
+        background: -moz-linear-gradient(top, threedhighlight,threedface);
+}
+slotTab.selectedTab *[anonid=tabToolBar],
+slotTabContent.selectedTab *[anonid=tabToolBar]{
+        -moz-border-radius-topright: 4px;
+}
+slotTab *[anonid=tabToolBar]:hover,
+slotTabContent *[anonid=tabToolBar]:hover{
+        opacity:0.9;
+}
 
 arrowscrollbox[anonid=tabsBar]{
@@ -163 +207 @@
         border: 1px solid ThreeDShadow;
 }
-toolbarbutton[anonid=maxBtn] toolbarbutton-icon{
-        margin:left:3px;
-}
+
+/* ======================== maxBtn ======================== */ 
 toolbarbutton[anonid=maxBtn] {
                 -moz-appearance: none;
@@ -175 +218 @@
         width: 20px;
 }
+toolbarbutton[anonid=maxBtn] .toolbarbutton-icon{
+        opacity:0.5;
+}
 toolbarbutton[anonid=maxBtn]:hover {
         -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
+toolbarbutton[anonid=maxBtn]:hover .toolbarbutton-icon{
+        opacity:1;
+}
 toolbarbutton[anonid=maxBtn]:active {
         -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
-
+toolbarbutton[anonid=maxBtn]:active .toolbarbutton-icon{
+        opacity:1;
+}
 *[BlockMax=true] toolbarbutton[anonid=maxBtn] {
         list-style-image: url("chrome://scenariCore/content/widgets/matrix/img/bkNorm.png");
 }
 
+/* ======================== closeBtn ======================== */ 
 toolbarbutton[anonid=closeBtn] {
         list-style-image: url("chrome://scenariCore/content/widgets/matrix/img/close-button.png");
@@ -194 +246 @@
         width: 16px;
         height: 16px;
-        visibility:hidden;
-}
-slotTab:hover toolbarbutton[anonid=closeBtn],
-slotTabContent:hover toolbarbutton[anonid=closeBtn] {
-        visibility:visible;
 }
 .selectedTab>toolbarbutton[anonid=closeBtn]{

trunk/Xul_Core/content/scenariCore/widgets/matrix/matrix.xbl.xml

@@ -620 +620 @@
                 <content align="center">
                         <children>
-                <xul:image class="tabIcon" xbl:inherits="src=image"/>
-                        <xul:label class="tabLabel small-margin" xbl:inherits="value=label"/>
-                        <xul:spacer flex="1"/>
+                                        <xul:stack>
+                                                <xul:hbox class="tabLabel">
+                                <xul:image class="tabLabelIco" xbl:inherits="src=image"/>
+                                        <xul:label class="tabLabelTxt small-margin" xbl:inherits="value=label"/>
+                                                </xul:hbox>
+                                                <xul:hbox class="tabTools" pack="end" align="top">
+                                                        <xul:hbox anonid="tabToolBar">
+                                                    <xul:toolbarbutton anonid="closeBtn" hidden="true" xbl:inherits="hidden=notClosable" oncommand="document.getBindingParent(this).closeTab();"/>
+                                                        </xul:hbox>
+                                                </xul:hbox>
+                                        </xul:stack>
             </children>
-            <xul:toolbarbutton anonid="closeBtn" hidden="true" xbl:inherits="hidden=notClosable" oncommand="document.getBindingParent(this).closeTab();"/>
                 </content>
                 <implementation>

trunk/Xul_Core/content/scenariCore/widgets/matrix/slotContents.xbl.xml

@@ -52 +52 @@
                                 <xul:arrowscrollbox anonid="tabsBar" flex="1" orient="horizontal">
                                         <xul:hbox anonid="tabsContainer" flex="1"/>
-                                        <xul:spacer anonid="tabsBarSpace" flex="100"/>
+                                        <xul:spacer anonid="tabsBarSpace" flex="10000"/>
                                 </xul:arrowscrollbox>
                                 <!-- TODO Historique
@@ -103 +103 @@
         <!-- Interne : onglets destinés pour le slotContents -->
         <binding id="slotTabContent" extends="chrome://scenariCore/content/widgets/matrix/matrix.xbl.xml#slotTab">
-                <content align="center" flex="1">
+                <content align="top">
                                 <children>
-                <xul:image class="tabIcon" xbl:inherits="src=image"/>
-                        <xul:label class="tabLabel small-margin" xbl:inherits="value=label" minwidth="20" crop="end"/>
-                        <xul:spacer flex="1" style="background-color: green;"/>
+                                        <xul:stack>
+                                                <xul:hbox class="tabLabel">
+                                <xul:image class="tabLabelIco" xbl:inherits="src=image"/>
+                                        <xul:label class="tabLabelTxt small-margin" xbl:inherits="value=label" minwidth="20" crop="end"/>
+                                                </xul:hbox>
+                                                <xul:hbox class="tabTools" pack="end" align="top">
+                                                        <xul:hbox anonid="tabToolBar">
+                                                <xul:toolbarbutton anonid="closeBtn" oncommand="document.getBindingParent(this).closeTab();"/>
+                                                        </xul:hbox>
+                                                </xul:hbox>
+                                        </xul:stack>
                     </children>
-                <xul:toolbarbutton anonid="closeBtn" oncommand="document.getBindingParent(this).closeTab();"/>
                 </content>
         </binding>