sync both themes with suite classic changes in SeaMonkey 2.9 cycle

diff --git a/EarlyBlue/editor/EdImageMap.css b/EarlyBlue/editor/EdImageMap.css
deleted file mode 100644 (file)
index 9516a6c..0000000
--- a/EarlyBlue/editor/EdImageMap.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Haddix
- *   Brian King
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-toolbar#toolbox {
-  margin: 0px;
-  padding: 4px 0px 0px;
-}
-
-toolbar#toolbox button.tool:active {
-  margin-top: 2px;
-  margin-bottom: 0px;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 0px;
-}
-
-toolbar#toolbox button.tool[toggled="1"] {
-  margin-top: 2px;
-  margin-bottom: 0px;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 0px;
-  border: 1px white inset;
-}
-
-toolbar#toolbox button.tool {
-  border: 1px solid transparent;
-  margin: 1px;
-  padding: 2px;
-  text-decoration: none;
-  color: inherit;
-}
-
-toolbar.toolbox > toolbargrippy {
-  visibility: collapse;
-}
-
-#pointerButton {
-  list-style-image: url("chrome://editor/skin/icons/Map_pointerTool.gif");
-}
-
-#rectButton {
-  list-style-image: url("chrome://editor/skin/icons/Map_rectangleTool.gif");
-}
-
-#cirButton {
-  list-style-image: url("chrome://editor/skin/icons/Map_circleTool.gif");
-}
-
-#polyButton {
-  list-style-image: url("chrome://editor/skin/icons/Map_polygonTool.gif");
-}
-
-#cutButton {
-  list-style-image: url("chrome://editor/skin/icons/Map_Cut.gif");
-}
-
-#copyButton {
-  list-style-image: url("chrome://editor/skin/icons/Map_Copy.gif");
-}
-
-#pasteButton {
-  list-style-image: url("chrome://editor/skin/icons/Map_Paste.gif");
-}
-
-#zoomInButton {
-  list-style-image: url("chrome://editor/skin/icons/Map_zoomIn.gif");
-}
-
-#zoomOutButton {
-  list-style-image: url("chrome://editor/skin/icons/Map_zoomOut.gif");
-}
-
-#contrastButton {
-  list-style-image: url("chrome://editor/skin/icons/Map_contrast.gif");
-}

diff --git a/EarlyBlue/editor/EdImageMapPage.css b/EarlyBlue/editor/EdImageMapPage.css
deleted file mode 100644 (file)
index 983cfa7..0000000
--- a/EarlyBlue/editor/EdImageMapPage.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Haddix
- *   Brian King
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-.rect {position:absolute; top:1px; left:1px; height:1px; width:1px; border: 1px solid #0000ff;}
-.cir {position:absolute; top:1px; left:1px; height:1px; width:1px; border: 1px solid #00ff00; border-radius: 50%;}
-.poly {position:absolute; top:0px; left:0px; height:100%; width:100%;}
-.point {position:absolute; top:1px; left:1px; height:3px; width:3px; background-color:#ff0000;}
-.pointStart {position:absolute; top:1px; left:1px; height:3px; width:3px; background-color:#8000ff;}
-.handletl {position:absolute; top:-5px; left:-5px; height:5px; width:5px; background-color:#ff00ff;}
-.handletr {position:absolute; top:-5px; left:100%; height:5px; width:5px; background-color:#ff00ff;}
-.handlebl {position:absolute; top:100%; left:-5px; height:5px; width:5px; background-color:#ff00ff;}
-.handlebr {position:absolute; top:100%; left:100%; height:5px; width:5px; background-color:#ff00ff;}
-.handlel {position:absolute; top:48%; left:-5px; height:5px; width:5px; background-color:#ff00ff;}
-.handler {position:absolute; top:48%; left:100%; height:5px; width:5px; background-color:#ff00ff;}
-.handlet {position:absolute; top:-5px; left:48%; height:5px; width:5px; background-color:#ff00ff;}
-.handleb {position:absolute; top:100%; left:48%; height:5px; width:5px; background-color:#ff00ff;}
-#marquee {position:absolute; top:1px; left:-5px; height:-5px; width:1px; border: 1 dashed #0000ff; z-index:10000; visibility: hidden;}
-#bgDiv {position:absolute; top:0px; left:0px; width:1; background:url("chrome://editor/skin/icons/Map_checker.gif"); background-color: white; cursor: inherit;}
-BODY {background-color:appworkspace;}
-HTML {height: 100%;}

diff --git a/EarlyBlue/messenger/mailWindow1.css b/EarlyBlue/messenger/mailWindow1.css
index 57dff02d327408cba929e343da957fc4c686c003..aa98253172f6766d15a91b964fd78e4ac4ea85ed 100644 (file)
--- a/EarlyBlue/messenger/mailWindow1.css
+++ b/EarlyBlue/messenger/mailWindow1.css
@@ -121,3 +121,8 @@ tabpanels {
 .tabmail-tab:-moz-lwtheme {
   text-shadow: none;
 }
+
+#tabbar-toolbar {
+  border-bottom-style: none;
+  min-height: 0;
+}

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 037951269d00844e4a25a6734e7723a19d2fb88c..736697b195d6540f4129d05850b933328fc9fe2b 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -1850,7 +1850,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
 
-@media all and (-moz-touch-enabled) {
+@media (-moz-touch-enabled) {
   .tabbrowser-arrowscrollbox > .scrollbutton-up,
   .tabbrowser-arrowscrollbox > .scrollbutton-down,
   #TabsToolbar .toolbarbutton-1 {

diff --git a/LCARStrek/editor/EdImageMap.css b/LCARStrek/editor/EdImageMap.css
deleted file mode 100644 (file)
index 61548f6..0000000
--- a/LCARStrek/editor/EdImageMap.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dan Haddix
- *   Brian King
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-toolbar#toolbox {
-  margin: 0px;
-  padding: 4px 0px 0px;
-}
-
-toolbar#toolbox button.tool:active {
-  margin-top: 2px;
-  margin-bottom: 0px;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 0px;
-}
-
-toolbar#toolbox button.tool[toggled="1"] {
-  margin-top: 2px;
-  margin-bottom: 0px;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 0px;
-  border: 1px white inset;
-}
-
-toolbar#toolbox button.tool {
-  border: 1px solid transparent;
-  margin: 1px;
-  padding: 2px;
-  text-decoration: none;
-  color: inherit;
-}
-
-toolbar.toolbox > toolbargrippy {
-  visibility: collapse;
-}
-
-#pointerButton {
-  list-style-image:url("chrome://editor/skin/icons/Map_pointerTool.gif");
-}
-
-#rectButton {
-  list-style-image:url("chrome://editor/skin/icons/Map_rectangleTool.gif");
-}
-
-#cirButton {
-  list-style-image:url("chrome://editor/skin/icons/Map_circleTool.gif");
-}
-
-#polyButton {
-  list-style-image:url("chrome://editor/skin/icons/Map_polygonTool.gif");
-}
-
-#cutButton {
-  list-style-image:url("chrome://editor/skin/icons/Map_Cut.gif");
-}
-
-#copyButton {
-  list-style-image:url("chrome://editor/skin/icons/Map_Copy.gif");
-}
-
-#pasteButton {
-  list-style-image:url("chrome://editor/skin/icons/Map_Paste.gif");
-}
-
-#zoomInButton {
-  list-style-image:url("chrome://editor/skin/icons/Map_zoomIn.gif");
-}
-
-#zoomOutButton {
-  list-style-image:url("chrome://editor/skin/icons/Map_zoomOut.gif");
-}
-
-#contrastButton {
-  list-style-image:url("chrome://editor/skin/icons/Map_contrast.gif");
-}

