keep up with current classic developement, make full screen mode work with LCARStrek

diff --git a/LCARStrek/communicator/bookmarks/bookmarksWindow.css b/LCARStrek/communicator/bookmarks/bookmarksWindow.css
index 6336f3b549c7ac5556f59fb23eec0ef04e87da70..74e81693812b2a48fcd49c1307fc4e4e9578b748 100644 (file)
--- a/LCARStrek/communicator/bookmarks/bookmarksWindow.css
+++ b/LCARStrek/communicator/bookmarks/bookmarksWindow.css
@@ -45,22 +45,28 @@
 /** 
  * XXX - disable print plus. This needs to go into ns/!!!
  */    
 /** 
  * XXX - disable print plus. This needs to go into ns/!!!
  */    

-  #navprintplus
-    {
-      display             : none !important; 
-    }
-      
-  #status-bar
-    {
-      height              : 1em;
-    }
-    
-  #notification-icon  
-    {
-      list-style-image    : url("chrome://communicator/skin/bookmarks/notification.gif");
-    }    
-    
-  #schedule-icon  
-    {
-      list-style-image    : url("chrome://communicator/skin/bookmarks/schedule.gif");
-    }
+#navprintplus {
+  display: none !important; 
+}
+
+#status-bar {
+  height: 1em;
+}
+
+#notification-icon  {
+  list-style-image: url("chrome://communicator/skin/bookmarks/notification.gif");
+}    
+
+#schedule-icon {
+  list-style-image: url("chrome://communicator/skin/bookmarks/schedule.gif");
+}
+
+#panel-bar {
+  border-top: 1px solid #9C9CFF;
+  border-bottom: 1px solid #9C9CFF;
+}
+
+bookmarks-outliner.inset {
+  margin: 0px;
+  border: 1px solid #9C9CFF;
+}

diff --git a/LCARStrek/communicator/brand.css b/LCARStrek/communicator/brand.css
index 882c70ec7e2d1e8cd3943c7f69f134b893345fce..955e35b461b32d736d7af4d57098848ea26d8c5d 100644 (file)
--- a/LCARStrek/communicator/brand.css
+++ b/LCARStrek/communicator/brand.css
@@ -54,10 +54,12 @@
 }
 
 #navigator-throbber[toolbarmode="small"] {
 }
 
 #navigator-throbber[toolbarmode="small"] {

-  margin: 0 5px 0 0;
+  margin: 0 3px 0 1px;
+  padding: 2px;

   list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif");
 }
 
 #navigator-throbber[toolbarmode="small"][busy="true"] {
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.gif");
 }
   list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif");
 }
 
 #navigator-throbber[toolbarmode="small"][busy="true"] {
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.gif");
 }

+

diff --git a/LCARStrek/communicator/formatting.css b/LCARStrek/communicator/formatting.css
index ef6de3a32231b675e9e9d96d8dfbee69887243a4..e6665e5300845f786e7233669f303aea8ca64bfd 100644 (file)
--- a/LCARStrek/communicator/formatting.css
+++ b/LCARStrek/communicator/formatting.css
@@ -38,19 +38,16 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* class for text with a 'link' appearance */
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* class for text with a 'link' appearance */

