diff options
| author | samarth@chromium.org <samarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 19:27:50 +0000 |
|---|---|---|
| committer | samarth@chromium.org <samarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 19:27:50 +0000 |
| commit | 754789de23c98e845983d726f153fa6a5ca523ce (patch) | |
| tree | c56b05828b312c6b80936c6480d77575e765e880 | |
| parent | c6332c96bb4d1bfb32275c552495a603b9f151b6 (diff) | |
| download | chromium_src-754789de23c98e845983d726f153fa6a5ca523ce.zip chromium_src-754789de23c98e845983d726f153fa6a5ca523ce.tar.gz chromium_src-754789de23c98e845983d726f153fa6a5ca523ce.tar.bz2 | |
Merge r223372.
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@223380 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/local_ntp/images/2x/ntp_google_logo.png | bin | 18730 -> 15460 bytes | |||
| -rw-r--r-- | chrome/browser/resources/local_ntp/images/2x/ntp_white_google_logo.png | bin | 24606 -> 6179 bytes | |||
| -rw-r--r-- | chrome/browser/resources/local_ntp/local_ntp.css | 12 |
3 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/resources/local_ntp/images/2x/ntp_google_logo.png b/chrome/browser/resources/local_ntp/images/2x/ntp_google_logo.png Binary files differindex 0ee82c2..0c4a066 100644 --- a/chrome/browser/resources/local_ntp/images/2x/ntp_google_logo.png +++ b/chrome/browser/resources/local_ntp/images/2x/ntp_google_logo.png diff --git a/chrome/browser/resources/local_ntp/images/2x/ntp_white_google_logo.png b/chrome/browser/resources/local_ntp/images/2x/ntp_white_google_logo.png Binary files differindex 2ed4bc9..4b3ac3e 100644 --- a/chrome/browser/resources/local_ntp/images/2x/ntp_white_google_logo.png +++ b/chrome/browser/resources/local_ntp/images/2x/ntp_white_google_logo.png diff --git a/chrome/browser/resources/local_ntp/local_ntp.css b/chrome/browser/resources/local_ntp/local_ntp.css index 8b80ec2..0370f4d 100644 --- a/chrome/browser/resources/local_ntp/local_ntp.css +++ b/chrome/browser/resources/local_ntp/local_ntp.css @@ -36,19 +36,17 @@ body.fakebox-disable #fakebox > input { } #logo { - background: -webkit-image-set( - url(images/google_logo.png) 1x, - url(images/2x/google_logo.png) 2x) no-repeat; + background-image: url(images/2x/google_logo.png); + background-repeat: no-repeat; + background-size: 269px 95px; height: 95px; margin-bottom: 24px; margin-top: 157px; - width: 275px; + width: 269px; } body.custom-theme #logo { - background: -webkit-image-set( - url(images/white_google_logo.png) 1x, - url(images/2x/white_google_logo.png) 2x) no-repeat; + background-image: url(images/2x/white_google_logo.png); } #fakebox { |
