Bug 780442 - About:Memory page buttons are overlapping, oversized, r=margaret, njn

This commit is contained in:
Mark Capella 2012-09-13 10:47:31 -04:00
parent b4e2e4ae1a
commit 7d43cd8bad
5 changed files with 96 additions and 2 deletions

View File

@ -0,0 +1,89 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* This file is used for both about:memory and about:compartments. */
body.verbose {
/* override setting in about.css */
max-width: 100% !important;
}
body.non-verbose pre.entries {
overflow-x: hidden;
text-overflow: ellipsis;
}
h2 {
background: #ddd;
padding-left: .1em;
}
/* buttons are different sizes and overlapping without this */
button {
margin: 1%;
padding: 2%;
}
.accuracyWarning {
color: #f00;
}
.badInputWarning {
color: #f00;
}
.treeline {
color: #888;
}
.mrValue {
font-weight: bold;
color: #400;
}
.mrPerc {
}
.mrSep {
}
.mrName {
color: #004;
}
.mrNote {
color: #604;
}
.hasKids {
cursor: pointer;
}
.option {
font-size: 80%;
-moz-user-select: none; /* no need to include this when cutting+pasting */
}
.legend {
font-size: 80%;
-moz-user-select: none; /* no need to include this when cutting+pasting */
}
.hiddenOnMobile {
display: none;
}
.debug {
font-size: 80%;
}
.hidden {
display: none;
}
.invalid {
color: #fff;
background-color: #f00;
}

View File

@ -12,6 +12,7 @@ chrome.jar:
skin/aboutApps.css (aboutApps.css)
* skin/aboutDownloads.css (aboutDownloads.css)
skin/aboutFeedback.css (aboutFeedback.css)
skin/aboutMemory.css (aboutMemory.css)
skin/aboutReader.css (aboutReader.css)
skin/aboutSupport.css (aboutSupport.css)
* skin/browser.css (browser.css)
@ -20,6 +21,7 @@ chrome.jar:
skin/touchcontrols.css (touchcontrols.css)
skin/netError.css (netError.css)
% override chrome://global/skin/about.css chrome://browser/skin/about.css
% override chrome://global/skin/aboutMemory.css chrome://browser/skin/aboutMemory.css
% override chrome://global/skin/aboutSupport.css chrome://browser/skin/aboutSupport.css
% override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css
% override chrome://global/skin/netError.css chrome://browser/skin/netError.css

View File

@ -2,7 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* This file is used for both about:memory and about:compartments. */
/* This file is used for both about:memory and about:compartments. A
* version used for mobile is located at
* mobile/android/themes/core/aboutMemory.css. */
body.verbose {
/* override setting in about.css */

View File

@ -580,7 +580,7 @@ function appendAboutMemoryFooter(aBody)
"to see a description of what it measures.";
appendElementWithText(aBody, "div", "legend", legendText1);
appendElementWithText(aBody, "div", "legend", legendText2);
appendElementWithText(aBody, "div", "legend hiddenOnMobile", legendText2);
}
//---------------------------------------------------------------------------

View File

@ -9,6 +9,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<!-- the <title> is filled in by aboutMemory.js -->
<meta name="viewport" content="width=device-width; user-scalable=false"/>
<link rel="stylesheet" href="chrome://global/skin/aboutMemory.css" type="text/css"/>
<link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"/>
<script type="text/javascript;version=1.8" src="chrome://global/content/aboutMemory.js"/>