diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc index 1b05461f8304..fb455646a5ba 100644 --- a/browser/ui/webui/brave_webui_source.cc +++ b/browser/ui/webui/brave_webui_source.cc @@ -50,28 +50,23 @@ void CustomizeWebUIHTMLSource(const std::string &name, content::WebUIDataSource* { "fd85070af5114d6ac462c466e78448e4.svg", IDR_BRAVE_NEW_TAB_IMG1 }, { "314e7529efec41c8867019815f4d8dad.svg", IDR_BRAVE_NEW_TAB_IMG4 }, { "6c337c63662ee0ba4e57f6f8156d69ce.svg", IDR_BRAVE_NEW_TAB_IMG2 }, - { "50cc52a4f1743ea74a21da996fe44272.jpg", IDR_BRAVE_NEW_TAB_IMG14 }, // New tab Backgrounds - { "dksfoto1.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND1 }, - { "dksfoto2.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND2 }, - { "dksfoto3.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND3 }, - { "dksfoto4.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND4 }, - { "dksfoto5.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND5 }, - { "dksfoto6.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND6 }, - { "dksfoto7.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND7 }, - { "dksfoto8.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND8 }, - { "dksfoto9.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND9 }, - { "dksfoto10.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND10 }, - { "dksfoto11.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND11 }, - { "Phoyoserge_Corsica.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND12 }, - { "Phoyoserge_Corsica2.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND13 }, - { "Phoyoserge_DowntownGriffith.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND14 }, - { "Phoyoserge_ElmatadorBeach.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND15 }, - { "Phoyoserge_ParisConciergeri.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND16 }, - { "Phoyoserge_Theroofparis.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND17 }, - { "Phoyoserge_TheSeantParis.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND18 }, - { "Phoyoserge_VeniseSunset.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND19 }, - { "Phoyoserge_Yosemite.jpg", IDR_BRAVE_NEW_TAB_BACKGROUND20 }, + { "ntp-1.webp", IDR_BRAVE_NEW_TAB_BACKGROUND1 }, + { "ntp-2.webp", IDR_BRAVE_NEW_TAB_BACKGROUND2 }, + { "ntp-3.webp", IDR_BRAVE_NEW_TAB_BACKGROUND3 }, + { "ntp-4.webp", IDR_BRAVE_NEW_TAB_BACKGROUND4 }, + { "ntp-5.webp", IDR_BRAVE_NEW_TAB_BACKGROUND5 }, + { "ntp-6.webp", IDR_BRAVE_NEW_TAB_BACKGROUND6 }, + { "ntp-7.webp", IDR_BRAVE_NEW_TAB_BACKGROUND7 }, + { "ntp-8.webp", IDR_BRAVE_NEW_TAB_BACKGROUND8 }, + { "ntp-9.webp", IDR_BRAVE_NEW_TAB_BACKGROUND9 }, + { "ntp-10.webp", IDR_BRAVE_NEW_TAB_BACKGROUND10 }, + { "ntp-11.webp", IDR_BRAVE_NEW_TAB_BACKGROUND11 }, + { "ntp-12.webp", IDR_BRAVE_NEW_TAB_BACKGROUND12 }, + { "ntp-13.webp", IDR_BRAVE_NEW_TAB_BACKGROUND13 }, + { "ntp-14.webp", IDR_BRAVE_NEW_TAB_BACKGROUND14 }, + { "ntp-15.webp", IDR_BRAVE_NEW_TAB_BACKGROUND15 }, + { "ntp-16.webp", IDR_BRAVE_NEW_TAB_BACKGROUND16 }, // private tab { "c168145d6bf1abf2c0322636366f7dbe.svg", IDR_BRAVE_PRIVATE_TAB_TOR_IMG }, diff --git a/components/brave_new_tab_ui/components/app.tsx b/components/brave_new_tab_ui/components/app.tsx index e202fc3e9f84..ab86790607b9 100644 --- a/components/brave_new_tab_ui/components/app.tsx +++ b/components/brave_new_tab_ui/components/app.tsx @@ -7,7 +7,6 @@ import { DragDropContext } from 'react-dnd' import { bindActionCreators, Dispatch } from 'redux' import { connect } from 'react-redux' import HTML5Backend from 'react-dnd-html5-backend' -import { Grid, Column } from 'brave-ui/components' import { Clock } from 'brave-ui/old' // Components @@ -25,7 +24,6 @@ import * as newTabActions from '../actions/new_tab_actions' // Assets require('../../styles/newtab.less') -require('font-awesome/css/font-awesome.css') require('../../fonts/poppins.css') require('../../fonts/muli.css') @@ -149,15 +147,13 @@ class NewTabPage extends React.Component {
-
- - - - - - - - +
+
+ +
+
+ +
- )) + ) + ) } } @@ -166,7 +181,9 @@ class Block extends React.Component { * * @see http://gaearon.github.io/react-dnd/docs-drag-source.html */ -const source = DragSource(Types.BLOCK, blockSource, sourceCollect)(Block) +const source = DragSource(Types.BLOCK, blockSource, sourceCollect)( + Block +) // Notice that we're exporting the DropTarget and not Block Class. /** @@ -175,4 +192,6 @@ const source = DragSource(Types.BLOCK, blockSource, sourceCollect)(Block) * * @see http://gaearon.github.io/react-dnd/docs-drop-target.html */ -export default DropTarget(Types.BLOCK, blockTarget, targetCollect)(source) +export default DropTarget(Types.BLOCK, blockTarget, targetCollect)( + source +) diff --git a/components/brave_new_tab_ui/components/footerInfo.tsx b/components/brave_new_tab_ui/components/footerInfo.tsx index 3402520efd66..9d68591ecfc9 100644 --- a/components/brave_new_tab_ui/components/footerInfo.tsx +++ b/components/brave_new_tab_ui/components/footerInfo.tsx @@ -16,24 +16,42 @@ export default class FooterInfo extends React.Component { return ( ) diff --git a/components/brave_new_tab_ui/components/siteRemovalNotification.tsx b/components/brave_new_tab_ui/components/siteRemovalNotification.tsx index 2dbbd711aac0..6aaf457c9e71 100644 --- a/components/brave_new_tab_ui/components/siteRemovalNotification.tsx +++ b/components/brave_new_tab_ui/components/siteRemovalNotification.tsx @@ -25,7 +25,7 @@ export default class SiteRemovalNotification extends React.Component -
) } diff --git a/components/brave_new_tab_ui/constants/backgrounds.ts b/components/brave_new_tab_ui/constants/backgrounds.ts index 6a51806255df..0152eb0c32a5 100644 --- a/components/brave_new_tab_ui/constants/backgrounds.ts +++ b/components/brave_new_tab_ui/constants/backgrounds.ts @@ -4,123 +4,99 @@ export const images: NewTab.Image[] = [ { - 'name': 'Tuolumne Meadows', - 'source': 'dksfoto1.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '1', + 'source': 'ntp-1.webp', + 'author': 'Pok Rie', + 'link': 'https://www.pexels.com/@pok-rie-33563' }, { - 'name': 'South Tufa, Mono Lake', - 'source': 'dksfoto2.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '2', + 'source': 'ntp-2.webp', + 'author': 'Jack Millard', + 'link': 'https://unsplash.com/@millarjb' }, { - 'name': 'Little Lakes Valley', - 'source': 'dksfoto3.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '3', + 'source': 'ntp-3.webp', + 'author': 'Buzz Andersen', + 'link': 'https://unsplash.com/@ldandersen' }, { - 'name': 'Bay Bridge', - 'source': 'dksfoto4.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '4', + 'source': 'ntp-4.webp', + 'author': 'Frank McKenna', + 'link': 'https://unsplash.com/@frankiefoto' }, { - 'name': 'Yosemite', - 'source': 'dksfoto5.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '5', + 'source': 'ntp-5.webp', + 'author': 'SpaceX', + 'link': 'https://www.flickr.com/photos/spacex/' }, { - 'name': 'Beach Ice', - 'source': 'dksfoto6.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '6', + 'source': 'ntp-6.webp', + 'author': 'SpaceX', + 'link': 'https://www.flickr.com/photos/spacex/' }, { - 'name': 'Color and White Trunks', - 'source': 'dksfoto7.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '7', + 'source': 'ntp-7.webp', + 'author': 'SpaceX', + 'link': 'https://www.flickr.com/photos/spacex/' }, { - 'name': 'Golden Gate Bridge', - 'source': 'dksfoto8.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '8', + 'source': 'ntp-8.webp', + 'author': 'Will Christiansen', + 'link': 'https://www.theskyfolk.com' }, { - 'name': 'Long Lake', - 'source': 'dksfoto9.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '9', + 'source': 'ntp-9.webp', + 'author': 'Will Christiansen', + 'link': 'https://www.theskyfolk.com' }, { - 'name': 'San Francisco Skyline', - 'source': 'dksfoto10.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '10', + 'source': 'ntp-10.webp', + 'author': 'Will Christiansen', + 'link': 'https://www.theskyfolk.com' }, { - 'name': 'Across Mono Basin', - 'source': 'dksfoto11.jpg', - 'author': 'Darrell Sano', - 'link': 'https://dksfoto.smugmug.com' + 'name': '11', + 'source': 'ntp-11.webp', + 'author': 'Will Christiansen', + 'link': 'http://www.noutgons.nl/' }, { - 'name': 'Corsica', - 'source': 'Phoyoserge_Corsica.jpg', - 'author': 'Serge Ramelli', - 'link': 'https://www.photoserge.com/' + 'name': '12', + 'source': 'ntp-12.webp', + 'author': 'Artem Bali', + 'link': 'https://www.pexels.com/@belart84' }, { - 'name': 'Corsica', - 'source': 'Phoyoserge_Corsica2.jpg', - 'author': 'Serge Ramelli', - 'link': 'https://www.photoserge.com/' + 'name': '13', + 'source': 'ntp-13.webp', + 'author': 'Hristo Fidanov', + 'link': 'https://www.pexels.com/@hristo-fidanov-520662' }, { - 'name': 'Griffith Park Observatory (Downtown Los Angeles)', - 'source': 'Phoyoserge_DowntownGriffith.jpg', - 'author': 'Serge Ramelli', - 'link': 'https://www.photoserge.com/' + 'name': '14', + 'source': 'ntp-14.webp', + 'author': 'Life of Pix', + 'link': 'https://www.pexels.com/@life-of-pix' }, { - 'name': 'Elmatador Beach', - 'source': 'Phoyoserge_ElmatadorBeach.jpg', - 'author': 'Serge Ramelli', - 'link': 'https://www.photoserge.com/' + 'name': '15', + 'source': 'ntp-15.webp', + 'author': 'Cassie Boca', + 'link': 'https://unsplash.com/@cassieboca' }, { - 'name': 'Paris: Conciergerie', - 'source': 'Phoyoserge_ParisConciergeri.jpg', - 'author': 'Serge Ramelli', - 'link': 'https://www.photoserge.com/' - }, - { - 'name': 'Paris: The Roof', - 'source': 'Phoyoserge_Theroofparis.jpg', - 'author': 'Serge Ramelli', - 'link': 'https://www.photoserge.com/' - }, - { - 'name': 'Paris: The Senate', - 'source': 'Phoyoserge_TheSeantParis.jpg', - 'author': 'Serge Ramelli', - 'link': 'https://www.photoserge.com/' - }, - { - 'name': 'Venise Sunset', - 'source': 'Phoyoserge_VeniseSunset.jpg', - 'author': 'Serge Ramelli', - 'link': 'https://www.photoserge.com/' - }, - { - 'name': 'Yosemite', - 'source': 'Phoyoserge_Yosemite.jpg', - 'author': 'Serge Ramelli', - 'link': 'https://www.photoserge.com/' + 'name': '16', + 'source': 'ntp-16.webp', + 'author': 'Braden Jarvis', + 'link': 'https://unsplash.com/@jarvisphoto' } ] diff --git a/components/brave_new_tab_ui/constants/theme.ts b/components/brave_new_tab_ui/constants/theme.ts index 84e89df0d93c..38f8077c015e 100644 --- a/components/brave_new_tab_ui/constants/theme.ts +++ b/components/brave_new_tab_ui/constants/theme.ts @@ -4,34 +4,16 @@ export const theme = { newTab: { - fontFamily: '"Poppins", sans-serif' - }, - newTabStats: { - padding: '40px 0' + fontFamily: 'Poppins, sans-serif' }, newPrivateTab: { - fontFamily: '"Poppins", sans-serif', + fontFamily: 'Poppins, sans-serif', padding: '80px 60px 40px', background: 'linear-gradient(#4b3c6e, #000)' }, - trackersBlocked: { - counterColor: '#f39030', - descriptionColor: '#fff' - }, - adsBlocked: { - counterColor: '#fe521d', - descriptionColor: '#fff' - }, - httpsUpgrades: { - counterColor: '#0796fa', - descriptionColor: '#fff' - }, - estimatedTime: { - counterColor: '#999999', - descriptionColor: '#fff' - }, clock: { - color: '#fff' + color: '#fff', + fontSize: '90px' }, clockContainer: { justifyContent: 'flex-end' @@ -40,14 +22,14 @@ export const theme = { maxWidth: '650px', margin: '60px auto 0', color: 'rgba(255,255,255,0.8)', - fontFamily: '"Muli", sans-serif' + fontFamily: 'Muli, sans-serif' }, media: { width: '80px', margin: '0 0 0 25px' }, title: { - fontFamily: '"Poppins", sans-serif', + fontFamily: 'Poppins, sans-serif', fontWeight: '400', color: '#fff' }, diff --git a/components/img/newtab/Phoyoserge_Corsica.jpg b/components/img/newtab/Phoyoserge_Corsica.jpg deleted file mode 100644 index dc4a6043e32e..000000000000 Binary files a/components/img/newtab/Phoyoserge_Corsica.jpg and /dev/null differ diff --git a/components/img/newtab/Phoyoserge_Corsica2.jpg b/components/img/newtab/Phoyoserge_Corsica2.jpg deleted file mode 100644 index d62deabe8163..000000000000 Binary files a/components/img/newtab/Phoyoserge_Corsica2.jpg and /dev/null differ diff --git a/components/img/newtab/Phoyoserge_DowntownGriffith.jpg b/components/img/newtab/Phoyoserge_DowntownGriffith.jpg deleted file mode 100644 index e947d19a8a10..000000000000 Binary files a/components/img/newtab/Phoyoserge_DowntownGriffith.jpg and /dev/null differ diff --git a/components/img/newtab/Phoyoserge_ElmatadorBeach.jpg b/components/img/newtab/Phoyoserge_ElmatadorBeach.jpg deleted file mode 100644 index ccec4401fefa..000000000000 Binary files a/components/img/newtab/Phoyoserge_ElmatadorBeach.jpg and /dev/null differ diff --git a/components/img/newtab/Phoyoserge_ParisConciergeri.jpg b/components/img/newtab/Phoyoserge_ParisConciergeri.jpg deleted file mode 100644 index 8cf5c25b9fde..000000000000 Binary files a/components/img/newtab/Phoyoserge_ParisConciergeri.jpg and /dev/null differ diff --git a/components/img/newtab/Phoyoserge_TheSeantParis.jpg b/components/img/newtab/Phoyoserge_TheSeantParis.jpg deleted file mode 100644 index 5d6cdeeefd57..000000000000 Binary files a/components/img/newtab/Phoyoserge_TheSeantParis.jpg and /dev/null differ diff --git a/components/img/newtab/Phoyoserge_Theroofparis.jpg b/components/img/newtab/Phoyoserge_Theroofparis.jpg deleted file mode 100644 index 56a7ae304a2e..000000000000 Binary files a/components/img/newtab/Phoyoserge_Theroofparis.jpg and /dev/null differ diff --git a/components/img/newtab/Phoyoserge_VeniseSunset.jpg b/components/img/newtab/Phoyoserge_VeniseSunset.jpg deleted file mode 100644 index 2437ad576917..000000000000 Binary files a/components/img/newtab/Phoyoserge_VeniseSunset.jpg and /dev/null differ diff --git a/components/img/newtab/Phoyoserge_Yosemite.jpg b/components/img/newtab/Phoyoserge_Yosemite.jpg deleted file mode 100644 index 938559ef467f..000000000000 Binary files a/components/img/newtab/Phoyoserge_Yosemite.jpg and /dev/null differ diff --git a/components/img/newtab/bookmarks_btn.svg b/components/img/newtab/bookmarks_btn.svg index 1f5268a23031..f97aee43d7dc 100644 --- a/components/img/newtab/bookmarks_btn.svg +++ b/components/img/newtab/bookmarks_btn.svg @@ -1,47 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/components/img/newtab/dksfoto1.jpg b/components/img/newtab/dksfoto1.jpg deleted file mode 100644 index 163b07ac3718..000000000000 Binary files a/components/img/newtab/dksfoto1.jpg and /dev/null differ diff --git a/components/img/newtab/dksfoto10.jpg b/components/img/newtab/dksfoto10.jpg deleted file mode 100644 index 2f73ac0510e4..000000000000 Binary files a/components/img/newtab/dksfoto10.jpg and /dev/null differ diff --git a/components/img/newtab/dksfoto11.jpg b/components/img/newtab/dksfoto11.jpg deleted file mode 100644 index 6b8c821d7cb8..000000000000 Binary files a/components/img/newtab/dksfoto11.jpg and /dev/null differ diff --git a/components/img/newtab/dksfoto2.jpg b/components/img/newtab/dksfoto2.jpg deleted file mode 100644 index 711755f0f352..000000000000 Binary files a/components/img/newtab/dksfoto2.jpg and /dev/null differ diff --git a/components/img/newtab/dksfoto3.jpg b/components/img/newtab/dksfoto3.jpg deleted file mode 100644 index 0ea68261d505..000000000000 Binary files a/components/img/newtab/dksfoto3.jpg and /dev/null differ diff --git a/components/img/newtab/dksfoto4.jpg b/components/img/newtab/dksfoto4.jpg deleted file mode 100644 index 957ddb0fe72c..000000000000 Binary files a/components/img/newtab/dksfoto4.jpg and /dev/null differ diff --git a/components/img/newtab/dksfoto5.jpg b/components/img/newtab/dksfoto5.jpg deleted file mode 100644 index a7a8bf6b4f6f..000000000000 Binary files a/components/img/newtab/dksfoto5.jpg and /dev/null differ diff --git a/components/img/newtab/dksfoto6.jpg b/components/img/newtab/dksfoto6.jpg deleted file mode 100644 index 0942fd9dc205..000000000000 Binary files a/components/img/newtab/dksfoto6.jpg and /dev/null differ diff --git a/components/img/newtab/dksfoto7.jpg b/components/img/newtab/dksfoto7.jpg deleted file mode 100644 index 88f3dceab7ba..000000000000 Binary files a/components/img/newtab/dksfoto7.jpg and /dev/null differ diff --git a/components/img/newtab/dksfoto8.jpg b/components/img/newtab/dksfoto8.jpg deleted file mode 100644 index bd876eb6e086..000000000000 Binary files a/components/img/newtab/dksfoto8.jpg and /dev/null differ diff --git a/components/img/newtab/dksfoto9.jpg b/components/img/newtab/dksfoto9.jpg deleted file mode 100644 index d86183681afa..000000000000 Binary files a/components/img/newtab/dksfoto9.jpg and /dev/null differ diff --git a/components/img/newtab/history_btn.svg b/components/img/newtab/history_btn.svg index 850dc6fadf9e..05192821e9a2 100644 --- a/components/img/newtab/history_btn.svg +++ b/components/img/newtab/history_btn.svg @@ -1,13 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/components/img/newtab/newtab_stock_image.jpg b/components/img/newtab/newtab_stock_image.jpg deleted file mode 100644 index e49b22e7ce65..000000000000 Binary files a/components/img/newtab/newtab_stock_image.jpg and /dev/null differ diff --git a/components/img/newtab/ntp-1.webp b/components/img/newtab/ntp-1.webp new file mode 100644 index 000000000000..dcd6bcce7bd4 Binary files /dev/null and b/components/img/newtab/ntp-1.webp differ diff --git a/components/img/newtab/ntp-10.webp b/components/img/newtab/ntp-10.webp new file mode 100644 index 000000000000..bcb60a9c41bf Binary files /dev/null and b/components/img/newtab/ntp-10.webp differ diff --git a/components/img/newtab/ntp-11.webp b/components/img/newtab/ntp-11.webp new file mode 100644 index 000000000000..8a8fa5051121 Binary files /dev/null and b/components/img/newtab/ntp-11.webp differ diff --git a/components/img/newtab/ntp-12.webp b/components/img/newtab/ntp-12.webp new file mode 100644 index 000000000000..7c4f1ce428db Binary files /dev/null and b/components/img/newtab/ntp-12.webp differ diff --git a/components/img/newtab/ntp-13.webp b/components/img/newtab/ntp-13.webp new file mode 100644 index 000000000000..c9678e6bf475 Binary files /dev/null and b/components/img/newtab/ntp-13.webp differ diff --git a/components/img/newtab/ntp-14.webp b/components/img/newtab/ntp-14.webp new file mode 100644 index 000000000000..14e329adc876 Binary files /dev/null and b/components/img/newtab/ntp-14.webp differ diff --git a/components/img/newtab/ntp-15.webp b/components/img/newtab/ntp-15.webp new file mode 100644 index 000000000000..703217333f9c Binary files /dev/null and b/components/img/newtab/ntp-15.webp differ diff --git a/components/img/newtab/ntp-16.webp b/components/img/newtab/ntp-16.webp new file mode 100644 index 000000000000..7b0f90cbd92b Binary files /dev/null and b/components/img/newtab/ntp-16.webp differ diff --git a/components/img/newtab/ntp-2.webp b/components/img/newtab/ntp-2.webp new file mode 100644 index 000000000000..4ba44f14964a Binary files /dev/null and b/components/img/newtab/ntp-2.webp differ diff --git a/components/img/newtab/ntp-3.webp b/components/img/newtab/ntp-3.webp new file mode 100644 index 000000000000..036213b78aee Binary files /dev/null and b/components/img/newtab/ntp-3.webp differ diff --git a/components/img/newtab/ntp-4.webp b/components/img/newtab/ntp-4.webp new file mode 100644 index 000000000000..5a584893f322 Binary files /dev/null and b/components/img/newtab/ntp-4.webp differ diff --git a/components/img/newtab/ntp-5.webp b/components/img/newtab/ntp-5.webp new file mode 100644 index 000000000000..686853b91eba Binary files /dev/null and b/components/img/newtab/ntp-5.webp differ diff --git a/components/img/newtab/ntp-6.webp b/components/img/newtab/ntp-6.webp new file mode 100644 index 000000000000..0bbf59a581f5 Binary files /dev/null and b/components/img/newtab/ntp-6.webp differ diff --git a/components/img/newtab/ntp-7.webp b/components/img/newtab/ntp-7.webp new file mode 100644 index 000000000000..c401a76cf431 Binary files /dev/null and b/components/img/newtab/ntp-7.webp differ diff --git a/components/img/newtab/ntp-8.webp b/components/img/newtab/ntp-8.webp new file mode 100644 index 000000000000..9bc46e9da50d Binary files /dev/null and b/components/img/newtab/ntp-8.webp differ diff --git a/components/img/newtab/ntp-9.webp b/components/img/newtab/ntp-9.webp new file mode 100644 index 000000000000..a8304ad095b0 Binary files /dev/null and b/components/img/newtab/ntp-9.webp differ diff --git a/components/img/newtab/settings_prefs_btn.svg b/components/img/newtab/settings_prefs_btn.svg index fcc74d5820c3..5bd0b2274e78 100644 --- a/components/img/newtab/settings_prefs_btn.svg +++ b/components/img/newtab/settings_prefs_btn.svg @@ -1,14 +1 @@ - - - - - - + \ No newline at end of file diff --git a/components/img/newtab/topsites/bookmark-o.svg b/components/img/newtab/topsites/bookmark-o.svg new file mode 100644 index 000000000000..9a91b363654d --- /dev/null +++ b/components/img/newtab/topsites/bookmark-o.svg @@ -0,0 +1,17 @@ + + + + minus + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/components/img/newtab/topsites/bookmark.svg b/components/img/newtab/topsites/bookmark.svg new file mode 100644 index 000000000000..05611d585ac9 --- /dev/null +++ b/components/img/newtab/topsites/bookmark.svg @@ -0,0 +1,17 @@ + + + + minus + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/components/img/newtab/topsites/close.svg b/components/img/newtab/topsites/close.svg new file mode 100644 index 000000000000..a431c83e304a --- /dev/null +++ b/components/img/newtab/topsites/close.svg @@ -0,0 +1,11 @@ + + + + minus + Created with Sketch. + + + + + + \ No newline at end of file diff --git a/components/img/newtab/topsites/pin-o.svg b/components/img/newtab/topsites/pin-o.svg new file mode 100644 index 000000000000..d5b2bff7a711 --- /dev/null +++ b/components/img/newtab/topsites/pin-o.svg @@ -0,0 +1,17 @@ + + + + minus + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/components/img/newtab/topsites/pin.svg b/components/img/newtab/topsites/pin.svg new file mode 100644 index 000000000000..630402f822e8 --- /dev/null +++ b/components/img/newtab/topsites/pin.svg @@ -0,0 +1,17 @@ + + + + minus + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/components/img/newtab/topsites_btn_1.svg b/components/img/newtab/topsites_btn_1.svg deleted file mode 100644 index 559f29f41901..000000000000 --- a/components/img/newtab/topsites_btn_1.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - diff --git a/components/img/newtab/topsites_btn_2.svg b/components/img/newtab/topsites_btn_2.svg deleted file mode 100644 index d345fb02394d..000000000000 --- a/components/img/newtab/topsites_btn_2.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - diff --git a/components/img/newtab/topsites_btn_3.svg b/components/img/newtab/topsites_btn_3.svg deleted file mode 100644 index 8cf855ec68b4..000000000000 --- a/components/img/newtab/topsites_btn_3.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - diff --git a/components/resources/brave_components_resources.grd b/components/resources/brave_components_resources.grd index 54473554d803..872f4ac84d32 100644 --- a/components/resources/brave_components_resources.grd +++ b/components/resources/brave_components_resources.grd @@ -11,8 +11,7 @@ - + @@ -33,28 +32,25 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd index 531a6e3fd7a0..25b5ec004021 100644 --- a/components/resources/brave_components_strings.grd +++ b/components/resources/brave_components_strings.grd @@ -122,7 +122,7 @@ Trackers Blocked HTTPS Upgrades Estimated Time Saved - Thumb Removed. + Top site removed. Undo Restore All second diff --git a/components/styles/common.less b/components/styles/common.less index 920886022397..c864df4fbca7 100644 --- a/components/styles/common.less +++ b/components/styles/common.less @@ -14,7 +14,7 @@ } html, body, #appContainer, #appContainer > div { - height: 100%; + height: 100vh; } body { diff --git a/components/styles/newtab.less b/components/styles/newtab.less index ab468178dfaf..d3c56dc659e5 100644 --- a/components/styles/newtab.less +++ b/components/styles/newtab.less @@ -2,490 +2,342 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -@import "./animations.less"; -@import "./common.less"; - +@import './animations.less'; +@import './common.less'; * { - box-sizing: border-box; - // undo global override from common.less - // and allow typography to flow from parent to descendent - font-family: inherit; - font-weight: inherit; + box-sizing: border-box; // undo global override from common.less + // and allow typography to flow from parent to descendent + font-family: inherit; + font-weight: inherit; } - -strong, div, span, li, em, p, a { - font-family: inherit; - font-weight: inherit; - -webkit-font-smoothing: antialiased; // light text on dark backgrounds on macOS looks better with this +strong, +div, +span, +li, +em, +p, +a { + font-family: inherit; + font-weight: inherit; + -webkit-font-smoothing: antialiased; // light text on dark backgrounds on macOS looks better with this } body { - background: #fff; + background: #1f1f1f; } -body, .dynamicBackground, bgGradient { - opacity: 0; - animation: fadeIn 200ms; - animation-fill-mode: forwards; +body, +.dynamicBackground { + bgGradient { + opacity: 0; + animation: fadeIn 300ms; + animation-fill-mode: forwards; + } } .copyrightNotice { - user-select: none; - cursor: default; + user-select: none; + cursor: pointer; } a { - text-decoration: none; + text-decoration: none; } ul { - display: inline-block; - li { display: inline-block; - vertical-align: middle; - list-style-type: none; - } + li { + display: inline-block; + vertical-align: middle; + list-style-type: none; + } } .dynamicBackground { - background-position: top center; - background-repeat: no-repeat; - background-size: cover; - display: flex; - flex: 1; - - > img { - display: none; - } -} - -.gradient { - background: radial-gradient(circle farthest-corner at right bottom,#ff4444 0,rgb(9, 14, 160) 100%); - height: 100%; - left: 0; - position: absolute; - top: 0; - width: 100%; + background-position: top center; + background-repeat: no-repeat; + background-size: cover; + >img { + display: none; + } } .bgGradient { - position: absolute; - top: 0; - left: 0; - width: 100%; - background: linear-gradient(rgba(0, 0, 0, 1), rgba(0, 0, 0, 0)); - height: 400px; + position: absolute; + top: 0; + left: 0; + width: 100vw; + background: linear-gradient( rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0) 35%, rgba(0, 0, 0, 0) 80%, rgba(0, 0, 0, 0.6) 100%); + height: 100vh; } -.content { - position: relative; - z-index: 2; - top: 0; - left: 0; - display: flex; - flex: 1; - flex-direction: column; - justify-content: space-between; - height: 100%; - min-height: 100vh; - padding: 40px 60px; - - .topSitesContainer { - width: 100%; - text-align: right; - - .toggleTopSitesGridIcon { - outline: none; - background: 0 0 / contain no-repeat; - display: flex; - border: 0; - margin-left: auto; - width: 30px; - height: 30px; - font-size: 30px; - margin-bottom: 20px; - transition: @transitionFast; - cursor: default; - - &.hasThreeRows { - background: url('../img/newtab/topsites_btn_3.svg'); - } - &.hasTwoRows { - background: url('../img/newtab/topsites_btn_2.svg'); - } - &.hasOneRow { - background: url('../img/newtab/topsites_btn_1.svg'); - } - } - - .topSitesGrid { - max-width: 510px; - display: inline-block; - text-align: left; - width: 100%; - - .topSiteSquareSpace { - margin-left: 5px; - margin-bottom: 5px; - display: inline-block; - vertical-align: middle; - } - - .topSitesElement { - transition: @transitionFast; - position: relative; - box-shadow: 2px 2px 6px rgba(0,0,0,0.5); - border-radius: 4px; +.bookmark { + background-image: url('../img/newtab/topsites/bookmark.svg'); +} - &:hover { - box-shadow: 3px 3px 9px rgba(0, 0, 0, 0.8); +.bookmark-o { + background-image: url('../img/newtab/topsites/bookmark-o.svg'); +} - .topSitesActionContainer { - visibility: visible; - opacity: 1; - } - } +.pin { + background-image: url('../img/newtab/topsites/pin.svg'); +} - .topSitesActionContainer { - transition: @transitionFast; - visibility: hidden; - opacity: 0; - position: absolute; - z-index: 3; - top: 3px; - left: 0; - right: 0; - margin: auto; - padding: 3px; - max-width: 90%; - display: flex; - justify-content: space-between; - background-color: rgba(255, 255, 255, 0.5); - border-radius: @borderRadius; +.pin-o { + background-image: url('../img/newtab/topsites/pin-o.svg'); +} - .topSitesActionBtn { - transition: @transitionFast; - width: 14px; - height: 14px; - font-size: 14px; - outline: none; - border: none; - background-color: transparent; - color: @black50; - &:hover { - color: black; - } - } - } +.close { + background-image: url('../img/newtab/topsites/close.svg'); +} - .topSitesElementFavicon { - position: relative; - background-color: @defaultIconBackground; - border-radius: @borderRadius; - color: @gray; - display: flex; - align-items: center; - justify-content: center; - width: 80px; - height: 80px; - font-size: 38px; +.icon-container { + width: 12px; + height: 12px; + border: none; + cursor: pointer; +} - // Add an opacity layer on top of tile - // to avoid backgrounds with the same color as icon - // (as seen on issue #5868) - &:before { - content: ''; - position: absolute; - top: 0; - left: 0; +.content { + position: relative; + display: flex; + flex-direction: column; + justify-content: space-between; + min-height: 100vh; + padding: 70px; + .topSitesContainer { + width: 100%; + .topSitesGrid { + display: inline-block; + text-align: left; width: 100%; - height: 100%; - background-color: #fff; - opacity: 0.15; - z-index: 0; - border-radius: 4px; - } - - .pinnedTopSite { - transition: @transitionFast; - opacity: 1; - visibility: visible; - position: absolute; - top: 4px; - left: 4px; - width: 20px; - height: 20px; - background-color: @gray25; - border-radius: 100%; - display: flex; - align-items: center; - justify-content: center; - z-index: 2; - - .pin { - font-size: 10px; - color: black; + .topSiteSquareSpace { + margin: 4px; + display: inline-block; + vertical-align: middle; + } + .topSitesElement { + transition: @transitionFast; + position: relative; + box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2); + border-radius: 8px; + &:hover { + box-shadow: 3px 3px 6px rgba(0, 0, 0, 0.4); + .topSitesActionContainer { + visibility: visible; + opacity: 1; + } + } + .topSitesActionContainer { + transition: @transitionFast; + visibility: hidden; + opacity: 0; + position: absolute; + z-index: 3; + top: 3px; + left: 0; + right: 0; + margin: auto; + padding: 3px; + max-width: 90%; + display: flex; + justify-content: space-between; + .topSitesActionBtn { + transition: @transitionFast; + color: #424242; + height: 12px; + width: 12px; + outline: none; + background-color: transparent; + border: none; + opacity: .7; + &:hover { + opacity: 1; + cursor: pointer; + } + } + } + .topSitesElementFavicon { + background-color: rgba(255, 255, 255, .8); + position: relative; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + width: 80px; + height: 80px; + font-size: 38px; // Add an opacity layer on top of tile + // to avoid backgrounds with the same color as icon + // (as seen on issue #5868) + &:before { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: #fff; + opacity: 0.15; + z-index: 0; + border-radius: 4px; + } + .pinnedTopSite { + transition: @transitionFast; + opacity: 1; + visibility: visible; + position: absolute; + top: 6px; + left: 6px; + display: flex; + align-items: center; + justify-content: center; + z-index: 2; + } + img { + position: relative; + z-index: 3; + max-width: 32px; + max-height: 32px; + } + } + &:hover { + .pinnedTopSite { + opacity: 0; + visibility: hidden; + } + } } - - } - img { - position: relative; - z-index: 1; - max-width: 64px; - max-height: 64px; - } - } - &:hover { - .pinnedTopSite { - opacity: 0; - visibility: hidden; - } } - } } - } - - .siteRemovalNotification { - @typography-display(); - border-radius: @borderRadius; - box-shadow: 2px 2px 6px rgba(0,0,0,0.5); - background-color: #fff; - width: 500px; - height: 100px; - display: flex; - align-items: center; - justify-content: center; - margin: auto; - - .notification { - user-select: none; - cursor: default; - } - - .notificationText, .siteRemovalAction { - margin: 0 6px; + .statsContainer { + display: flex; } - - .siteRemovalAction { - color: @braveOrange; - text-decoration: underline; - cursor: pointer; + .clockContainer { + display: flex; + margin-left: auto; + @media (max-width: 830px) { + margin: 0 0 30px 0; + } } - - .fa-close { - color: @statsRed; - margin-left: 12px; - border: 0; - background-color: transparent; + .newTabStats { + display: flex; + margin: 0 0 30px 0; + @media (max-width: 830px) { + flex-direction: column-reverse; + } } - } - - .footerContainer { - display: flex; - justify-content: space-between; - - .copyrightNotice { - display: flex; - flex-direction: column; - align-items: flex-start; - justify-content: center; - line-height: 1.3; - - .copyrightCredits { + .siteRemovalNotification { @typography-display(); - - &, .photoBy, .copyrightOwner { - color: #fff; - font-size: 13px; - text-transform: uppercase; - } - - .copyrightOwner { - font-weight: 700; - &:hover { - text-decoration: underline; - } + border-radius: 8px; + box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.3); + background-color: #fff; + width: 500px; + height: 100px; + display: flex; + align-items: center; + justify-content: center; + margin: auto; + .notification { + user-select: none; } - .copyRightYear { - position: relative; - &:after { - position: absolute; - right: 0; - content: '©'; - } + .notificationText, + .siteRemovalAction { + margin: 0 16px; + text-decoration: none; + cursor: pointer; + color: #fb542b; } - } - - .photoName { - @typography-display(); - letter-spacing: @typographyDisplayMediumSpacing; - color: @white50; - font-size: 23px; - } } - - .shortcutsContainer { - display: flex; - - .shortcutIcon { + .footerContainer { display: flex; - width: 35px; - height: 35px; - margin: 15px 5px; - cursor: default; - background-color: white; - -webkit-mask-repeat: no-repeat; - - &:hover { - background-color: @gray; - } - - &.settingsIcon { - -webkit-mask-image: url('../img/newtab/settings_prefs_btn.svg'); - } - &.bookmarksIcon { - -webkit-mask-image: url('../img/newtab/bookmarks_btn.svg'); + justify-content: space-between; + .copyrightNotice { + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: center; + .copyrightCredits { + @typography-body(); + font-weight: 300; + &, + .photoBy, + .copyrightOwner { + color: #fff; + font-size: 12px; + text-transform: none; + opacity: 0.6; + font-weight: 800; + transition: opacity 0.15s ease, filter 0.15s ease; + } + .copyrightOwner { + &:hover { + opacity: 0.95; + } + } + } } - &.historyIcon { - -webkit-mask-image: url('../img/newtab/history_btn.svg'); + .shortcutsContainer { + display: flex; + .shortcutIcon { + display: flex; + width: 24px; + height: 24px; + margin: 12px; + cursor: pointer; + background-color: #fff; + opacity: 0.7; + transition: opacity 0.15s ease, filter 0.15s ease; + -webkit-mask-repeat: no-repeat; + &:hover { + opacity: 0.95; + } + &.settingsIcon { + -webkit-mask-image: url('../img/newtab/settings_prefs_btn.svg'); + mask-image: url('../img/newtab/settings_prefs_btn.svg'); + } + &.bookmarksIcon { + -webkit-mask-image: url('../img/newtab/bookmarks_btn.svg'); + mask-image: url('../img/newtab/settings_prefs_btn.svg'); + } + &.historyIcon { + -webkit-mask-image: url('../img/newtab/history_btn.svg'); + mask-image: url('../img/newtab/settings_prefs_btn.svg'); + } + } } - } } - } } -.statsBar { - @typography-display(); - width: 100%; - padding: 40px 0; - display: flex; - justify-content: space-between; - - .statsBlock { - margin-right: 40px; - margin-bottom: 20px; - - span { - display: block; - } - - .counter { - letter-spacing: @typographyDisplayLargeSpacing; - font-size: 44px; - line-height: 53px; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - max-width: 200px; - - &.trackers { - color: @statsOrange; - } - &.ads { - color: @statsRed; - } - &.https { - color: @statsBlue; - } - &.timeSaved { - color: @statsLightGray; - display: flex; - align-items: baseline; - } - - .text { - display: inline; - color: @statsLightGray; - font-size: 20px; - letter-spacing: 0; - line-height: 24px; - margin-left: 3px; - } - } - - .statsText { - font-size: 13px; - color: #fff; - } - } - - .clock { - line-height: 1; - user-select: none; - display: flex; - cursor: default; - - .time { - letter-spacing: 0; - font-size: 75px; - font-weight: 200; - color: #fff; - display: inline-flex; - } - - .timePeriod { - color: #fff; - display: inline-block; - font-size: 20px; - letter-spacing: @typographyDisplayMediumSpacing; - font-weight: 400; - margin-top: 8px; - margin-left: 3px; - vertical-align: top; +@media (max-width: 730px) { + .dynamicBackground { + height: initial !important; } - - .timeSeparator { - color: #fff; - // center colon vertically in the text-content line - margin-top: -0.1em; + .content { + min-height: 100vh; } - - .dayTime { - font-size: 51px; - color: #fff; + .statsBar { + flex-direction: column-reverse; + padding-top: 0; + .statsBlock { + margin: 0 0 15px; + width: 50%; + padding-right: 20px; + } + .clock { + display: flex; + flex: 1; + justify-content: center; + padding-bottom: 20px; + } } - } } - -@media (max-width: 730px) { - .dynamicBackground { - min-height: 100%; - height: initial !important; - } - - .content { - // default typography if not specified in element ancestor hierarchy - font-family: "Helvetica Neue", Arial, sans-serif; - font-weight: 400; - min-height: 100%; - - main { - margin-bottom: 20px; - } - - .topSitesContainer { - text-align: center; - padding-bottom: 20px; +@media (max-width: 680px) { + .content { + padding: 40px; } - } - - .statsBar { - flex-direction: column-reverse; - padding-top: 0; - - .statsBlock { - margin: 0 0 15px; - width: 50%; - padding-right: 20px; + .bgGradient { + background: linear-gradient( rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0) 60%, rgba(0, 0, 0, 0) 80%, rgba(0, 0, 0, 0.6) 100%); } - - .clock { - display: flex; - flex: 1; - justify-content: center; - padding-bottom: 20px; - } - } -} +} \ No newline at end of file diff --git a/components/styles/variables.less b/components/styles/variables.less index a6123b1e7f0e..ae8ba85c61cc 100644 --- a/components/styles/variables.less +++ b/components/styles/variables.less @@ -166,15 +166,15 @@ @transitionEase: all 600ms ease; @transitionFastEase: all 100ms ease; @transitionSlowEase: all 1s ease; +// Colors used for stats on: +// - Bravery panel +// - about:newtab +@statsYellow: #ffc000; +@statsOrange: #f39030; +@statsRed: #fe521d; +@statsBlue: #0796fa; +@statsLightGray: #999999; -// Colors used for stats on: -// - Bravery panel -// - about:newtab -@statsYellow: #ffc000; -@statsOrange: #f39030; -@statsRed: #fe521d; -@statsBlue: #0796fa; -@statsLightGray: #999999; @defaultIconBackground: #F7F7F7;