Bug 1331208 - Part 2. Re-add padded removed in Bug 464450 and the dropmarker removed in Bug 1407613. r=stefanh
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sun, 14 Jan 2018 01:51:33 +0100
changeset 30801 29104fe7818dde8fbcf74933c62c069de80aefe2
parent 30800 89ff7aac58750003d4e66d2f2a2c8c940238e635
child 30802 1cd7416310516ff11b04225dbf0d5f07103b7697
push id382
push userclokep@gmail.com
push dateMon, 12 Mar 2018 19:05:34 +0000
reviewersstefanh
bugs1331208, 464450, 1407613
Bug 1331208 - Part 2. Re-add padded removed in Bug 464450 and the dropmarker removed in Bug 1407613. r=stefanh Duplicate and change communicator.css for Linux.
suite/themes/classic/communicator/communicator.css
suite/themes/classic/jar.mn
suite/themes/classic/linux/communicator/communicator.css
--- a/suite/themes/classic/communicator/communicator.css
+++ b/suite/themes/classic/communicator/communicator.css
@@ -15,16 +15,22 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: toolbar-primary ::::: */
 
 .toolbar-primary {
   -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary");
 }
 
+/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
+textbox:not(.padded) {
+  cursor: default;
+  padding: 0;
+}
+
 /* ::::: autocomplete ::::: */
 
 .autocomplete-history-popup {
   max-height: 25em;
 }
 
 textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) {
   width: 16px;
@@ -89,23 +95,16 @@ description.error {
 
 /* ::::: iconic menus and menuitems ::::: */
 
 menu.menu-iconic > .menu-iconic-left,
 menuitem.menuitem-iconic > .menu-iconic-left {
   display: -moz-box;
 }
 
-%ifdef MOZ_WIDGET_GTK
-/* Fix to show the menulist-dropmarker under newer GTK3 versions */
-menulist[editable="true"] > .menulist-dropmarker {
-  min-width: 2em;
-}
-%endif
-
 /* ::::: toolbar print button ::::: */
 #print-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
   -moz-image-region: rect(0 29px 29px 0);
 }
 
 #print-button:hover {
   -moz-image-region: rect(0 59px 29px 30px);
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -58,21 +58,22 @@ classic.jar:
   skin/classic/communicator/icons/loading.png                           (mac/communicator/icons/loading.png)
   skin/classic/communicator/icons/warning-24.png                        (mac/communicator/icons/warning-24.png)
   skin/classic/communicator/toolbar/toolbar-gradient22.png              (mac/communicator/toolbar/toolbar-gradient22.png)
   skin/classic/communicator/toolbar/toolbar-gradient34.png              (mac/communicator/toolbar/toolbar-gradient34.png)
 #else
   skin/classic/communicator/aboutPrivateBrowsing.css                    (communicator/aboutPrivateBrowsing.css)
   skin/classic/communicator/aboutSessionRestore.css                     (communicator/aboutSessionRestore.css)
   skin/classic/communicator/button.css                                  (communicator/button.css)
-* skin/classic/communicator/communicator.css                            (communicator/communicator.css)
   skin/classic/communicator/config.css                                  (communicator/config.css)
 #ifdef MOZ_WIDGET_GTK
+  skin/classic/communicator/communicator.css                            (linux/communicator/communicator.css)
   skin/classic/communicator/preferences.css                             (linux/communicator/preferences.css)
 #else
+  skin/classic/communicator/communicator.css                            (communicator/communicator.css)
   skin/classic/communicator/preferences.css                             (communicator/preferences.css)
 #endif
   skin/classic/communicator/toolbar.css                                 (communicator/toolbar.css)
   skin/classic/communicator/viewSourceOverlay.css                       (communicator/viewSourceOverlay.css)
   skin/classic/communicator/bookmarks/bookmark-folder-closed.png        (communicator/bookmarks/bookmark-folder-closed.png)
   skin/classic/communicator/bookmarks/bookmark-folder-dis.png           (communicator/bookmarks/bookmark-folder-dis.png)
   skin/classic/communicator/bookmarks/bookmark-folder-open.png          (communicator/bookmarks/bookmark-folder-open.png)
   skin/classic/communicator/bookmarks/bookmarks.css                     (communicator/bookmarks/bookmarks.css)
copy from suite/themes/classic/communicator/communicator.css
copy to suite/themes/classic/linux/communicator/communicator.css
--- a/suite/themes/classic/communicator/communicator.css
+++ b/suite/themes/classic/linux/communicator/communicator.css
@@ -15,16 +15,31 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: toolbar-primary ::::: */
 
 .toolbar-primary {
   -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary");
 }
 
+/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */
+textbox:not(.padded) {
+  cursor: default;
+  padding: 0;
+}
+
+textbox[enablehistory="true"] {
+  -moz-appearance: none;
+  border: 0;
+  background-color: transparent;
+}
+
+textbox[enablehistory="true"] > .autocomplete-textbox-container {
+  -moz-appearance: menulist-textfield;
+}
 /* ::::: autocomplete ::::: */
 
 .autocomplete-history-popup {
   max-height: 25em;
 }
 
 textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) {
   width: 16px;
@@ -89,22 +104,20 @@ description.error {
 
 /* ::::: iconic menus and menuitems ::::: */
 
 menu.menu-iconic > .menu-iconic-left,
 menuitem.menuitem-iconic > .menu-iconic-left {
   display: -moz-box;
 }
 
-%ifdef MOZ_WIDGET_GTK
 /* Fix to show the menulist-dropmarker under newer GTK3 versions */
 menulist[editable="true"] > .menulist-dropmarker {
   min-width: 2em;
 }
-%endif
 
 /* ::::: toolbar print button ::::: */
 #print-button {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
   -moz-image-region: rect(0 29px 29px 0);
 }
 
 #print-button:hover {
@@ -212,23 +225,16 @@ treecols:-moz-lwtheme {
 .messageImage[value="MixedContentMessage"],
 .messageImage[value="MixedActiveContentMessage"],
 .messageImage[value="MixedDisplayContentMessage"] {
   list-style-image: url("chrome://communicator/skin/icons/lock-broken-16.png");
 }
 
 /* ::::: tree rows ::::: */
 
-@media (-moz-windows-default-theme) {
-  treechildren:not(.autocomplete-treebody)::-moz-tree-row {
-    height: 1.3em !important;
-    border-width: 1px !important;
-  }
-}
-
 /* ::::: statusbar ::::: */
 
 statusbar {
   -moz-appearance: statusbar;
   border-top: 1px solid ThreeDLightShadow;
   border-left: 1px solid ThreeDShadow;
   border-right: 1px solid ThreeDHighlight;
   border-bottom: 1px solid ThreeDHighlight;