-.text-link
-  {
-    color                 : #666699;
-    text-decoration       : underline;
-    cursor                : pointer;
-  }
-  
-.text-link:hover
-  {
-    color                 : #333366;
-  } 
-  
-.text-link:hover:active
-  {
-    color                 : #990000;
-  }
+.text-link {
+  color: #666699;
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.text-link:hover {
+  color: #333366;
+} 
+
+.text-link:hover:active {
+  color: #990000;
+}

diff --git a/LCARStrek/communicator/sidebar/sidebarListView.css b/LCARStrek/communicator/sidebar/sidebarListView.css
index b21a039f07786da48f0bd04e3ec6a058614f0a93..6f39e5c41b0a7ccbab254cde1072ebad8e35eb10 100644 (file)
--- a/LCARStrek/communicator/sidebar/sidebarListView.css
+++ b/LCARStrek/communicator/sidebar/sidebarListView.css
@@ -41,16 +41,3 @@
 outlinerchildren {
   cursor: pointer;  
 }
 outlinerchildren {
   cursor: pointer;  
 }

-
-outlinerchildren:-moz-outliner-row(selected),
-outlinerchildren:-moz-outliner-row(selected, focus) {
-  background-color: #000000 !important;
-  border: 1px solid transparent !important;
-}
-
-outlinerchildren:-moz-outliner-cell-text,
-outlinerchildren:-moz-outliner-cell-text(selected),
-outlinerchildren:-moz-outliner-cell-text(selected, focus) {
-  color: #008484 !important;
-  text-decoration: underline;
-}

diff --git a/LCARStrek/forms/button.css b/LCARStrek/forms/button.css
index 6ffe0d5f208760ae1736f19068ceb6cd17c1125d..91b7f33a0e29f9ba2249269fd64cc8a433da03ea 100644 (file)
--- a/LCARStrek/forms/button.css
+++ b/LCARStrek/forms/button.css
@@ -26,6 +26,7 @@
   ======================================================================= */
 
 @namespace url(http://www.w3.org/1999/xhtml);
   ======================================================================= */
 
 @namespace url(http://www.w3.org/1999/xhtml);

+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

 
 /* :::::::::: button :::::::::: */
 
 
 /* :::::::::: button :::::::::: */
 


@@ -33,9 +34,8 @@ button,
 input[type="button"],
 input[type="submit"],
 input[type="reset"] {
 input[type="button"],
 input[type="submit"],
 input[type="reset"] {

-  -moz-appearance: button;
+  /* -moz-appearance: button; */

   margin: 1px 5px 2px 5px;
   margin: 1px 5px 2px 5px;

-  min-width: 6.3em;

   border: 3px solid;
   -moz-border-top-colors: transparent ThreeDHighlight ThreeDLightShadow;
   -moz-border-right-colors: transparent ThreeDDarkShadow ThreeDShadow;
   border: 3px solid;
   -moz-border-top-colors: transparent ThreeDHighlight ThreeDLightShadow;
   -moz-border-right-colors: transparent ThreeDDarkShadow ThreeDShadow;


@@ -45,16 +45,35 @@ input[type="reset"] {
   color: ButtonText;
 }
 
   color: ButtonText;
 }
 

-.button-box {
+xul|*.button-box {

   border: 1px solid transparent;
   border: 1px solid transparent;

-  padding: 1px 4px 2px 3px;
+  padding: 0px 4px 1px 3px;

 }
 
 }
 

-.button-box-text {
+xul|*.button-box-text {

   margin: 0 !important;
   text-align: center;
 }
 
   margin: 0 !important;
   text-align: center;
 }
 

+/* .......... active/open/checked state .......... */
+
+button:hover:active,
+input[type="button"]:hover:active,
+input[type="submit"]:hover:active,
+input[type="reset"]:hover:active {
+  -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow transparent;
+}
+
+button:hover:active > xul|*.button-box,
+input[type="button"]:hover:active > xul|*.button-box,
+input[type="submit"]:hover:active > xul|*.button-box,
+input[type="reset"]:hover:active > xul|*.button-box {
+  padding: 1px 3px 0px 4px;
+}
+

 /* .......... focused state .......... */
 
 button:focus,
 /* .......... focused state .......... */
 
 button:focus,


@@ -67,10 +86,10 @@ input[type="reset"]:focus {
   -moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight transparent;
 }
 
   -moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight transparent;
 }
 

-button:focus > .button-box,
-input[type="button"]:focus > .button-box,
-input[type="submit"]:focus > .button-box,
-input[type="reset"]:focus > .button-box {
+button:focus > xul|*.button-box,
+input[type="button"]:focus > xul|*.button-box,
+input[type="submit"]:focus > xul|*.button-box,
+input[type="reset"]:focus > xul|*.button-box {

   border: 1px dotted ThreeDDarkShadow;
 }
 
   border: 1px dotted ThreeDDarkShadow;
 }
 


@@ -87,10 +106,10 @@ input[type="reset"][disabled="true"] {
   color: GrayText;
 }
 
   color: GrayText;
 }
 

-button[disabled="true"] > .button-box,
-input[type="button"][disabled="true"] > .button-box,
-input[type="submit"][disabled="true"] > .button-box,
-input[type="reset"][diasbled="true"] > .button-box {
-  padding: 1px 4px 2px 3px !important;
+button[disabled="true"] > xul|*.button-box,
+input[type="button"][disabled="true"] > xul|*.button-box,
+input[type="submit"][disabled="true"] > xul|*.button-box,
+input[type="reset"][diasbled="true"] > xul|*.button-box {
+  padding: 0px 4px 1px 3px !important;

 }
 
 }
 

diff --git a/LCARStrek/forms/checkbox.css b/LCARStrek/forms/checkbox.css
index 4732b6535b23c404d23284ac0e8bba835bfa5c03..85c7fea3dceb9c6bac2e403e23447dd016e0e753 100644 (file)
--- a/LCARStrek/forms/checkbox.css
+++ b/LCARStrek/forms/checkbox.css
@@ -56,11 +56,11 @@ input[type="checkbox"][disabled="true"] {
 
 /* ..... checked state ..... */
 
 
 /* ..... checked state ..... */
 

-input[type="checkbox"][_moz-input-checked] {
+input[type="checkbox"]:checked {

   list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
 }
 
   list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
 }
 

-input[type="checkbox"][_moz-input-checked][disabled="true"] {
+input[type="checkbox"][disabled="true"]:checked {

   list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif") !important
 }
 
   list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif") !important
 }
 

diff --git a/LCARStrek/forms/select-dropdown.css b/LCARStrek/forms/select-dropdown.css
index f63a8f2bcf8ed3c5f2fedaff8cda7a9169501903..7bbd75fc3ceed1a975255a29f96eb6d3c44e722a 100644 (file)
--- a/LCARStrek/forms/select-dropdown.css
+++ b/LCARStrek/forms/select-dropdown.css
@@ -43,7 +43,7 @@
  **/
 
 select, select[size="1"] {
  **/
 
 select, select[size="1"] {

-  -moz-appearance: menulist;
+  /*-moz-appearance: menulist;*/

   margin: 2px 4px;
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
   margin: 2px 4px;
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;


@@ -62,7 +62,7 @@ xul|*.select-label-box {
 }
 
 xul|*.select-dropmarker {
 }
 
 xul|*.select-dropmarker {

-  -moz-appearance: menulist-button;
+  /*-moz-appearance: menulist-button;*/

   min-width: 17px;
   -moz-box-align: center;
   -moz-box-pack: center;
   min-width: 17px;
   -moz-box-align: center;
   -moz-box-pack: center;

diff --git a/LCARStrek/forms/select.css b/LCARStrek/forms/select.css
index c8842c184b5f41ec70cde09ed5f98823fc90caaf..2e7b2063236455526ece07cde08889b7ac47b624 100644 (file)
--- a/LCARStrek/forms/select.css
+++ b/LCARStrek/forms/select.css
@@ -47,7 +47,6 @@ select[size] {
   margin: 0;
   min-height: none;
   color: inherit;
   margin: 0;
   min-height: none;
   color: inherit;

-  font: inherit;

   -moz-appearance: treeview;
 }
   
   -moz-appearance: treeview;
 }
   

diff --git a/LCARStrek/global/menu.css b/LCARStrek/global/menu.css
index db42afae2092d566788215d51a09bd9762855ef1..778f406270871048505a47022e8edfdbc37b0472 100644 (file)
--- a/LCARStrek/global/menu.css
+++ b/LCARStrek/global/menu.css
@@ -58,8 +58,8 @@ menuitem[default="true"] {
 
 menu[disabled="true"],
 menuitem[disabled="true"],
 
 menu[disabled="true"],
 menuitem[disabled="true"],

-menu[menuactive="true"][disabled="true"],
-menuitem[menuactive="true"][disabled="true"] {
+menu[disabled="true"]:-moz-menuactive,
+menuitem[disabled="true"]:-moz-menuactive {

   color: #8050B0;
 }
 
   color: #8050B0;
 }
 


@@ -108,7 +108,7 @@ menuitem[menuactive="true"][disabled="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-arrow.gif");
 }
 
   list-style-image: url("chrome://global/skin/menu/menu-arrow.gif");
 }
 

-.menu-right[menuactive="true"] {
+menu:-moz-menuactive > .menu-right {

   list-style-image: url("chrome://global/skin/menu/menu-arrow-hover.gif");
 }
 
   list-style-image: url("chrome://global/skin/menu/menu-arrow-hover.gif");
 }
 


@@ -124,13 +124,13 @@ menubar > menu {
   border: none;
 }
 
   border: none;
 }
 

-menubar > menu[menuactive="true"] {
+menubar > menu:-moz-menuactive {

   background-color: #FFCF00;
   color: #000000;
   border: none;
 }
 
   background-color: #FFCF00;
   color: #000000;
   border: none;
 }
 

-menubar > menu[menuactive="true"][open="true"] {
+menubar > menu[open="true"]:-moz-menuactive {

   background-color: #FF9F00;
   color: #000000;
   border: none;
   background-color: #FF9F00;
   color: #000000;
   border: none;


@@ -158,10 +158,10 @@ popup > menuitem {
   max-width: 42em;
 }
 
   max-width: 42em;
 }
 

-menupopup > menu[menuactive="true"],
-menupopup > menuitem[menuactive="true"],
-popup > menu[menuactive="true"],
-popup > menuitem[menuactive="true"] {
+menupopup > menu:-moz-menuactive,
+menupopup > menuitem:-moz-menuactive,
+popup > menu:-moz-menuactive,
+popup > menuitem:-moz-menuactive {

   background-color: #FFCF00;
   color: #000000;
 }
   background-color: #FFCF00;
   color: #000000;
 }


@@ -184,7 +184,7 @@ menulist > menupopup > menu > .menu-iconic-left {
   display: none;
 }
 
   display: none;
 }
 

-menulist > menupopup > menuitem[menuactive="true"] {
+menulist > menupopup > menuitem:-moz-menuactive {

   border: 1px dotted #FF9F00;
 }
 
   border: 1px dotted #FF9F00;
 }
 


@@ -198,7 +198,7 @@ menuitem[checked="true"][disabled="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
 }
 
   list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
 }
 

-menuitem[checked="true"][menuactive="true"] {
+menuitem[checked="true"]:-moz-menuactive {

    list-style-image: url("chrome://global/skin/menu/menu-check-hover.gif");
 }
 
    list-style-image: url("chrome://global/skin/menu/menu-check-hover.gif");
 }
 


@@ -212,7 +212,7 @@ menuitem[checked="true"][type="radio"][disabled="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif");
 }
 
   list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif");
 }
 

