Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1125952 - Make about:sessionrestore use more available height. r=jaws

Browse Source
This commit is contained in:
Tim Nguyen 2015-05-22 09:58:00 -04:00
parent b5cd5dd34f
commit d11b1283f6
4 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
browser/components/sessionstore/content/aboutSessionRestore.xhtml
View File

@ -15,7 +15,7 @@
%restorepageDTD;
]>
<html xmlns="http://www.w3.org/1999/xhtml">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<head>
<title>&restorepage.tabtitle;</title>
<link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css" media="all"/>
@ -27,7 +27,7 @@
<body dir="&locale.dir;">
<div class="container">
<div class="container flex">
<div class="title">
<h1 class="title-text">&restorepage.errorTitle;</h1>
@ -42,43 +42,42 @@
<li>&restorepage.startNew;</li>
</ul>
</div>
<tree xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="tabList" flex="1" seltype="single" hidecolumnpicker="true"
</div>
<div class="tree-container">
<xul:tree id="tabList" seltype="single" hidecolumnpicker="true"
onclick="onListClick(event);" onkeydown="onListKeyDown(event);"
available="true" _window_label="&restorepage.windowLabel;">
<treecols>
<treecol cycler="true" id="restore" type="checkbox" label="&restorepage.restoreHeader;"/>
<splitter class="tree-splitter"/>
<treecol primary="true" id="title" label="&restorepage.listHeader;" flex="1"/>
</treecols>
<treechildren flex="1"/>
</tree>
<xul:treecols>
<xul:treecol cycler="true" id="restore" type="checkbox" label="&restorepage.restoreHeader;"/>
<xul:splitter class="tree-splitter"/>
<xul:treecol primary="true" id="title" label="&restorepage.listHeader;" flex="1"/>
</xul:treecols>
<xul:treechildren flex="1"/>
</xul:tree>
</div>
<hbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="button-container">
<div class="button-container">
#ifdef XP_UNIX
<button id="errorCancel"
<xul:button id="errorCancel"
label="&restorepage.closeButton;"
accesskey="&restorepage.close.access;"
oncommand="startNewSession();"/>
<button class="primary"
<xul:button class="primary"
id="errorTryAgain"
label="&restorepage.tryagainButton;"
accesskey="&restorepage.restore.access;"
oncommand="restoreSession();"/>
#else
<button class="primary"
<xul:button class="primary"
id="errorTryAgain"
label="&restorepage.tryagainButton;"
accesskey="&restorepage.restore.access;"
oncommand="restoreSession();"/>
<button id="errorCancel"
<xul:button id="errorCancel"
label="&restorepage.closeButton;"
accesskey="&restorepage.close.access;"
oncommand="startNewSession();"/>
#endif
</hbox>
</div>
<!-- holds the session data for when the tab is closed -->
<input type="text" id="sessionData" style="display: none;"/>
</div>

2
browser/themes/shared/aboutSessionRestore.css
View File

@ -35,4 +35,4 @@ treechildren::-moz-tree-image(partial) {
}
treechildren::-moz-tree-image(partial, selected) {
list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial-inverted");
}
}

1
toolkit/themes/shared/in-content/common.inc.css
View File

@ -704,6 +704,7 @@ xul|tree {
-moz-appearance: none;
font-size: 1em;
border: 1px solid var(--in-content-box-border-color);
margin: 0;
}
xul|tree:-moz-focusring,

22
toolkit/themes/shared/in-content/info-pages.inc.css
View File

@ -2,6 +2,7 @@
/* Body and container */
body {
display: flex;
flex-direction: column;
box-sizing: padding-box;
min-height: 100vh;
padding-top: 0;
@ -17,6 +18,13 @@ body {
max-width: 52em;
}
.container.flex {
display: flex;
flex-direction: column;
flex-grow: 1;
margin: 10vh 0;
}
/* Typography */
.title {
background-image: url("chrome://browser/skin/aboutNetError_info.svg");
@ -82,8 +90,16 @@ ul {
}
/* Trees */
tree {
min-height: 12em;
.tree-container {
margin-top: 1.2em;
flex-grow: 1;
min-height: 12em;
}
.tree-container > tree {
height: 100%;
}
tree {
width: 100%;
}
}