Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-09 04:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 602893 - Put setting textboxes on separate row when in portrait [r=mbrubeck]

Browse Source
This commit is contained in:
Mark Finkle 2010-10-08 15:01:22 -04:00
parent e2248785e2
commit a85444e19f
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mobile/chrome/content/bindings/setting.xml
View File

@ -163,14 +163,14 @@
<binding id="setting-bool" extends="chrome://browser/content/bindings/setting.xml#setting-base">
<content>
<xul:box flex="1" class="prefbox">
<xul:box flex="1" class="prefbox setting-bool">
<xul:vbox flex="1">
<xul:label class="preftitle" xbl:inherits="value=title" crop="end" flex="1"/>
<xul:label class="prefdesc" xbl:inherits="value=desc" crop="end" flex="1">
<children/>
</xul:label>
</xul:vbox>
<xul:hbox anonid="input-container">
<xul:hbox anonid="input-container" class="setting-input">
<xul:checkbox anonid="input" xbl:inherits="disabled,onlabel,offlabel" oncommand="inputChanged();"/>
</xul:hbox>
</xul:box>
@ -202,14 +202,14 @@
<binding id="setting-boolint" extends="chrome://browser/content/bindings/setting.xml#setting-base">
<content>
<xul:box flex="1" class="prefbox">
<xul:box flex="1" class="prefbox setting-boolint">
<xul:vbox flex="1">
<xul:label class="preftitle" xbl:inherits="value=title" crop="end" flex="1"/>
<xul:label class="prefdesc" xbl:inherits="value=desc" crop="end" flex="1">
<children/>
</xul:label>
</xul:vbox>
<xul:hbox anonid="input-container">
<xul:hbox anonid="input-container" class="setting-input">
<xul:checkbox anonid="input" xbl:inherits="disabled" oncommand="inputChanged();"/>
</xul:hbox>
</xul:box>
@ -240,14 +240,14 @@
<binding id="setting-integer" extends="chrome://browser/content/bindings/setting.xml#setting-base">
<content>
<xul:box flex="1" class="prefbox">
<xul:box flex="1" class="prefbox setting-integer">
<xul:vbox flex="1">
<xul:label class="preftitle" xbl:inherits="value=title" crop="end" flex="1"/>
<xul:label class="prefdesc" xbl:inherits="value=desc" crop="end" flex="1">
<children/>
</xul:label>
</xul:vbox>
<xul:hbox anonid="input-container">
<xul:hbox anonid="input-container" class="setting-input">
<xul:textbox type="number" anonid="input" xbl:inherits="disabled,emptytext,min,max,increment,hidespinbuttons,wraparound" oninput="inputChanged();" oncommand="inputChanged();"/>
</xul:hbox>
</xul:box>
@ -278,14 +278,14 @@
<binding id="setting-control" extends="chrome://browser/content/bindings/setting.xml#setting-base">
<content>
<xul:box flex="1" class="prefbox">
<xul:box flex="1" class="prefbox setting-control">
<xul:vbox flex="1">
<xul:label class="preftitle" xbl:inherits="value=title" crop="end" flex="1"/>
<xul:label class="prefdesc" xbl:inherits="value=desc" crop="end" flex="1">
<children/>
</xul:label>
</xul:vbox>
<xul:hbox anonid="input-container">
<xul:hbox anonid="input-container" class="setting-input">
<children includes="button|menulist"/>
</xul:hbox>
</xul:box>
@ -294,14 +294,14 @@
<binding id="setting-string" extends="chrome://browser/content/bindings/setting.xml#setting-base">
<content>
<xul:box flex="1" class="prefbox">
<xul:box flex="1" class="prefbox setting-string">
<xul:vbox flex="1">
<xul:label class="preftitle" xbl:inherits="value=title" crop="end" flex="1"/>
<xul:label class="prefdesc" xbl:inherits="value=desc" crop="end" flex="1">
<children/>
</xul:label>
</xul:vbox>
<xul:hbox anonid="input-container">
<xul:hbox anonid="input-container" class="setting-input">
<xul:textbox xbl:inherits="disabled,emptytext,type=inputtype,min,max,increment,hidespinbuttons,decimalplaces,wraparound" anonid="input" oninput="inputChanged();"/>
</xul:hbox>
</xul:box>

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

@ -1340,6 +1340,21 @@ pageaction:hover:active > vbox > .pageaction-desc {
-moz-box-align: center;
}
/* Put setting textboxes on a separate row in portrait */
@media (max-width: 499px) {
.setting-integer,
.setting-string {
-moz-box-align: start;
-moz-box-orient: vertical;
}
.setting-integer > .setting-input > textbox,
.setting-string > .setting-input > textbox {
width: 499px; /* textboxes seem to need a width in order to flex */
-moz-box-flex: 1;
}
}
.options-box {
-moz-margin-start: 28px; /* sized based on the 32px addon image */
}

4
mobile/themes/core/config.css
View File

@ -106,11 +106,11 @@ richlistitem .prefvalue {
border-color: transparent !important;
}
#editor-setting[type="string"] [anonid="input-container"] {
#editor-setting[type="string"] .setting-input {
-moz-box-flex: 4;
}
#editor-setting[type="string"] [anonid="input-container"] > textbox {
#editor-setting[type="string"] .setting-input > textbox {
-moz-box-flex: 1;
}