Chromium Code Reviews| Index: chrome/browser/resources/local_ntp/local_ntp_fast.css |
| diff --git a/chrome/browser/resources/local_ntp/local_ntp.css b/chrome/browser/resources/local_ntp/local_ntp_fast.css |
| similarity index 42% |
| copy from chrome/browser/resources/local_ntp/local_ntp.css |
| copy to chrome/browser/resources/local_ntp/local_ntp_fast.css |
| index d0a64c852b1c5757a19dfe768e40effa2eb133a2..11bbb1d7e4ef3c108a6b4988681f22ac1063085d 100644 |
| --- a/chrome/browser/resources/local_ntp/local_ntp.css |
| +++ b/chrome/browser/resources/local_ntp/local_ntp_fast.css |
| @@ -1,4 +1,4 @@ |
| -/* Copyright 2013 The Chromium Authors. All rights reserved. |
| +/* Copyright 2015 The Chromium Authors. All rights reserved. |
| * Use of this source code is governed by a BSD-style license that can be |
| * found in the LICENSE file. */ |
| @@ -56,7 +56,6 @@ body.alternate-logo #logo { |
| } |
| #fakebox { |
| - /* Use GPU compositing if available. */ |
| -webkit-transform: translate3d(0, 0, 0); |
| -webkit-transition: -webkit-transform 100ms linear, border-color 100ms linear; |
| background-color: #fff; |
| @@ -69,8 +68,6 @@ body.alternate-logo #logo { |
| line-height: 36px; |
| max-width: 672px; |
| position: relative; |
| - /* #fakebox width (here and below) should be 2px less than #mv-tiles |
| - to account for its border. */ |
| width: 298px; |
|
huangs
2015/03/14 01:54:12
Can replace with
box-sizing: border-box;
...
wid
fserb
2015/03/16 20:02:30
Done.
|
| } |
| @@ -164,12 +161,8 @@ body.fakebox-focused #cursor { |
| #most-visited { |
| -webkit-user-select: none; |
| - text-align: -webkit-center; |
| -} |
| - |
| -/* For Google page, add space from Fakebox. */ |
| -.des-mat #most-visited { |
| margin-top: 64px; |
| + text-align: -webkit-center; |
| } |
| /* Non-Google pages have no Fakebox, so don't need top margin. */ |
| @@ -177,326 +170,34 @@ body.fakebox-focused #cursor { |
| margin-top: 0; |
| } |
| -#mv-tiles { |
| - margin: 0; |
| - position: relative; |
| - text-align: left; |
| -} |
| - |
| -html[dir=rtl] #mv-tiles { |
| - text-align: right; |
| -} |
| - |
| -.des-mat #mv-tiles { |
| - height: calc(2 * 146px); |
| - line-height: 146px; |
| -} |
| - |
| -.mv-tile { |
| - display: inline-block; |
| - position: relative; |
| - vertical-align: top; |
| -} |
| - |
| -.mv-page-ready { |
| - cursor: pointer; |
| - outline: none; |
| -} |
| - |
| -.des-mat .mv-tile { |
| - background: rgb(242,242,242); |
| - border-radius: 2px; |
| - height: 130px; |
| - margin-left: 8px; |
| - margin-right: 8px; |
| - width: 156px; |
| -} |
| - |
| -.des-mat .mv-page-ready { |
| - -webkit-transition-duration: 200ms; |
| - -webkit-transition-property: -webkit-transform, margin, opacity, width; |
| -} |
| - |
| -.des-mat.dark .mv-tile { |
| - background: rgb(51,51,51); |
| -} |
| - |
| -.mv-tile-inner { |
| - visibility: hidden; |
| -} |
| - |
| -.mv-page-ready .mv-tile-inner { |
| - visibility: visible; |
| -} |
| - |
| -/* Class applied to tiles to trigger the blacklist animation. */ |
| -.mv-tile.mv-blacklist { |
| - opacity: 0; |
| -} |
| - |
| -.des-mat .mv-tile.mv-blacklist { |
| - -webkit-transform: scale(0, 0); |
| - -webkit-transform-origin: 0 41px; |
| - margin-left: 0; |
| - margin-right: 0; |
| - width: 0; |
| -} |
| - |
| -/* .mv-mask is used to alter tile appearance, including borders, shadows, */ |
| -/* and backgrounds. */ |
| -.mv-mask { |
| - background: transparent; |
| - border-style: solid; |
| - border-width: 1px; |
| - cursor: pointer; |
| - pointer-events: none; |
| - position: absolute; |
| -} |
| - |
| -.des-mat .mv-mask { |
| - border-color: transparent; |
| - border-radius: 2px; |
| - height: calc(130px - 2px); |
| - width: calc(156px - 2px); |
| -} |
| - |
| -/* Styling border. */ |
| -.default-theme.des-mat.old-hover .mv-page-ready:hover .mv-mask, |
| -.default-theme.des-mat.old-hover .mv-page-ready .mv-focused ~ .mv-mask { |
| - border-color: #999; |
| -} |
| - |
| -.default-theme.des-mat.dark .mv-page-ready:hover .mv-mask, |
| -.default-theme.des-mat.dark .mv-page-ready .mv-focused ~ .mv-mask, |
| -.default-theme.des-mat.old-hover.dark .mv-page-ready:hover .mv-mask, |
| -.default-theme.des-mat.old-hover.dark .mv-page-ready .mv-focused ~ .mv-mask { |
| - border-color: #888; |
| -} |
| - |
| -/* Styling shadow. */ |
| -.default-theme.des-mat .mv-page-ready .mv-mask { |
| - -webkit-transition: box-shadow 200ms, border 200ms; |
| -} |
| - |
| -.default-theme.des-mat .mv-page-ready:hover .mv-mask, |
| -.default-theme.des-mat .mv-page-ready .mv-focused ~ .mv-mask { |
| - box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1), 0 4px 8px 0 rgba(0,0,0,0.2); |
| -} |
| - |
| -.default-theme.des-mat.dark .mv-page-ready:hover .mv-mask, |
| -.default-theme.des-mat.old-hover .mv-page-ready:hover .mv-mask { |
| - box-shadow: none; |
| -} |
| - |
| -/* Styling background. */ |
| -.des-mat .mv-page .mv-focused ~ .mv-mask { |
| - -webkit-transition: box-shadow 200ms, border 200ms, |
| - background-color 100ms ease-in-out; |
| - background: rgba(0, 0, 0, 0.3); |
| - border-color: rgba(0, 0, 0, 0.3); |
| -} |
| - |
| -.mv-title { |
| - border: none; |
| - position: absolute; |
| -} |
| - |
| -.des-mat .mv-title { |
| - bottom: auto; |
| - height: 15px; |
| - left: 32px; |
| - top: 9px; |
| - width: calc(156px - 32px - 4px); |
| -} |
| - |
| -@media (-webkit-min-device-pixel-ratio: 2) { |
| - .des-mat .mv-title { |
| - top: 8px; |
| - } |
| -} |
| - |
| -html[dir=rtl] .des-mat .mv-title { |
| - left: auto; |
| - right: 32px; |
| -} |
| - |
| -.mv-thumb { |
| - border: none; |
| - cursor: pointer; |
| - position: absolute; |
| -} |
| - |
| -.des-mat .mv-thumb, |
| -.des-mat .mv-thumb-fallback { |
| - border-radius: 0; |
| - height: 94px; |
| - left: 4px; |
| - top: 32px; |
| - width: 148px; |
| -} |
| - |
| -html[dir=rtl] .des-mat .mv-thumb, |
| -html[dir=rtl] .des-mat .mv-thumb-fallback { |
| - left: auto; |
| - right: 4px; |
| -} |
| - |
| -.des-mat .mv-thumb-fallback { |
| - background-color: #fff; |
| - position: absolute; |
| -} |
| - |
| -.des-mat.dark .mv-thumb-fallback { |
| - background-color: #555; |
| -} |
| - |
| -.des-mat .mv-thumb-fallback .dot { |
| - background-color: #f2f2f2; |
| - border-radius: 8px; |
| - display: block; |
| - height: 16px; |
| - left: 50%; |
| - margin-left: -8px; |
| - margin-top: -8px; |
| - position: absolute; |
| - top: 50%; |
| - width: 16px; |
| -} |
| - |
| -.des-mat.dark .mv-thumb-fallback .dot { |
| - background-color: #333; |
| -} |
| - |
| -.mv-x-hide .mv-x { |
| - display: none; |
| -} |
| - |
| -/* An X button to blacklist a tile or hide the notification. */ |
| -.mv-x { |
| - background-color: transparent; |
| - border: none; |
| - cursor: pointer; |
| -} |
| - |
| -.mv-page .mv-x { |
| - -webkit-transition: opacity 150ms; |
| - opacity: 0; |
| - position: absolute; |
| -} |
| - |
| #mv-notice-x { |
| - display: inline-block; |
| - position: relative; |
| -} |
| - |
| -.des-mat #mv-notice-x { |
| - -webkit-transform: translate(0,-8px); |
| -} |
| - |
| -.des-mat .mv-x { |
| - border-radius: 2px; |
| - height: 32px; |
| - width: 32px; |
| -} |
| - |
| -.des-mat .mv-x .mv-x-inner { |
| -webkit-mask-image: -webkit-image-set( |
| - url(images/close_3_mask.png) 1x, |
| - url(images/close_3_mask.png@2x) 2x); |
| + url(chrome-search://local-ntp/images/close_3_mask.png) 1x, |
| + url(chrome-search://local-ntp/images/close_3_mask.png@2x) 2x); |
| + -webkit-mask-position: 3px 3px; |
| -webkit-mask-repeat: no-repeat; |
| -webkit-mask-size: 10px 10px; |
| background-color: rgba(90,90,90,0.7); |
| - height: 10px; |
| - left: 50%; |
| - margin-left: -5px; |
| - margin-top: -5px; |
| - position: absolute; |
| - top: 50%; |
| - width: 10px; |
| -} |
| - |
| -.des-mat.dark .mv-x .mv-x-inner { |
| - background-color: rgba(255,255,255,0.7); |
| -} |
| - |
| -.des-mat .mv-x:hover .mv-x-inner, |
| -.des-mat #mv-notice-x:focus .mv-x-inner { |
| - background-color: rgb(90,90,90); |
| -} |
| - |
| -.des-mat.dark .mv-x:hover .mv-x-inner, |
| -.des-mat.dark #mv-notice-x:focus .mv-x-inner { |
| - background-color: rgb(255,255,255); |
| -} |
| - |
| -.des-mat .mv-x:active .mv-x-inner, |
| -.des-mat #mv-notice-x:active .mv-x-inner { |
| - background-color: rgb(66,133,244); |
| -} |
| - |
| -.des-mat.dark .mv-x:active .mv-x-inner, |
| -.des-mat.dark #mv-notice-x:active .mv-x-inner { |
| - background-color: rgba(255,255,255,0.5); |
| -} |
| - |
| -.des-mat .mv-page .mv-x { |
| - /* background color needs to match .des-mat .mv-tile */ |
| - background: linear-gradient(to right, transparent, rgb(242,242,242) 10%); |
| - right: 0; |
| - top: 0; |
| -} |
| - |
| -html[dir=rtl] .des-mat .mv-page .mv-x { |
| - /* background color needs to match .des-mat .mv-tile */ |
| - background: linear-gradient(to left, transparent, rgb(242,242,242) 10%); |
| - left: 0; |
| - right: auto; |
| -} |
| - |
| -.des-mat.dark .mv-page .mv-x { |
| - /* background color needs to match .des-mat.dark .mv-tile */ |
| - background: linear-gradient(to right, transparent, rgba(51,51,51,0.9) 30%); |
| -} |
| - |
| -html[dir=rtl] .des-mat.dark .mv-page .mv-x { |
| - /* background color needs to match .des-mat.dark .mv-tile */ |
| - background: linear-gradient(to left, transparent, rgba(51,51,51,0.9) 30%); |
| -} |
| - |
| -.mv-page-ready:hover .mv-x { |
| - -webkit-transition-delay: 500ms; |
| - opacity: 1; |
| -} |
| - |
| -.mv-page-ready .mv-x:hover { |
| - -webkit-transition: none; |
| -} |
| - |
| -.mv-favicon { |
| - background-size: 16px; |
| + cursor: pointer; |
| + display: inline-block; |
| height: 16px; |
| - pointer-events: none; |
| - position: absolute; |
| + margin-left: 20px; |
| + outline: none; |
| + vertical-align: middle; |
| width: 16px; |
| } |
| -.des-mat .mv-favicon { |
| - left: 8px; |
| - top: 8px; |
| +html[dir=rtl] #mv-notice-x { |
| + margin-left: 0; |
| + margin-right: 20px; |
| } |
| -html[dir=rtl] .des-mat .mv-favicon { |
| - left: auto; |
| - right: 8px; |
| - top: 8px; |
| +#mv-notice-x:hover { |
| + background-color: rgba(90,90,90, 1.0); |
|
huangs
2015/03/14 01:54:12
NIT: inconsistent space before 1.0 .
fserb
2015/03/16 20:02:30
Done.
|
| } |
| -.des-mat .mv-favicon-fallback { |
| - background-image: -webkit-image-set( |
| - url(images/ntp_default_favicon.png) 1x, |
| - url(images/ntp_default_favicon.png@2x) 2x); |
| - background-repeat: no-repeat; |
| - background-size: 16px 16px; |
| +#mv-notice-x:active { |
| + background-color: rgb(66,133,244); |
| } |
| /* The notification shown when a tile is blacklisted. */ |
| @@ -538,12 +239,6 @@ html[dir=rtl] .des-mat .mv-favicon { |
| color: #fff; |
| } |
| -#mv-notice-links .mv-x { |
| - -webkit-margin-start: 8px; |
| - outline: none; |
| - vertical-align: top; |
| -} |
| - |
| #mv-notice.mv-notice-delayed-hide { |
| -webkit-transition-delay: 10s; |
| -webkit-transition-property: opacity; |
| @@ -586,7 +281,14 @@ html[dir=rtl] #attribution { |
| right: 8px; |
| } |
| -html[dir=rtl] #attribution,html[dir=rtl] #recent-tabs { |
| +html[dir=rtl] #attribution, |
| +html[dir=rtl] #recent-tabs { |
| left: 8px; |
| right: auto; |
| } |
| + |
| +#mv-single { |
| + border: 0; |
|
huangs
2015/03/14 01:54:12
border: none;
fserb
2015/03/16 20:02:30
Done.
|
| + height: 100%; |
| + width: 100%; |
| +} |