From 8ccf48d2f8794ad40ade8ef0186a8284dcd4837e Mon Sep 17 00:00:00 2001 From: Cedric Vivier Date: Wed, 25 Jan 2012 07:59:00 +0100 Subject: [PATCH 1/5] Bug 719021 - Saving an empty new style sheet does not display the file name upon saving. r=paul --- browser/devtools/styleeditor/StyleEditor.jsm | 6 ++++-- .../styleeditor/test/browser_styleeditor_new.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) --- browser/devtools/styleeditor/StyleEditor.jsm | 6 ++++-- .../styleeditor/test/browser_styleeditor_new.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) --- browser/devtools/styleeditor/StyleEditor.jsm | 6 ++++-- .../devtools/styleeditor/test/browser_styleeditor_new.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/browser/devtools/styleeditor/StyleEditor.jsm b/browser/devtools/styleeditor/StyleEditor.jsm index 06cf249ae9d3..46851bf9d85e 100644 --- a/browser/devtools/styleeditor/StyleEditor.jsm +++ b/browser/devtools/styleeditor/StyleEditor.jsm @@ -358,7 +358,6 @@ StyleEditor.prototype = { load: function SE_load() { if (!this._styleSheet) { - this._flags.push(StyleEditorFlags.NEW); this._appendNewStyleSheet(); } this._loadSource(); @@ -868,9 +867,12 @@ StyleEditor.prototype = { parent.appendChild(style); this._styleSheet = document.styleSheets[document.styleSheets.length - 1]; - this._flags.push(aText ? StyleEditorFlags.IMPORTED : StyleEditorFlags.NEW); if (aText) { this._onSourceLoad(aText); + this._flags.push(StyleEditorFlags.IMPORTED); + } else { + this._flags.push(StyleEditorFlags.NEW); + this._flags.push(StyleEditorFlags.UNSAVED); } }, diff --git a/browser/devtools/styleeditor/test/browser_styleeditor_new.js b/browser/devtools/styleeditor/test/browser_styleeditor_new.js index fea602970b6d..c9b468be8041 100644 --- a/browser/devtools/styleeditor/test/browser_styleeditor_new.js +++ b/browser/devtools/styleeditor/test/browser_styleeditor_new.js @@ -61,8 +61,8 @@ function testEditorAdded(aChrome, aEditor) "new editor is loaded when attached"); ok(aEditor.hasFlag("new"), "new editor has NEW flag"); - ok(!aEditor.hasFlag("unsaved"), - "new editor does not have UNSAVED flag"); + ok(aEditor.hasFlag("unsaved"), + "new editor has UNSAVED flag"); ok(aEditor.inputElement, "new editor has an input element attached"); From 0173ef8690655c0e0426db4012de1f5751ed993f Mon Sep 17 00:00:00 2001 From: Cedric Vivier Date: Thu, 26 Jan 2012 05:13:00 +0100 Subject: [PATCH 2/5] Bug 721350 - Style Editor auto-scroll to the selected style sheet is annoying. r=paul --- browser/devtools/shared/SplitView.jsm | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) --- browser/devtools/shared/SplitView.jsm | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) --- browser/devtools/shared/SplitView.jsm | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/devtools/shared/SplitView.jsm b/browser/devtools/shared/SplitView.jsm index 0aea4c7b1693..b648a3abe553 100644 --- a/browser/devtools/shared/SplitView.jsm +++ b/browser/devtools/shared/SplitView.jsm @@ -171,7 +171,6 @@ SplitView.prototype = { if (binding.onShow) { binding.onShow(aSummary, binding._details, binding.data); } - aSummary.scrollIntoView(); }, /** From a56db13aa975bd681c2f7f2b079c46857be391e4 Mon Sep 17 00:00:00 2001 From: Cedric Vivier Date: Thu, 26 Jan 2012 04:58:00 +0100 Subject: [PATCH 3/5] Bug 721353 - Fix invisible outline regression introduced by bug 719022. r=paul --- browser/devtools/styleeditor/styleeditor.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/browser/devtools/styleeditor/styleeditor.css b/browser/devtools/styleeditor/styleeditor.css index b255ba7e9fff..4361fd1ecc86 100644 --- a/browser/devtools/styleeditor/styleeditor.css +++ b/browser/devtools/styleeditor/styleeditor.css @@ -64,11 +64,8 @@ li.error > .stylesheet-info > .stylesheet-more > .stylesheet-error-message { -moz-box-flex: 1; } -.stylesheet-name { - outline: none; -} - .stylesheet-name > label { + display: inline; cursor: pointer; } From 7ee8891a27b190dd81f4bef78b11bee55eb28729 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Wed, 25 Jan 2012 16:09:11 +0100 Subject: [PATCH 4/5] Bug 720975 - Switch to vertical layout only when the window width < 550px. r=msucan --- browser/devtools/shared/SplitView.jsm | 2 +- browser/devtools/shared/splitview.css | 4 ++-- browser/devtools/styleeditor/styleeditor.css | 2 +- browser/themes/gnomestripe/devtools/splitview.css | 13 ------------- browser/themes/gnomestripe/devtools/styleeditor.css | 2 +- browser/themes/pinstripe/devtools/splitview.css | 13 ------------- browser/themes/pinstripe/devtools/styleeditor.css | 2 +- browser/themes/winstripe/devtools/splitview.css | 13 ------------- browser/themes/winstripe/devtools/styleeditor.css | 2 +- 9 files changed, 7 insertions(+), 46 deletions(-) diff --git a/browser/devtools/shared/SplitView.jsm b/browser/devtools/shared/SplitView.jsm index b648a3abe553..ce1d94354004 100644 --- a/browser/devtools/shared/SplitView.jsm +++ b/browser/devtools/shared/SplitView.jsm @@ -41,7 +41,7 @@ const EXPORTED_SYMBOLS = ["SplitView"]; /* this must be kept in sync with CSS (ie. splitview.css) */ -const LANDSCAPE_MEDIA_QUERY = "(min-aspect-ratio: 5/3)"; +const LANDSCAPE_MEDIA_QUERY = "(min-width: 551px)"; const BINDING_USERDATA = "splitview-binding"; diff --git a/browser/devtools/shared/splitview.css b/browser/devtools/shared/splitview.css index 4a6822d3a520..496197f534ca 100644 --- a/browser/devtools/shared/splitview.css +++ b/browser/devtools/shared/splitview.css @@ -80,7 +80,7 @@ box, } /* this is to keep in sync with SplitView.jsm's LANDSCAPE_MEDIA_QUERY */ -@media (min-aspect-ratio: 5/3) { +@media (min-width: 551px) { .splitview-root { -moz-box-orient: horizontal; } @@ -116,7 +116,7 @@ ol.splitview-nav > li.splitview-filtered { } /* portrait mode */ -@media (max-aspect-ratio: 5/3) { +@media (max-width: 550px) { #splitview-details-toolbar { display: none; } diff --git a/browser/devtools/styleeditor/styleeditor.css b/browser/devtools/styleeditor/styleeditor.css index 4361fd1ecc86..dd55e52ae721 100644 --- a/browser/devtools/styleeditor/styleeditor.css +++ b/browser/devtools/styleeditor/styleeditor.css @@ -92,7 +92,7 @@ li:hover > hgroup > .stylesheet-more > h3 > .stylesheet-saveButton { } /* portrait mode */ -@media (max-aspect-ratio: 5/3) { +@media (max-width: 550px) { li.splitview-active > hgroup > .stylesheet-more > .stylesheet-rule-count, li:hover > hgroup > .stylesheet-more > .stylesheet-rule-count { display: none; diff --git a/browser/themes/gnomestripe/devtools/splitview.css b/browser/themes/gnomestripe/devtools/splitview.css index 5c082b3c9471..a65cdf533b01 100644 --- a/browser/themes/gnomestripe/devtools/splitview.css +++ b/browser/themes/gnomestripe/devtools/splitview.css @@ -160,16 +160,3 @@ border-top: 1px solid hsla(210,8%,5%,.5); border-bottom: 1px solid hsla(210,8%,5%,.5); } - -/* limited width mode (hide search unless it has focus [search-on-type]) */ -@media (max-width: 250px) { - .splitview-filter { - max-width: none; - position: fixed; - margin: 0; - bottom: -4em; - } - .splitview-filter[focused="true"] { - bottom: 0; - } -} diff --git a/browser/themes/gnomestripe/devtools/styleeditor.css b/browser/themes/gnomestripe/devtools/styleeditor.css index 8ab81bab4858..085a05617c08 100644 --- a/browser/themes/gnomestripe/devtools/styleeditor.css +++ b/browser/themes/gnomestripe/devtools/styleeditor.css @@ -135,7 +135,7 @@ h3 { } /* portrait mode */ -@media (max-aspect-ratio: 5/3) { +@media (max-width: 550px) { .splitview-nav { box-shadow: none; } diff --git a/browser/themes/pinstripe/devtools/splitview.css b/browser/themes/pinstripe/devtools/splitview.css index 5c082b3c9471..a65cdf533b01 100644 --- a/browser/themes/pinstripe/devtools/splitview.css +++ b/browser/themes/pinstripe/devtools/splitview.css @@ -160,16 +160,3 @@ border-top: 1px solid hsla(210,8%,5%,.5); border-bottom: 1px solid hsla(210,8%,5%,.5); } - -/* limited width mode (hide search unless it has focus [search-on-type]) */ -@media (max-width: 250px) { - .splitview-filter { - max-width: none; - position: fixed; - margin: 0; - bottom: -4em; - } - .splitview-filter[focused="true"] { - bottom: 0; - } -} diff --git a/browser/themes/pinstripe/devtools/styleeditor.css b/browser/themes/pinstripe/devtools/styleeditor.css index 8ab81bab4858..085a05617c08 100644 --- a/browser/themes/pinstripe/devtools/styleeditor.css +++ b/browser/themes/pinstripe/devtools/styleeditor.css @@ -135,7 +135,7 @@ h3 { } /* portrait mode */ -@media (max-aspect-ratio: 5/3) { +@media (max-width: 550px) { .splitview-nav { box-shadow: none; } diff --git a/browser/themes/winstripe/devtools/splitview.css b/browser/themes/winstripe/devtools/splitview.css index 054701dde56b..da249e04b196 100644 --- a/browser/themes/winstripe/devtools/splitview.css +++ b/browser/themes/winstripe/devtools/splitview.css @@ -160,16 +160,3 @@ border-top: 1px solid hsla(210,8%,5%,.5); border-bottom: 1px solid hsla(210,8%,5%,.5); } - -/* limited width mode (hide search unless it has focus [search-on-type]) */ -@media (max-width: 250px) { - .splitview-filter { - max-width: none; - position: fixed; - margin: 0; - bottom: -4em; - } - .splitview-filter[focused="true"] { - bottom: 0; - } -} diff --git a/browser/themes/winstripe/devtools/styleeditor.css b/browser/themes/winstripe/devtools/styleeditor.css index 34446cfff27d..7ab8d742d335 100644 --- a/browser/themes/winstripe/devtools/styleeditor.css +++ b/browser/themes/winstripe/devtools/styleeditor.css @@ -135,7 +135,7 @@ h3 { } /* portrait mode */ -@media (max-aspect-ratio: 5/3) { +@media (max-width: 550px) { .splitview-nav { box-shadow: none; } From 08310ce2698c12d0cb8746a27752e72ce038e1c9 Mon Sep 17 00:00:00 2001 From: Jared Wein Date: Thu, 26 Jan 2012 17:41:35 -0800 Subject: [PATCH 5/5] Bug 666306 - Added a large play button when the video is not autoplay and with controls enabled. r=dolske --HG-- rename : toolkit/themes/pinstripe/global/icons/tabprompts-bgtexture.png => toolkit/themes/pinstripe/global/media/clicktoplay-bgtexture.png rename : toolkit/themes/winstripe/global/icons/tabprompts-bgtexture.png => toolkit/themes/winstripe/global/media/clicktoplay-bgtexture.png --- toolkit/content/widgets/videocontrols.xml | 100 +++++++++++++----- toolkit/themes/pinstripe/global/jar.mn | 2 + .../global/media/clicktoplay-bgtexture.png | Bin 0 -> 5940 bytes .../global/media/videoClickToPlayButton.svg | 99 +++++++++++++++++ .../pinstripe/global/media/videocontrols.css | 30 ++++++ toolkit/themes/winstripe/global/jar.mn | 4 + .../global/media/clicktoplay-bgtexture.png | Bin 0 -> 1751 bytes .../global/media/videoClickToPlayButton.svg | 99 +++++++++++++++++ .../winstripe/global/media/videocontrols.css | 30 ++++++ 9 files changed, 340 insertions(+), 24 deletions(-) create mode 100644 toolkit/themes/pinstripe/global/media/clicktoplay-bgtexture.png create mode 100644 toolkit/themes/pinstripe/global/media/videoClickToPlayButton.svg create mode 100644 toolkit/themes/winstripe/global/media/clicktoplay-bgtexture.png create mode 100644 toolkit/themes/winstripe/global/media/videoClickToPlayButton.svg diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml index 80e0a5a7f858..6a9731925fff 100644 --- a/toolkit/content/widgets/videocontrols.xml +++ b/toolkit/content/widgets/videocontrols.xml @@ -270,7 +270,10 @@ - + + +