summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-12 02:32:57 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-12 02:32:57 +0000
commit49b5d4f3567bcd097ee670db04462e300375f512 (patch)
tree01170c4ca29e3e92237bfee9c7b97c66b4da6a0a
parent16aac2e74539eb7b63cad0ebc23464818dad5a7a (diff)
downloadchromium_src-49b5d4f3567bcd097ee670db04462e300375f512.zip
chromium_src-49b5d4f3567bcd097ee670db04462e300375f512.tar.gz
chromium_src-49b5d4f3567bcd097ee670db04462e300375f512.tar.bz2
fix appearance of buttons in chrome://settings
non-standard buttons in chrome://settings were broken in r109201 because the specificity of the button rules got greater when :not(.custom-appearance) was added. This is a sorry and unanticipated side effect of this approach (proposed by yours truly). BUG=none TEST=deletable list item close buttons, subpage close buttons go back to normal look Review URL: http://codereview.chromium.org/8510042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109759 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/ntp4/new_tab.html3
-rw-r--r--chrome/browser/resources/options/chromeos/accounts_user_list.js5
-rw-r--r--chrome/browser/resources/options/deletable_item_list.js4
-rw-r--r--chrome/browser/resources/options/options.html4
-rw-r--r--chrome/browser/resources/options/search_engine_manager_engine_list.js2
5 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/resources/ntp4/new_tab.html b/chrome/browser/resources/ntp4/new_tab.html
index a1c3fca..6f30f06 100644
--- a/chrome/browser/resources/ntp4/new_tab.html
+++ b/chrome/browser/resources/ntp4/new_tab.html
@@ -81,7 +81,8 @@ document.documentElement.setAttribute('touchui', true);
<div id="notification">
<span></span>
<div id="notificationLinks"></div>
- <button class="close-button" class="custom-appearance"></button>
+ <button class="close-button custom-appearance" class="custom-appearance">
+ </button>
</div>
</div>
diff --git a/chrome/browser/resources/options/chromeos/accounts_user_list.js b/chrome/browser/resources/options/chromeos/accounts_user_list.js
index 941733a..ce5a072 100644
--- a/chrome/browser/resources/options/chromeos/accounts_user_list.js
+++ b/chrome/browser/resources/options/chromeos/accounts_user_list.js
@@ -191,9 +191,8 @@ cr.define('options.accounts', function() {
if (!this.user.owner) {
var removeButton = this.ownerDocument.createElement('button');
- removeButton.classList.add('raw-button');
- removeButton.classList.add('remove-user-button');
- removeButton.classList.add('custom-appearance');
+ removeButton.className =
+ 'raw-button remove-user-button custom-appearance';
this.appendChild(removeButton);
}
},
diff --git a/chrome/browser/resources/options/deletable_item_list.js b/chrome/browser/resources/options/deletable_item_list.js
index 4d2e68e..80d4963 100644
--- a/chrome/browser/resources/options/deletable_item_list.js
+++ b/chrome/browser/resources/options/deletable_item_list.js
@@ -46,8 +46,8 @@ cr.define('options', function() {
this.appendChild(this.contentElement_);
this.closeButtonElement_ = this.ownerDocument.createElement('button');
- this.closeButtonElement_.classList.add('raw-button');
- this.closeButtonElement_.classList.add('close-button');
+ this.closeButtonElement_.className =
+ 'raw-button close-button custom-appearance';
this.closeButtonElement_.addEventListener('mousedown',
this.handleMouseDownUpOnClose_);
this.closeButtonElement_.addEventListener('mouseup',
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index c25db77..99be713 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -135,7 +135,7 @@
<div id="subpage-sheet-container-1"
class="subpage-sheet-container transparent" hidden>
<div id="subpage-sheet-1" class="subpage-sheet">
- <button class="raw-button close-subpage"></button>
+ <button class="raw-button close-subpage custom-appearance"></button>
<div class="subpage-sheet-contents">
<if expr="pp_ifdef('chromeos')">
<include src="about_page.html">
@@ -157,7 +157,7 @@
<div id="subpage-sheet-container-2"
class="subpage-sheet-container transparent" hidden>
<div id="subpage-sheet-2" class="subpage-sheet">
- <button class="raw-button close-subpage"></button>
+ <button class="raw-button close-subpage custom-appearance"></button>
<div class="subpage-sheet-contents">
<if expr="pp_ifdef('chromeos')">
<include src="chromeos/language_chewing_options.html">
diff --git a/chrome/browser/resources/options/search_engine_manager_engine_list.js b/chrome/browser/resources/options/search_engine_manager_engine_list.js
index 4f4b836..87ee2f5 100644
--- a/chrome/browser/resources/options/search_engine_manager_engine_list.js
+++ b/chrome/browser/resources/options/search_engine_manager_engine_list.js
@@ -122,7 +122,7 @@ cr.define('options.search_engines', function() {
// is implemented. When this is removed, remove the extra div above.
if (engine['canBeDefault']) {
var makeDefaultButtonEl = this.ownerDocument.createElement('button');
- makeDefaultButtonEl.className = "raw-button";
+ makeDefaultButtonEl.className = 'raw-button custom-appearance';
makeDefaultButtonEl.textContent =
templateData.makeDefaultSearchEngineButton;
makeDefaultButtonEl.onclick = function(e) {