diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 22:40:57 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 22:40:57 +0000 |
| commit | dff6d13ca6ddb778867ce2d731d5f8093aef28ea (patch) | |
| tree | 4758c346a2af607ec2a842c24f222e8fc401b6a8 /chrome/browser/resources | |
| parent | 05062e288e4b8f174a79cc698c3c97d7d12975be (diff) | |
| download | chromium_src-dff6d13ca6ddb778867ce2d731d5f8093aef28ea.zip chromium_src-dff6d13ca6ddb778867ce2d731d5f8093aef28ea.tar.gz chromium_src-dff6d13ca6ddb778867ce2d731d5f8093aef28ea.tar.bz2 | |
Re-land of earlier NTP theme patch; now with mac and linux compatibility.
Review URL: http://codereview.chromium.org/115413
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16205 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/new_tab.html | 29 | ||||
| -rw-r--r-- | chrome/browser/resources/new_tab_theme.css | 11 |
2 files changed, 25 insertions, 15 deletions
diff --git a/chrome/browser/resources/new_tab.html b/chrome/browser/resources/new_tab.html index 271bc35..455cdb2 100644 --- a/chrome/browser/resources/new_tab.html +++ b/chrome/browser/resources/new_tab.html @@ -130,10 +130,12 @@ logEvent('log start'); <meta charset="utf-8"> <title jscontent="title"></title> <style> +html { + height:100%; +} body { background-color:white; margin:0px; - background-image:url(chrome-ui://theme/theme_newtab_background); background-repeat:repeat-x; } html[firstview='true'] #main { @@ -157,7 +159,6 @@ form { margin-bottom:30px; } .section-title { - color:#000; line-height:19pt; font-size:110%; font-weight:bold; @@ -223,7 +224,6 @@ a.thumbnail { padding:15px; margin:12px; } - .recent-bookmark { display:block; background-repeat:no-repeat; @@ -298,12 +298,6 @@ html[dir='rtl'] #managesearcheslink { -webkit-border-radius:5px 5px; margin-bottom:10px; } -#searches { - background-color:#e1ecfe; -} -#recentlyBookmarked { - background-color:#e1ecfe; -} html[dir='rtl'] #recentlyBookmarkedContainer { text-align:right; } @@ -358,6 +352,7 @@ html[dir='rtl'] #searches input { pointer-events: none; /* Disable clicks */ } </style> +<link id="themecss" rel="stylesheet" href="chrome://theme/css/newtab.css" /> </head> <body onload="logEvent('body onload fired');" jsvalues=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> @@ -455,7 +450,7 @@ document.addEventListener('DOMContentLoaded', handleDOMContentLoaded); <div id='searches-entries'></div> </div> - <div id="recentlyBookmarked" class="sidebar" style="display:none"> + <div id="recentlyBookmarked" class="sidebar themed" style="display:none"> <span class="section-title" jscontent="bookmarks"></span> <div id="recentlyBookmarkedContainer"></div> </div> @@ -958,6 +953,10 @@ function restoreThumbnails() { chrome.send('clearMostVisitedURLsBlacklist'); } +function themeChanged() { + $('themecss').href = 'chrome://theme/css/newtab.css?' + Date.now(); +} + function viewLog() { var lines = []; var start = log[0][1]; @@ -987,7 +986,7 @@ setTimeout(function(){document.getElementById('main').className = 'visible'}, </script> <img id="small-cross-image" style="display: none; vertical-align:middle;" alt="X" - src="../../app/theme/ntp_x_icon_small.png"/> + src="chrome://theme/newtab_remove_icon"/> </body> <style> @@ -1001,16 +1000,16 @@ setTimeout(function(){document.getElementById('main').className = 'visible'}, height: 81px; left: 60px; top: 47px; - background: url('../../app/theme/ntp_x_icon.png'); + background: url(chrome://theme/newtab_remove_thumbnail); } .edit-mode div.edit-cross:hover { - background: url('../../app/theme/ntp_x_icon_hover.png'); + background: url(chrome://theme/newtab_remove_thumbnail_hover); } .edit-mode div.edit-cross:active { - background: url('../../app/theme/ntp_x_icon_active.png'); + background: url(chrome://theme/newtab_remove_thumbnail_active); } .recent-window-container { - background: url('../../app/theme/closed_window.png'); + background: url(chrome://theme/newtab_closed_window); background-repeat: no-repeat; } html[dir='rtl'] .recent-window-container { diff --git a/chrome/browser/resources/new_tab_theme.css b/chrome/browser/resources/new_tab_theme.css new file mode 100644 index 0000000..0c28c46 --- /dev/null +++ b/chrome/browser/resources/new_tab_theme.css @@ -0,0 +1,11 @@ +body { + background-image:url(chrome://theme/theme_ntp_background?$1); + background-position:bottom; + color: $2; +} +a { + color: $3; +} +.sidebar.themed { + background-color: $4; +}
\ No newline at end of file |