diff --git a/LCARStrek/editor/EdImageMapPage.css b/LCARStrek/editor/EdImageMapPage.css
deleted file mode 100644 (file)
index b4fc443..0000000
--- a/LCARStrek/editor/EdImageMapPage.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-.rect {position:absolute; top:1px; left:1px; height:1px; width:1px; border: 1px solid #0000ff;}
-.cir {position:absolute; top:1px; left:1px; height:1px; width:1px; border: 1px solid #00ff00; border-radius: 50%;}
-.poly {position:absolute; top:0px; left:0px; height:100%; width:100%;}
-.point {position:absolute; top:1px; left:1px; height:3px; width:3px; background-color:#ff0000;}
-.pointStart {position:absolute; top:1px; left:1px; height:3px; width:3px; background-color:#8000ff;}
-.handletl {position:absolute; top:-5px; left:-5px; height:5px; width:5px; background-color:#ff00ff;}
-.handletr {position:absolute; top:-5px; left:100%; height:5px; width:5px; background-color:#ff00ff;}
-.handlebl {position:absolute; top:100%; left:-5px; height:5px; width:5px; background-color:#ff00ff;}
-.handlebr {position:absolute; top:100%; left:100%; height:5px; width:5px; background-color:#ff00ff;}
-.handlel {position:absolute; top:48%; left:-5px; height:5px; width:5px; background-color:#ff00ff;}
-.handler {position:absolute; top:48%; left:100%; height:5px; width:5px; background-color:#ff00ff;}
-.handlet {position:absolute; top:-5px; left:48%; height:5px; width:5px; background-color:#ff00ff;}
-.handleb {position:absolute; top:100%; left:48%; height:5px; width:5px; background-color:#ff00ff;}
-#marquee {position:absolute; top:1px; left:-5px; height:-5px; width:1px; border: 1 dashed #0000ff; z-index:10000; visibility: hidden;}
-#bgDiv {position:absolute; top:0px; left:0px; width:1; background:url("chrome://editor/skin/icons/Map_checker.gif"); background-color: white; cursor: inherit;}
-BODY {background-color:appworkspace;}
-HTML {height: 100%;}

diff --git a/LCARStrek/messenger/mailWindow1.css b/LCARStrek/messenger/mailWindow1.css
index e1ed62c9d69d36958122b2a4acf9c7053099489f..420ed4e40c38d50257f5dc5c2022e52e9b127d43 100644 (file)
--- a/LCARStrek/messenger/mailWindow1.css
+++ b/LCARStrek/messenger/mailWindow1.css
@@ -129,3 +129,10 @@ tabpanels {
 .tabmail-tab:-moz-lwtheme {
   text-shadow: none;
 }
+
+#tabbar-toolbar {
+  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
+  border-top-style: none;
+  border-bottom-style: none;
+  min-height: 0;
+}