-menuitem[checked="true"][type="radio"][menuactive="true"] {
+menuitem[checked="true"][type="radio"]:-moz-menuactive {

   list-style-image: url("chrome://global/skin/menu/menu-radio-hover.gif");
 }
 
   list-style-image: url("chrome://global/skin/menu/menu-radio-hover.gif");
 }
 

diff --git a/LCARStrek/messenger/accountWizard.css b/LCARStrek/messenger/accountWizard.css
index 8d3dea97bf5200f9f3ea2438a87ac824106534e4..b9e30bd344f6c0b4485ab1c3d015e9c78487d85d 100644 (file)
--- a/LCARStrek/messenger/accountWizard.css
+++ b/LCARStrek/messenger/accountWizard.css
@@ -54,3 +54,11 @@
 #fullName {
   margin-right: 15px;
 }
 #fullName {
   margin-right: 15px;
 }

+
+.serverLabel {
+  width: 8em;
+}
+
+.serverDataBox {
+  margin-left: 15px;
+}

diff --git a/LCARStrek/messenger/addressbook/selectAddressesDialog.css b/LCARStrek/messenger/addressbook/selectAddressesDialog.css
index 1304a9ee9dbdad49d04ae042f42fb7d4f7e6409e..13b59c77267528d4e1e51db7d222cf5c327d5e33 100644 (file)
--- a/LCARStrek/messenger/addressbook/selectAddressesDialog.css
+++ b/LCARStrek/messenger/addressbook/selectAddressesDialog.css
@@ -46,46 +46,44 @@
 
 /* ::::: Select Addresses dialog ::::: */
 
 
 /* ::::: Select Addresses dialog ::::: */
 

