merge after backout

This commit is contained in:
Dão Gottwald 2008-11-20 11:06:42 +01:00
commit c969ae3b29
8 changed files with 39 additions and 33 deletions

View File

@ -47,8 +47,11 @@
<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>

View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
<overlay id="editMenuOverlay"

View File

@ -82,6 +82,19 @@ toolbarspacer {
width: 15px;
}
toolbar[mode="icons"] .toolbarbutton-text {
display: none;
}
toolbar[mode="text"] .toolbarbutton-icon {
display: none;
}
toolbar[mode="text"] .toolbarbutton-text {
padding: 0 !important;
margin: 3px 5px !important;
}
/* ::::: toolbarpaletteitem ::::: */
toolbarpaletteitem {

View File

@ -162,16 +162,3 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
list-style-image: none;
-moz-image-region: auto;
}
toolbar[mode="icons"] .toolbarbutton-text {
display: none;
}
toolbar[mode="text"] .toolbarbutton-icon {
display: none;
}
toolbar[mode="text"] .toolbarbutton-text {
padding: 0 !important;
margin: 3px 5px !important;
}

View File

@ -69,6 +69,14 @@ menubar {
min-width: 1px;
}
toolbar[mode="icons"] .toolbarbutton-text {
display: none;
}
toolbar[mode="text"] .toolbarbutton-icon {
display: none;
}
/* ::::: toolbarseparator ::::: */
toolbarseparator {

View File

@ -155,10 +155,3 @@ toolbarbutton.tabbable {
-moz-user-focus: normal !important;
}
toolbar[mode="icons"] .toolbarbutton-text {
display: none;
}
toolbar[mode="text"] .toolbarbutton-icon {
display: none;
}

View File

@ -70,6 +70,19 @@ toolbar:first-child, menubar {
border-top: 0px !important;
}
toolbar[mode="icons"] .toolbarbutton-text {
display: none;
}
toolbar[mode="text"] .toolbarbutton-icon {
display: none;
}
toolbar[mode="text"] .toolbarbutton-text {
padding: 0 !important;
margin: 3px 5px !important;
}
/* ::::: toolbar decorations ::::: */
toolbarseparator {

View File

@ -173,16 +173,3 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
.toolbarbutton-menubutton-dropmarker[disabled="true"] {
padding: 3px !important;
}
toolbar[mode="icons"] .toolbarbutton-text {
display: none;
}
toolbar[mode="text"] .toolbarbutton-icon {
display: none;
}
toolbar[mode="text"] .toolbarbutton-text {
padding: 0 !important;
margin: 3px 5px !important;
}