summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/ntp
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-26 08:11:30 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-26 08:11:30 +0000
commit11a2da1a77c397d687ec142b8fe2103efa45d3f0 (patch)
treed2649fb4d02addb6c6f430fd4c76b955851e5957 /chrome/browser/resources/ntp
parent4171f4a814ba9f7f3534f0c8554fe9e2ccaf66ec (diff)
downloadchromium_src-11a2da1a77c397d687ec142b8fe2103efa45d3f0.zip
chromium_src-11a2da1a77c397d687ec142b8fe2103efa45d3f0.tar.gz
chromium_src-11a2da1a77c397d687ec142b8fe2103efa45d3f0.tar.bz2
Reland r57473
TBR=eroman@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/ntp')
-rw-r--r--chrome/browser/resources/ntp/apps.css3
-rw-r--r--chrome/browser/resources/ntp/apps.js20
-rw-r--r--chrome/browser/resources/ntp/ntp_disclosure_triangle.pngbin0 -> 195 bytes
3 files changed, 6 insertions, 17 deletions
diff --git a/chrome/browser/resources/ntp/apps.css b/chrome/browser/resources/ntp/apps.css
index 67c7b70..3acaedd 100644
--- a/chrome/browser/resources/ntp/apps.css
+++ b/chrome/browser/resources/ntp/apps.css
@@ -35,7 +35,8 @@
background: rgba(255, 255, 255, 0) /* transparent white */
no-repeat center 10px;
background-size: 96px 96px;
- font-weight: bold;
+ font-family: Helvetica, Arial;
+ font-size: 14px;
overflow: hidden;
padding: 111px 10px 10px; /* 10 + 96 + 5 */
text-align: center;
diff --git a/chrome/browser/resources/ntp/apps.js b/chrome/browser/resources/ntp/apps.js
index 41c2e6e..64b490f 100644
--- a/chrome/browser/resources/ntp/apps.js
+++ b/chrome/browser/resources/ntp/apps.js
@@ -5,26 +5,14 @@
function getAppsCallback(data) {
logEvent('recieved apps');
var appsSection = $('apps-section');
- var debugSection = $('debug');
- appsSection.textContent = '';
+ var appsSectionContent = $('apps-section-content');
+ appsSectionContent.textContent = '';
data.apps.forEach(function(app) {
- appsSection.appendChild(apps.createElement(app));
+ appsSectionContent.appendChild(apps.createElement(app));
});
- // TODO(aa): Figure out what to do with the debug mode when we turn apps on
- // for everyone.
- if (appsSection.hasChildNodes()) {
- appsSection.classList.remove('disabled');
- if (data.showDebugLink) {
- debugSection.classList.remove('disabled');
- }
-
- appsSection.appendChild(apps.createWebStoreElement());
- } else {
- appsSection.classList.add('disabled');
- debugSection.classList.add('disabled');
- }
+ appsSectionContent.appendChild(apps.createWebStoreElement());
}
var apps = {
diff --git a/chrome/browser/resources/ntp/ntp_disclosure_triangle.png b/chrome/browser/resources/ntp/ntp_disclosure_triangle.png
new file mode 100644
index 0000000..6f5c016
--- /dev/null
+++ b/chrome/browser/resources/ntp/ntp_disclosure_triangle.png
Binary files differ