-#dirTreeBox {
-  width: 180px;
+#topBox {
+  padding: 0.5em 0 1.0em 0;
+}
+
+#resultsTree, #dirTree
+#resultsTree > .tree-container-treerows,
+#dirTree > .tree-container-treerows {
+  border: none;

 }
 
 #resultsTree {
 }
 
 #resultsTree {

-/*  border-left: 1px solid ThreeDShadow; */
+  min-width: 10px;

 }
 }

- 
-#vertical-splitter {
-  min-width: 4px;
+
+#resultsBox {
+  border: 1px solid #9C9CFF;

 }
 
 #addToBucketButtonBox {
 }
 
 #addToBucketButtonBox {

-  padding: 0.3em; 

   min-width: 10px;
   min-width: 10px;

-}
-
-#bucketBox {
-  height: 170px;
+  padding: 0.3em; 

 }
 
 #addressBucket {
 }
 
 #addressBucket {

-  height: 100px; 

   min-width: 10px;
 }
 
   min-width: 10px;
 }
 

-#rightColumnButtonBox { /* Column with "New", "Edit" and "Remove" buttons */
-  padding: .5em; 
+#newEditButtonBox {
+  padding-top: 0.5em; 

   padding-right: 0px;
   padding-right: 0px;

+  margin-left: 0px;

 }
 
 }
 

