summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 09:12:13 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 09:12:13 +0000
commitc9d9e024218fc7a279409124ad6cec799e85de91 (patch)
treebbbacda26a15d22f4325d848e5203af773091368 /chrome
parent3057c4e540ecea2375fd53f60dcf4e2501eb326e (diff)
downloadchromium_src-c9d9e024218fc7a279409124ad6cec799e85de91.zip
chromium_src-c9d9e024218fc7a279409124ad6cec799e85de91.tar.gz
chromium_src-c9d9e024218fc7a279409124ad6cec799e85de91.tar.bz2
Merge 33581 - Extensions: stop using font:menu on a couple of extensions examples.
Changing to fontfamily: sansserif; (at least on my system) does not seem to actually change the font that is selected, however, fontsize: 0.8em; does change the size of the font. BUG=29095 Review URL: http://codereview.chromium.org/450040 TBR=estade@chromium.org Review URL: http://codereview.chromium.org/506034 git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@34691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.html3
-rw-r--r--chrome/common/extensions/docs/examples/extensions/buildbot/popup.html5
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.html b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.html
index f82fded..9230254 100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.html
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/popup.html
@@ -14,7 +14,8 @@ div {
cursor: pointer;
text-align: center;
padding: 1px 3px;
- font: menu;
+ font-family: sans-serif;
+ font-size: 0.8em;
width: 100px;
margin-top: 1px;
background: #cccccc;
diff --git a/chrome/common/extensions/docs/examples/extensions/buildbot/popup.html b/chrome/common/extensions/docs/examples/extensions/buildbot/popup.html
index 607f6a4..d4285c9 100644
--- a/chrome/common/extensions/docs/examples/extensions/buildbot/popup.html
+++ b/chrome/common/extensions/docs/examples/extensions/buildbot/popup.html
@@ -139,7 +139,8 @@ function toggle_size() {
</script>
<style>
body {
- font: menu;
+ font-family: sans-serif;
+ font-size: 0.8em;
overflow: hidden;
}
@@ -230,4 +231,4 @@ body.small .bot {
<a href="" onclick='showFyi()'>fyi</a>
</div>
<div id="bots">Loading....</div>
-</body> \ No newline at end of file
+</body>