summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 00:23:02 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 00:23:02 +0000
commite33727a3f0378ee5fded8e30b0951402f7648400 (patch)
tree01864cb798d040ca87f7005ac5b9fbb5239cb6c0
parentab656793547101176c7981588306043dd5fc055f (diff)
downloadchromium_src-e33727a3f0378ee5fded8e30b0951402f7648400.zip
chromium_src-e33727a3f0378ee5fded8e30b0951402f7648400.tar.gz
chromium_src-e33727a3f0378ee5fded8e30b0951402f7648400.tar.bz2
Merge 74061 - dom-ui settings: Set default font to 13px.
BUG=54157 TEST=Verify dom-ui settings page no longer changes appearance with default font change. Review URL: http://codereview.chromium.org/6413024 TBR=csilv@chromium.org Review URL: http://codereview.chromium.org/6410133 git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@74063 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/options/options.html2
-rw-r--r--chrome/browser/resources/options/options_page.css2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index cca6a46..c95b6c9 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -128,7 +128,7 @@
<script src="options.js"></script>
</head>
-<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
+<body i18n-values=".style.fontFamily:fontfamily;">
<div class="header">
</div>
<div id="overlay" class="overlay hidden">
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index 3f5aaa7..3cda563 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -1,6 +1,6 @@
body {
cursor: default;
- font-size: 100%;
+ font-size: 13px;
}
a:link {