-.third-column-spacer {  /* Vertical Spacers between 3rd column buttons */
-  height: 10px;
-}
-
-.middle-button-spacer { /* Spacers between To, CC, and BCC buttons */
+.middle-button-spacer {

   width: 10px;
 }
 
   width: 10px;
 }
 

-#bucket-splitter {
-  border: none;
-  min-height: 4px;
+.above-remove-spacer {
+  width: 10px;
+  height: 15px;

 }
 }

diff --git a/LCARStrek/messenger/threadPane.css b/LCARStrek/messenger/threadPane.css
index 1ba057b2461534bd7814756f91b54ed2452832bc..4fbf1d32dfbd8d72d52e16137e51863189355b1d 100644 (file)
--- a/LCARStrek/messenger/threadPane.css
+++ b/LCARStrek/messenger/threadPane.css
@@ -247,7 +247,7 @@ outlinerchildren:-moz-outliner-image(subjectCol, news, new, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-offline.gif");
 }
 
   list-style-image: url("chrome://messenger/skin/icons/message-news-new-offline.gif");
 }
 

-outlinerchildren:-moz-outliner-image(subjectCol, news, offl) {
+outlinerchildren:-moz-outliner-image(subjectCol, news, offline) {

   padding-right: 2px;
   list-style-image: url("chrome://messenger/skin/icons/message-news-offline.gif");
 }
   padding-right: 2px;
   list-style-image: url("chrome://messenger/skin/icons/message-news-offline.gif");
 }

diff --git a/LCARStrek/navigator/icons/win-close-hover.gif b/LCARStrek/navigator/icons/win-close-hover.gif
new file mode 100644 (file)
index 0000000..358055b
Binary files /dev/null and b/LCARStrek/navigator/icons/win-close-hover.gif differ

diff --git a/LCARStrek/navigator/icons/win-close.gif b/LCARStrek/navigator/icons/win-close.gif
index 358055b50b2003968d3ee1018db86b0399dafc82..69f2ee982bff78b97653ba9e1000f7cb1eba1f1c 100644 (file)
Binary files a/LCARStrek/navigator/icons/win-close.gif and b/LCARStrek/navigator/icons/win-close.gif differ

diff --git a/LCARStrek/navigator/icons/win-minimize-hover.gif b/LCARStrek/navigator/icons/win-minimize-hover.gif
new file mode 100644 (file)
index 0000000..2950037
Binary files /dev/null and b/LCARStrek/navigator/icons/win-minimize-hover.gif differ

diff --git a/LCARStrek/navigator/icons/win-minimize.gif b/LCARStrek/navigator/icons/win-minimize.gif
index 295003780aa98c4b114dc60507dc468e9559ba63..30fa00e26f3abcfdd7bfcba8d8a0efdc560a22aa 100644 (file)
Binary files a/LCARStrek/navigator/icons/win-minimize.gif and b/LCARStrek/navigator/icons/win-minimize.gif differ

