summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-17 00:03:42 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-17 00:03:42 +0000
commit937b92aae870806eab5c9940a2c7a379f58b88da (patch)
tree5a75f4618c638479bfea429be4e2e108870eafac /chrome/browser/resources
parentd0a5126bc0d626ab688fce9410a5705fa8c9b125 (diff)
downloadchromium_src-937b92aae870806eab5c9940a2c7a379f58b88da.zip
chromium_src-937b92aae870806eab5c9940a2c7a379f58b88da.tar.gz
chromium_src-937b92aae870806eab5c9940a2c7a379f58b88da.tar.bz2
[uber] subpage CSS header tweaking
make the headers (titles) of subpages show up in the same location, at the same size and color and font, by moving a bit of css to chrome_shared2.css BUG=103688,107323 TEST=manual Review URL: http://codereview.chromium.org/9207016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/about_page/about_page.html1
-rw-r--r--chrome/browser/resources/extensions/extensions.html4
-rw-r--r--chrome/browser/resources/options2/options.html2
-rw-r--r--chrome/browser/resources/options2/options_page.css14
-rw-r--r--chrome/browser/resources/shared/css/chrome_shared2.css16
-rw-r--r--chrome/browser/resources/shared/css/open_sans.css12
-rw-r--r--chrome/browser/resources/shared_resources.grd2
-rw-r--r--chrome/browser/resources/uber/uber.css8
-rw-r--r--chrome/browser/resources/uber/uber.html3
9 files changed, 21 insertions, 41 deletions
diff --git a/chrome/browser/resources/about_page/about_page.html b/chrome/browser/resources/about_page/about_page.html
index 665efa2..25a5cef 100644
--- a/chrome/browser/resources/about_page/about_page.html
+++ b/chrome/browser/resources/about_page/about_page.html
@@ -6,7 +6,6 @@
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
-<link rel="stylesheet" href="chrome://resources/css/open_sans.css">
<link rel="stylesheet" href="about_page.css">
<script src="chrome://resources/js/cr.js"></script>
diff --git a/chrome/browser/resources/extensions/extensions.html b/chrome/browser/resources/extensions/extensions.html
index ae39634..7cc24ae 100644
--- a/chrome/browser/resources/extensions/extensions.html
+++ b/chrome/browser/resources/extensions/extensions.html
@@ -9,10 +9,6 @@
<link rel="stylesheet" href="../shared/css/chrome_shared2.css">
<link rel="stylesheet" href="../shared/css/trash.css">
-<if expr="not pp_ifdef('chromeos')">
- <link rel="stylesheet" href="../shared/css/open_sans.css">
-</if>
-
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/local_strings.js"></script>
<script src="chrome://resources/js/util.js"></script>
diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html
index 5c06b94..f9063eb 100644
--- a/chrome/browser/resources/options2/options.html
+++ b/chrome/browser/resources/options2/options.html
@@ -78,7 +78,7 @@
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://settings-frame/options_bundle.js"></script>
</head>
-<body i18n-values=".style.fontFamily:fontfamily;">
+<body>
<div id="overlay" class="overlay transparent" hidden>
<include src="alert_overlay.html">
<include src="autofill_edit_address_overlay.html">
diff --git a/chrome/browser/resources/options2/options_page.css b/chrome/browser/resources/options2/options_page.css
index 748f8ef..4f45edbd 100644
--- a/chrome/browser/resources/options2/options_page.css
+++ b/chrome/browser/resources/options2/options_page.css
@@ -28,10 +28,10 @@ html.hide-menu #mainview {
}
#page-container {
+ -webkit-padding-end: 24px;
box-sizing: border-box;
max-width: 888px;
min-width: 600px;
- padding: 0 24px;
}
div.disabled {
@@ -62,18 +62,6 @@ input[type='text']:disabled {
color: #888;
}
-.page h1 {
- -webkit-padding-end: 24px;
- -webkit-user-select: none;
- color: #333;
- font-size: 200%;
- font-weight: normal;
- margin: 0;
- padding-bottom: 4px;
- padding-top: 13px;
- text-shadow: white 0 1px 2px;
-}
-
.hbox {
display: -webkit-box;
-webkit-box-orient: horizontal;
diff --git a/chrome/browser/resources/shared/css/chrome_shared2.css b/chrome/browser/resources/shared/css/chrome_shared2.css
index a8da397..beb7809 100644
--- a/chrome/browser/resources/shared/css/chrome_shared2.css
+++ b/chrome/browser/resources/shared/css/chrome_shared2.css
@@ -24,9 +24,11 @@ p {
}
h1 {
- color: rgb(17, 85, 204);
+ -webkit-user-select: none;
+ color: rgb(48, 57, 66);
font-size: 18px;
font-weight: normal;
+ margin-top: 1em;
}
a:link {
@@ -111,3 +113,15 @@ html[dir='rtl'] .weakrtl input::-webkit-input-placeholder {
right: 0;
top: 0;
}
+
+/* TODO(estade): remove this: http://crbug.com/109967
+ * For now it's a bandaid until we install open sans properly. */
+<if expr="not pp_ifdef('chromeos')">
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Open Sans'), local('OpenSans'),
+ url('chrome://resources/fonts/open_sans.woff') format('woff');
+}
+</if>
diff --git a/chrome/browser/resources/shared/css/open_sans.css b/chrome/browser/resources/shared/css/open_sans.css
deleted file mode 100644
index 46d5465..0000000
--- a/chrome/browser/resources/shared/css/open_sans.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-@font-face {
- font-family: 'Open Sans';
- font-style: normal;
- font-weight: 400;
- src: local('Open Sans'), local('OpenSans'),
- url('chrome://resources/fonts/open_sans.woff') format('woff');
-}
diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd
index 7628d1e..6cd4d9e 100644
--- a/chrome/browser/resources/shared_resources.grd
+++ b/chrome/browser/resources/shared_resources.grd
@@ -24,8 +24,6 @@ without changes to the corresponding grd file. -->
file="shared/css/list.css" type="BINDATA" />
<include name="IDR_SHARED_CSS_MENU"
file="shared/css/menu.css" type="BINDATA" />
- <include name="IDR_SHARED_CSS_OPEN_SANS"
- file="shared/css/open_sans.css" type="BINDATA" />
<include name="IDR_SHARED_CSS_CHROME"
file="shared/css/chrome_shared.css" type="BINDATA" />
<include name="IDR_SHARED_CSS_CHROME2"
diff --git a/chrome/browser/resources/uber/uber.css b/chrome/browser/resources/uber/uber.css
index 4efb3ea..778bac9 100644
--- a/chrome/browser/resources/uber/uber.css
+++ b/chrome/browser/resources/uber/uber.css
@@ -2,11 +2,9 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */
-#navigation h3 {
- color: rgb(92, 97, 102);
- font-size: 18px;
- font-weight: normal;
+#navigation h1 {
-webkit-margin-start: 23px;
+ color: rgb(92, 97, 102);
}
#navigation ol {
@@ -16,11 +14,11 @@
#navigation li {
-webkit-border-start: 6px solid white;
+ -webkit-padding-start: 18px;
color: #999;
cursor: pointer;
line-height: 17px;
margin: 5px 0;
- -webkit-padding-start: 18px;
text-transform: uppercase;
}
diff --git a/chrome/browser/resources/uber/uber.html b/chrome/browser/resources/uber/uber.html
index 58b7553..53de974 100644
--- a/chrome/browser/resources/uber/uber.html
+++ b/chrome/browser/resources/uber/uber.html
@@ -5,7 +5,6 @@
<title i18n-content="pageTitle"></title>
<link rel="stylesheet" href="chrome://resources/css/chrome_shared2.css">
-<link rel="stylesheet" href="chrome://resources/css/open_sans.css">
<link rel="stylesheet" href="uber.css">
<script src="chrome://resources/js/cr.js"></script>
@@ -19,7 +18,7 @@
<div class="overlay"></div>
<div id="navigation">
- <h3 i18n-content="shortProductName"></h3>
+ <h1 i18n-content="shortProductName"></h1>
<ol>
<li class="selected" i18n-content="settingsDisplayName"></li>
<li i18n-content="extensionsDisplayName"></li>
generated by cgit v1.1 at 2025-01-29 16:57:27 +0000