summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 01:29:29 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 01:29:29 +0000
commit22a829dbf2a01e009a2b3ab32a80fe3b27a683dd (patch)
treedf4b5bcd68839281c42abc1e0e98c1c98753b034 /chrome
parent7a073beaf6a288f4044ca4b3a199e63ba10414c8 (diff)
downloadchromium_src-22a829dbf2a01e009a2b3ab32a80fe3b27a683dd.zip
chromium_src-22a829dbf2a01e009a2b3ab32a80fe3b27a683dd.tar.gz
chromium_src-22a829dbf2a01e009a2b3ab32a80fe3b27a683dd.tar.bz2
chromeos - delete special internet options page CSS
this makes it look the same as all other pages (I believe the CSS predated the current look, as indicated by the deleted TODO) BUG=none TEST=visual Review URL: http://codereview.chromium.org/6677026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/options/chromeos_internet_detail.html2
-rw-r--r--chrome/browser/resources/options/chromeos_internet_options.js6
-rw-r--r--chrome/browser/resources/options/chromeos_internet_options_page.css26
3 files changed, 6 insertions, 28 deletions
diff --git a/chrome/browser/resources/options/chromeos_internet_detail.html b/chrome/browser/resources/options/chromeos_internet_detail.html
index d31c806..8feef75 100644
--- a/chrome/browser/resources/options/chromeos_internet_detail.html
+++ b/chrome/browser/resources/options/chromeos_internet_detail.html
@@ -1,5 +1,5 @@
<div class="page hidden" id="detailsInternetPage">
- <h1 id="inetTitle"></h1>
+ <h1 id="detailsInternetTitle"></h1>
<!-- Navigation tabs -->
<div class="subpages-nav-tabs" id="details-tab-strip">
<span id="wifiNetworkNavTab" class="tab wifi-details"
diff --git a/chrome/browser/resources/options/chromeos_internet_options.js b/chrome/browser/resources/options/chromeos_internet_options.js
index 1152cfd..88ffbb5 100644
--- a/chrome/browser/resources/options/chromeos_internet_options.js
+++ b/chrome/browser/resources/options/chromeos_internet_options.js
@@ -273,10 +273,12 @@ cr.define('options', function() {
}
if (data.connected) {
page.setAttribute('connected', data.connected);
- $('inetTitle').textContent = localStrings.getString('inetStatus');
+ $('detailsInternetTitle').textContent =
+ localStrings.getString('inetStatus');
} else {
page.removeAttribute('connected');
- $('inetTitle').textContent = localStrings.getString('inetConnect');
+ $('detailsInternetTitle').textContent =
+ localStrings.getString('inetConnect');
$('detailsInternetLogin').classList.remove('hidden');
}
$('connectionState').textContent = data.connectionState;
diff --git a/chrome/browser/resources/options/chromeos_internet_options_page.css b/chrome/browser/resources/options/chromeos_internet_options_page.css
index 9acbec8..508b10e 100644
--- a/chrome/browser/resources/options/chromeos_internet_options_page.css
+++ b/chrome/browser/resources/options/chromeos_internet_options_page.css
@@ -1,30 +1,7 @@
-/*
- * TODO(xiyuan): Remove the section overrides when options_page.css uses the
- * new style.
- */
-#inetTitle {
+#detailsInternetTitle {
border: none;
}
-#internetPage > section > h3 {
- font-size: 100%;
- width: auto;
-}
-
-#internetPage > section[hidden] {
- display: none;
-}
-
-#networkingControls {
- display: -webkit-box;
- -webkit-margin-start: 10px;
-}
-
-.networks {
- -webkit-margin-start: 15px;
- padding: 2px;
-}
-
.network-password {
left: 0px;
position: relative;
@@ -89,7 +66,6 @@ html[dir='rtl'] .network-item-text {
background: right center no-repeat;
}
-
.network-item[connected] > * > .network-name-label {
font-weight: bold;
}