diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-05 21:35:30 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-05 21:35:30 +0000 |
| commit | 99deea6d3b0cf9c93351f247c5b62d3c8dea47da (patch) | |
| tree | 7ecc4902afb5f5466558ef68d9915fb607fb2e7f /chrome/browser/resources | |
| parent | 190be391c2c420310d95eda78b5fce0e00d069bf (diff) | |
| download | chromium_src-99deea6d3b0cf9c93351f247c5b62d3c8dea47da.zip chromium_src-99deea6d3b0cf9c93351f247c5b62d3c8dea47da.tar.gz chromium_src-99deea6d3b0cf9c93351f247c5b62d3c8dea47da.tar.bz2 | |
More theme bits for the NTP and window frame.
BUG=12768,13352
TEST=Verify that a theme with attribution works on the NTP and a theme with an overlay shows up
Review URL: http://codereview.chromium.org/119227
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/new_tab.html | 18 | ||||
| -rw-r--r-- | chrome/browser/resources/new_tab_theme.css | 4 |
2 files changed, 20 insertions, 2 deletions
diff --git a/chrome/browser/resources/new_tab.html b/chrome/browser/resources/new_tab.html index 3ce97ed..ba582fe 100644 --- a/chrome/browser/resources/new_tab.html +++ b/chrome/browser/resources/new_tab.html @@ -1,5 +1,5 @@ <!DOCTYPE HTML> -<html id="t" jsvalues="dir:textdirection;firstview:firstview;bookmarkbarattached:bookmarkbarattached;"> +<html id="t" jsvalues="dir:textdirection;firstview:firstview;bookmarkbarattached:bookmarkbarattached;hasattribution:hasattribution"> <!-- This page is optimized for perceived performance. Our enemies are the time taken for the backend to generate our data, and the time taken to parse @@ -323,6 +323,9 @@ html[dir='rtl'] #searches input { #searches input:-webkit-input-placeholder-mode { color: #aaa; } +html[hasattribution='false'] .attribution { + display:none; +} .footer { border-top:1px solid #ccc; padding-top:4px; @@ -352,7 +355,7 @@ html[dir='rtl'] #searches input { </style> <link id="themecss" rel="stylesheet" href="chrome://theme/css/newtab.css" /> </head> -<body onload="logEvent('body onload fired');" +<body onload="updateAttribution(); logEvent('body onload fired');" jsvalues=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> <div id="l10n" style="display:none;"> <span id="closedwindowsingle" jscontent="closedwindowsingle">1 Tab</span> @@ -458,6 +461,11 @@ document.addEventListener('DOMContentLoaded', handleDOMContentLoaded); <div class="section-title" jscontent="recentlyclosed"></div> <div id="recentlyClosedContainer"></div> </div> + + <div id="attribution" class="sidebar attribution"> + <span jscontent="attributionintro"></span><br /> + <img id="attribution-img" /> + </div> </td> </tr> </table> @@ -935,6 +943,12 @@ function restoreThumbnails() { function themeChanged() { $('themecss').href = 'chrome://theme/css/newtab.css?' + Date.now(); + updateAttribution(); +} + +function updateAttribution() { + $('attribution-img').src = 'chrome://theme/theme_ntp_attribution?' + + Date.now(); } function bookmarkBarAttached() { diff --git a/chrome/browser/resources/new_tab_theme.css b/chrome/browser/resources/new_tab_theme.css index 3776cfe..ff36f52 100644 --- a/chrome/browser/resources/new_tab_theme.css +++ b/chrome/browser/resources/new_tab_theme.css @@ -18,4 +18,8 @@ a { } .sidebar.themed { background-color: $7; + color: $8; +} +.sidebar.themed a { + color: $9; }
\ No newline at end of file |