diff --git a/LCARStrek/navigator/icons/win-restore-hover.gif b/LCARStrek/navigator/icons/win-restore-hover.gif
new file mode 100644 (file)
index 0000000..cdc66e1
Binary files /dev/null and b/LCARStrek/navigator/icons/win-restore-hover.gif differ

diff --git a/LCARStrek/navigator/icons/win-restore.gif b/LCARStrek/navigator/icons/win-restore.gif
index cdc66e11245a95108d723932403401bceebf078c..c65b67ddce8f88acf50f108974f6a4a6dae57e77 100644 (file)
Binary files a/LCARStrek/navigator/icons/win-restore.gif and b/LCARStrek/navigator/icons/win-restore.gif differ

diff --git a/LCARStrek/navigator/navigator.css b/LCARStrek/navigator/navigator.css
index edd6991d0d39a075e367beae992f16cb42dd2ce5..e5e8067ad5687a78507d645d7f974eb3d445b1e9 100644 (file)
--- a/LCARStrek/navigator/navigator.css
+++ b/LCARStrek/navigator/navigator.css
@@ -136,49 +136,75 @@
 
 /* ::::: small primary toolbar buttons ::::: */
 
 
 /* ::::: small primary toolbar buttons ::::: */
 

-.toolbarbutton-1[toolbarmode="small"] {
-  min-width: 0;
+.toolbarbutton-1[toolbarmode="small"],
+.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-button {
+  min-width: 0px;
+  min-height: 0px;

 }
 
 }
 

-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-button > .toolbarbutton-text,
-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-text {
-  display: none;
+.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker {
+  padding: 0px 1px 13px 1px;
+}
+
+.toolbarbutton-1[toolbarmode="small"][type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[toolbarmode="small"][type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[toolbarmode="small"][type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  padding: 1px 0px 12px 2px;
+}
+
+.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  padding: 0px 1px 13px 1px !important;

 }
 
 }
 

-#search-button[toolbarmode="small"] > .button-box > .button-text {
+.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-button > .toolbarbutton-text,
+.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-text {

   display: none;
 }
 
 #nav-bar[toolbarmode="small"] > #nav-bar-inner {
   display: none;
 }
 
 #nav-bar[toolbarmode="small"] > #nav-bar-inner {

-  margin: 0;
-  border: none;
+  margin: 2px 0px 2px 6px;

 }
 
 }
 

-#nav-bar[toolbarmode="small"] > .toolbar-primary-grippy {
-  display: none;
+toolbar[toolbarmode="small"] > toolbargrippy {
+/*  display: none; */

 }
 
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
   -moz-box-align: center;
 }
 
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
   -moz-box-align: center;

-  padding: 0 2px 0 4px;
-  border-left: 2px solid;
-  -moz-border-left-colors: ThreeDHighlight ThreeDShadow;
+  padding: 0 3px 0 1px;
+  border-left: 3px solid #000000;
+}
+
+#window-controls > toolbarbutton {
+  padding: 2px 0px 2px 2px;

 }
 
 #minimize-button {
   list-style-image: url("chrome://navigator/skin/icons/win-minimize.gif");
 }
 
 }
 
 #minimize-button {
   list-style-image: url("chrome://navigator/skin/icons/win-minimize.gif");
 }
 

+#minimize-button:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-minimize-hover.gif");
+}
+

 #restore-button {
   list-style-image: url("chrome://navigator/skin/icons/win-restore.gif");
 }
 
 #restore-button {
   list-style-image: url("chrome://navigator/skin/icons/win-restore.gif");
 }
 

+#restore-button:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-restore-hover.gif");
+}
+

 #close-button {
   list-style-image: url("chrome://navigator/skin/icons/win-close.gif");
 }
 
 #close-button {
   list-style-image: url("chrome://navigator/skin/icons/win-close.gif");
 }
 

+#close-button:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
+}
+

 /* ::::: nav-bar-inner ::::: */
 
 #nav-bar-inner {
 /* ::::: nav-bar-inner ::::: */
 
 #nav-bar-inner {