Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out bug 664114 (changeset b9ee105d755c) due to test_innerWidthHeight_script.html failure

Browse Source
This commit is contained in:
Philipp von Weitershausen 2011-06-15 11:11:51 +02:00
parent 45c351ac2c
commit 12d1aa8f4d
9 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/chrome/content/MenuListHelperUI.js
View File

@ -59,8 +59,8 @@ var MenuListHelperUI = {
}
window.addEventListener("resize", this, true);
this.sizeToContent();
container.hidden = false;
this.sizeToContent();
BrowserUI.pushPopup(this, [this._popup]);
},
@ -86,8 +86,7 @@ var MenuListHelperUI = {
},
sizeToContent: function sizeToContent() {
let style = document.defaultView.getComputedStyle(this._container, null);
this._popup.width = window.innerWidth - (parseInt(style.paddingLeft) + parseInt(style.paddingRight));
this._popup.width = window.innerWidth * 0.8;
},
handleEvent: function handleEvent(aEvent) {

2
mobile/chrome/content/browser.xul
View File

@ -597,7 +597,7 @@
</vbox>
</vbox>
<hbox id="context-container" class="window-width window-height context-block" top="0" left="0" hidden="true" flex="1">
<hbox id="context-container" class="window-width window-height context-block" top="0" left="0" hidden="true">
<vbox id="context-popup" class="dialog-dark">
<hbox id="context-header">
<label id="context-hint" crop="center" flex="1"/>

5
mobile/chrome/content/common-ui.js
View File

@ -1189,11 +1189,11 @@ var ContextHelper = {
let label = document.getElementById("context-hint");
label.value = this.popupState.label || "";
this.sizeToContent();
this._panel.hidden = false;
window.addEventListener("resize", this, true);
window.addEventListener("keypress", this, true);
this.sizeToContent();
BrowserUI.pushPopup(this, [this._popup]);
let event = document.createEvent("Events");
@ -1215,8 +1215,7 @@ var ContextHelper = {
},
sizeToContent: function sizeToContent() {
let style = document.defaultView.getComputedStyle(this._panel, null);
this._popup.width = window.innerWidth - (parseInt(style.paddingLeft) + parseInt(style.paddingRight));
this._popup.maxWidth = window.innerWidth * 0.75;
},
handleEvent: function handleEvent(aEvent) {

8
mobile/themes/core/browser.css
View File

@ -1082,17 +1082,9 @@ documenttab[reload="true"] > stack > .documenttab-reload {
border-top: @border_width_tiny@ solid rgb(205,205,205);
padding: 0;
-moz-user-focus: ignore;
}
.action-buttons,
#pageactions-container {
display: inline-block;
}
#context-commands {
display: -moz-box;
}
.action-button,
.context-command,
pageaction {

2
mobile/themes/core/defines.inc
View File

@ -17,7 +17,6 @@
%define touch_action_minwidth 21.17mozmm
%define touch_normal 6.77mozmm
%define margin_context_popup 3.39mozmm
%define margin_large 2.54mozmm
%define margin_xxxnormal 1.69mozmm
%define margin_xnormal 1.06mozmm
@ -105,7 +104,6 @@
%define touch_action_minwidth 200px
%define touch_normal 64px
%define margin_context_popup 32px
%define margin_large 24px
%define margin_xxxnormal 16px
%define margin_xnormal 10px

13
mobile/themes/core/gingerbread/browser.css
View File

@ -1048,17 +1048,9 @@ documenttab[reload="true"] > stack > .documenttab-reload {
border-top: @border_width_tiny@ solid rgb(205,205,205);
padding: 0;
-moz-user-focus: ignore;
}
.action-buttons,
#pageactions-container {
display: inline-block;
}
#context-commands {
display: -moz-box;
}
.action-button,
.context-command,
pageaction {
@ -1162,13 +1154,8 @@ pageaction:not([image]) > hbox >.pageaction-image {
display: none;
}
#context-header {
background-color: @color_background_default@;
}
#share-title,
#context-hint {
color: @color_text_default@;
font-size: @font_small@;
padding: @padding_small@;
}

2
mobile/themes/core/gingerbread/defines.inc
View File

@ -43,7 +43,6 @@
%define touch_action_minwidth 21.17mozmm
%define touch_normal 6.77mozmm
%define margin_context_popup 3.39mozmm
%define margin_large 2.54mozmm
%define margin_xxxnormal 1.69mozmm
%define margin_xnormal 1.06mozmm
@ -133,7 +132,6 @@
%define touch_action_minwidth 200px
%define touch_normal 64px
%define margin_context_popup 32px
%define margin_large 24px
%define margin_xxxnormal 16px
%define margin_xnormal 10px

8
mobile/themes/core/gingerbread/platform.css
View File

@ -118,14 +118,14 @@ textbox[disabled="true"] {
}
.context-block {
padding: @margin_context_popup@;
padding: @touch_normal@;
}
.dialog-dark,
.panel-arrowcontent {
background-color: @color_background_inverse@;
box-shadow: black 0 @border_radius_tiny@ @border_radius_tiny@, black 0 -@border_radius_tiny@ @border_radius_tiny@;
padding: 0;
padding: @padding_normal@ 0; /* core spacing */
}
@media (max-width: 499px) {
@ -613,12 +613,12 @@ dialog {
.panel-arrow[side="top"] {
list-style-image: url("chrome://browser/skin/images/arrowbox-up.png");
margin-bottom: -@margin_snormal@;
margin-bottom: -@margin_normal@;
}
.panel-arrow[side="bottom"] {
list-style-image: url("chrome://browser/skin/images/arrowbox-down.png");
margin-top: -@margin_snormal@;
margin-top: -@margin_normal@;
}
.panel-arrow[side="left"] {

2
mobile/themes/core/platform.css
View File

@ -120,7 +120,7 @@ textbox[disabled="true"] {
}
.context-block {
padding: @margin_context_popup@;
padding: @touch_normal@;
}
.dialog-dark,