Date: Fri, 28 Feb 2014 02:02:29 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1518 - in trunk/www: firefox-esr/files firefox/files Message-ID: <201402280202.s1S22TC3045752@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Feb 28 02:02:29 2014
New Revision: 1518
Log:
replace devtools theme fix with the landed version
Modified:
trunk/www/firefox-esr/files/patch-bug948946
trunk/www/firefox/files/patch-bug948946
Modified: trunk/www/firefox-esr/files/patch-bug948946
==============================================================================
--- trunk/www/firefox-esr/files/patch-bug948946 Thu Feb 27 04:41:01 2014 (r1517)
+++ trunk/www/firefox-esr/files/patch-bug948946 Fri Feb 28 02:02:29 2014 (r1518)
@@ -1,12 +1,26 @@
-diff --git browser/themes/moz.build browser/themes/moz.build
-index d82bda3..86d343d 100644
---- browser/themes/moz.build
-+++ browser/themes/moz.build
-@@ -9,6 +9,7 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
- if toolkit == 'cocoa':
- DIRS += ['osx']
- elif toolkit in ('gtk2', 'gtk3', 'qt'):
-+ DEFINES += ['-DXP_LINUX']
- DIRS += ['linux']
- else:
- DIRS += ['windows']
+diff --git browser/themes/shared/devtools/common.inc.css browser/themes/shared/devtools/common.inc.css
+index 268164e..922f21a 100644
+--- browser/themes/shared/devtools/common.inc.css
++++ browser/themes/shared/devtools/common.inc.css
+@@ -14,7 +14,7 @@
+ background-color: transparent;
+ background-image: linear-gradient(to bottom, hsla(209,18%,18%,0.9), hsl(210,11%,16%));
+ border-radius: 3px;
+-%ifdef XP_LINUX
++%if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
+ max-height: 32rem;
+ %else
+ max-height: 40rem;
+diff --git browser/themes/shared/devtools/highlighter.inc.css browser/themes/shared/devtools/highlighter.inc.css
+index 3d5ae51..3fb4b01 100644
+--- browser/themes/shared/devtools/highlighter.inc.css
++++ browser/themes/shared/devtools/highlighter.inc.css
+@@ -54,7 +54,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
+ padding: 0;
+ width: 26px;
+ min-height: 26px;
+-%ifndef XP_LINUX
++%if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
+ background-color: transparent;
+ %endif
+ }
Modified: trunk/www/firefox/files/patch-bug948946
==============================================================================
--- trunk/www/firefox/files/patch-bug948946 Thu Feb 27 04:41:01 2014 (r1517)
+++ trunk/www/firefox/files/patch-bug948946 Fri Feb 28 02:02:29 2014 (r1518)
@@ -1,12 +1,45 @@
-diff --git browser/themes/moz.build browser/themes/moz.build
-index d82bda3..86d343d 100644
---- browser/themes/moz.build
-+++ browser/themes/moz.build
-@@ -9,6 +9,7 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
- if toolkit == 'cocoa':
- DIRS += ['osx']
- elif toolkit in ('gtk2', 'gtk3', 'qt'):
-+ DEFINES['XP_LINUX'] = 1
- DIRS += ['linux']
- else:
- DIRS += ['windows']
+diff --git browser/themes/shared/devtools/common.css browser/themes/shared/devtools/common.css
+index a8208dc..df70486 100644
+--- browser/themes/shared/devtools/common.css
++++ browser/themes/shared/devtools/common.css
+@@ -11,13 +11,13 @@
+ .devtools-monospace {
+ %ifdef XP_MACOSX
+ font-family: Menlo, monospace;
+-%endif
+-%ifdef XP_LINUX
++%elifdef XP_WIN
++ font-family: Consolas, monospace;
++%else
+ font-family: monospace;
+- font-size: 80%;
+ %endif
+-%ifdef XP_WIN
+- font-family: Consolas, monospace;
++%if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
++ font-size: 80%;
+ %endif
+ }
+
+@@ -62,7 +62,7 @@
+ background-image: linear-gradient(to bottom, hsla(209,18%,18%,0.9), hsl(210,11%,16%));
+ border-radius: 3px;
+ overflow-x: hidden;
+-%ifdef XP_LINUX
++%if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
+ max-height: 32rem;
+ %else
+ max-height: 40rem;
+diff --git browser/themes/shared/devtools/highlighter.inc.css browser/themes/shared/devtools/highlighter.inc.css
+index 5b881b5..050f78b 100644
+--- browser/themes/shared/devtools/highlighter.inc.css
++++ browser/themes/shared/devtools/highlighter.inc.css
+@@ -54,7 +54,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes {
+ padding: 0;
+ width: 26px;
+ min-height: 26px;
+-%ifndef XP_LINUX
++%if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
+ background-color: transparent;
+ %endif
+ }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402280202.s1S22TC3045752>