Skip to content

Commit

Permalink
Revert "Merge pull request #4357 from brave/bsc-revert-ntp-backgrounds"
Browse files Browse the repository at this point in the history
This change reverts the commit that reverted the addition of new NTP images.

This reverts commit 721b4f0, reversing
changes made to fd3b8ce.
  • Loading branch information
cezaraugusto authored and bsclifton committed Mar 5, 2020
1 parent 971ee9c commit a91f755
Show file tree
Hide file tree
Showing 34 changed files with 127 additions and 131 deletions.
32 changes: 15 additions & 17 deletions browser/ui/webui/brave_webui_source.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,6 @@ void CustomizeWebUIHTMLSource(const std::string &name,
{ "6c337c63662ee0ba4e57f6f8156d69ce.svg", IDR_BRAVE_NEW_TAB_IMG2 },
// New tab Backgrounds
#if !defined(OS_ANDROID)
{ "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 },
{ "ntp-dummy-brandedwallpaper/wallpaper-0.jpg",
IDR_BRAVE_NEW_TAB_DUMMY_BRANDED_WALLPAPER_BG_1 },
{ "ntp-dummy-brandedwallpaper/wallpaper-1.jpg",
Expand All @@ -88,7 +72,21 @@ void CustomizeWebUIHTMLSource(const std::string &name,
IDR_BRAVE_NEW_TAB_DUMMY_BRANDED_WALLPAPER_BG_3 },
{ "ntp-dummy-brandedwallpaper/logo.png",
IDR_BRAVE_NEW_TAB_DUMMY_BRANDED_WALLPAPER_LOGO },
#endif
{ "anders-jilden.webp", IDR_BRAVE_NEW_TAB_BACKGROUND1 },
{ "andreas-gucklhorn.webp", IDR_BRAVE_NEW_TAB_BACKGROUND2 },
{ "andy-mai.webp", IDR_BRAVE_NEW_TAB_BACKGROUND3 },
{ "annie-spratt.webp", IDR_BRAVE_NEW_TAB_BACKGROUND4 },
{ "anton-repponen.webp", IDR_BRAVE_NEW_TAB_BACKGROUND5 },
{ "ben-karpinski.webp", IDR_BRAVE_NEW_TAB_BACKGROUND6 },
{ "dc-cavalleri.webp", IDR_BRAVE_NEW_TAB_BACKGROUND7 },
{ "joe-gardner.webp", IDR_BRAVE_NEW_TAB_BACKGROUND8 },
{ "louis-kim.webp", IDR_BRAVE_NEW_TAB_BACKGROUND9 },
{ "matt-palmer.webp", IDR_BRAVE_NEW_TAB_BACKGROUND10 },
{ "oliwier-gesla.webp", IDR_BRAVE_NEW_TAB_BACKGROUND11 },
{ "svalbard-jerol-soibam.webp", IDR_BRAVE_NEW_TAB_BACKGROUND12 },
{ "will-christiansen-glacier-peak.webp", IDR_BRAVE_NEW_TAB_BACKGROUND13 },
{ "will-christiansen-ice.webp", IDR_BRAVE_NEW_TAB_BACKGROUND14 },
{ "xavier-balderas-cejudo.webp", IDR_BRAVE_NEW_TAB_BACKGROUND15 },
// private tab
{ "c168145d6bf1abf2c0322636366f7dbe.svg", IDR_BRAVE_PRIVATE_TAB_TOR_IMG }, // NOLINT
{ "dbdc336ccc651b8a7c925b3482d6e65a.svg", IDR_BRAVE_PRIVATE_TAB_IMG }
Expand Down
195 changes: 97 additions & 98 deletions components/brave_new_tab_ui/data/backgrounds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,133 +2,132 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/. */

// 'name': '1',
// 'source': 'ntp-1.webp',
// 'author': 'Pok Rie',
// 'link': 'https://www.pexels.com/@pok-rie-33563',
// 'originalUrl': 'https://www.pexels.com/photo/red-white-and-blue-abstract-painting-1045850/',
// 'license': 'https://www.pexels.com/photo-license/'

export const images: NewTab.Image[] = [
{
'name': '1',
'source': 'ntp-1.webp',
'author': 'Pok Rie',
'link': 'https://www.pexels.com/@pok-rie-33563',
'originalUrl': 'https://www.pexels.com/photo/red-white-and-blue-abstract-painting-1045850/',
'license': 'https://www.pexels.com/photo-license/'
},
{
'name': '2',
'source': 'ntp-2.webp',
'author': 'Jack Millard',
'link': 'https://unsplash.com/@millarjb',
'originalUrl': 'https://unsplash.com/photos/zjyP-UYI-ko',
'license': 'https://unsplash.com/license'
'name': 'ntp-fall-2019-1',
'source': 'anders-jilden.webp',
'author': 'Anders Jildén',
'link': 'https://unsplash.com/@andersjilden?utm_source=unsplash&utm_medium=referral&utm_content=credit',
'originalUrl': '',
'license': ''
},
{
'name': '3',
'source': 'ntp-3.webp',
'author': 'Buzz Andersen',
'link': 'https://unsplash.com/@ldandersen',
'originalUrl': 'https://unsplash.com/photos/E4944K_4SvI',
'license': 'https://unsplash.com/license'
'name': 'ntp-fall-2019-2',
'source': 'andreas-gucklhorn.webp',
'author': 'Andreas Gücklhorn',
'link': 'https://unsplash.com/@draufsicht?utm_source=unsplash&utm_medium=referral&utm_content=credit',
'originalUrl': '',
'license': ''
},
{
'name': '4',
'source': 'ntp-4.webp',
'author': 'Frank McKenna',
'link': 'https://unsplash.com/@frankiefoto',
'originalUrl': 'https://unsplash.com/photos/eXHeq48Z-Q4',
'license': 'https://unsplash.com/license'
'name': 'ntp-fall-2019-3',
'source': 'andy-mai.webp',
'author': 'Andy Mai',
'link': 'https://unsplash.com/@veroz?utm_source=unsplash&utm_medium=referral&utm_content=credit',
'originalUrl': '',
'license': ''
},
{
'name': '5',
'source': 'ntp-5.webp',
'author': 'SpaceX',
'link': 'https://www.flickr.com/photos/spacex/',
'originalUrl': 'https://www.flickr.com/photos/spacex/16510243060/',
'license': 'https://creativecommons.org/licenses/by-nc/2.0/'
'name': 'ntp-fall-2019-4',
'source': 'annie-spratt.webp',
'author': 'Annie Spratt',
'link': 'https://unsplash.com/@anniespratt?utm_source=unsplash&utm_medium=referral&utm_content=credit',
'originalUrl': '',
'license': ''
},
{
'name': '6',
'source': 'ntp-6.webp',
'author': 'SpaceX',
'link': 'https://www.flickr.com/photos/spacex/',
'originalUrl': 'https://www.flickr.com/photos/spacex/16236321533/',
'license': 'https://creativecommons.org/licenses/by-nc/2.0/'
'name': 'ntp-fall-2019-5',
'source': 'anton-repponen.webp',
'author': 'Anton Repponen',
'link': 'https://unsplash.com/@repponen?utm_source=unsplash&utm_medium=referral&utm_content=credit',
'originalUrl': '',
'license': ''
},
{
'name': '7',
'source': 'ntp-7.webp',
'author': 'SpaceX',
'link': 'https://www.flickr.com/photos/spacex/',
'originalUrl': 'https://www.flickr.com/photos/spacex/40126461851/',
'license': 'https://creativecommons.org/licenses/by-nc/2.0/'
'name': 'ntp-fall-2019-6',
'source': 'ben-karpinski.webp',
'author': 'Ben Karpinski',
'link': 'https://www.benkarpinski.com/landscapes',
'originalUrl': '',
'license': ''
},
{
'name': '8',
'source': 'ntp-8.webp',
'author': 'Will Christiansen',
'link': 'https://www.theskyfolk.com',
'originalUrl': 'https://www.instagram.com/p/BZRQxf9hRpw/',
'license': 'used with permission'
'name': 'ntp-fall-2019-7',
'source': 'dc-cavalleri.webp',
'author': 'D.C. Cavalleri',
'link': 'https://gradivis.com',
'originalUrl': '',
'license': ''
},
{
'name': '9',
'source': 'ntp-9.webp',
'author': 'Will Christiansen',
'link': 'https://www.theskyfolk.com',
'originalUrl': 'https://www.instagram.com/p/BI7w_dFAlR0/',
'license': 'used with permission'
'name': 'ntp-fall-2019-8',
'source': 'joe-gardner.webp',
'author': 'Joe Gardner',
'link': 'https://unsplash.com/@josephgardnerphotography?utm_source=unsplash&utm_medium=referral&utm_content=credit',
'originalUrl': '',
'license': ''
},
{
'name': '10',
'source': 'ntp-10.webp',
'author': 'Will Christiansen',
'link': 'https://www.theskyfolk.com',
'originalUrl': 'https://www.instagram.com/p/Bo9ft6LBv6V/',
'license': 'used with permission'
'name': 'ntp-fall-2019-9',
'source': 'louis-kim.webp',
'author': 'Louis Kim',
'link': 'http://louiskimphotography.com',
'originalUrl': '',
'license': ''
},
{
'name': '11',
'source': 'ntp-11.webp',
'author': 'Nout Gons',
'link': 'https://www.instagram.com/ntgns/',
'originalUrl': 'https://www.instagram.com/p/BNyaAuFBiSt/',
'license': 'used with permission'
'name': 'ntp-fall-2019-10',
'source': 'matt-palmer.webp',
'author': 'Matt Palmer',
'link': 'https://unsplash.com/@mattpalmer?utm_source=unsplash&utm_medium=referral&utm_content=credit',
'originalUrl': '',
'license': ''
},
{
'name': '12',
'source': 'ntp-12.webp',
'author': 'Artem Bali',
'link': 'https://www.pexels.com/@belart84',
'originalUrl': 'https://www.pexels.com/photo/aerial-view-of-seashore-near-large-grey-rocks-853199/',
'license': 'https://www.pexels.com/photo-license/'
'name': 'ntp-fall-2019-11',
'source': 'oliwier-gesla.webp',
'author': 'Oliwier Gesla',
'link': 'https://www.instagram.com/oliwiergesla/',
'originalUrl': '',
'license': ''
},
{
'name': '13',
'source': 'ntp-13.webp',
'author': 'Hristo Fidanov',
'link': 'https://www.pexels.com/@hristo-fidanov-520662',
'originalUrl': 'https://www.pexels.com/photo/scenic-view-of-forest-during-night-time-1252869/',
'license': 'https://www.pexels.com/photo-license/'
'name': 'ntp-fall-2019-12',
'source': 'svalbard-jerol-soibam.webp',
'author': 'Jerol Soibam',
'link': 'https://www.instagram.com/jerol_soibam',
'originalUrl': '',
'license': ''
},
{
'name': '14',
'source': 'ntp-14.webp',
'author': 'Life of Pix',
'link': 'https://www.pexels.com/@life-of-pix',
'originalUrl': 'https://www.pexels.com/photo/bridge-california-cliff-golden-gate-bridge-7653/',
'license': 'https://www.pexels.com/photo-license/'
'name': 'ntp-fall-2019-13',
'source': 'will-christiansen-glacier-peak.webp',
'author': 'Will Christiansen',
'link': 'www.theskyfolk.com',
'originalUrl': '',
'license': ''
},
{
'name': '15',
'source': 'ntp-15.webp',
'author': 'Cassie Boca',
'link': 'https://unsplash.com/@cassieboca',
'originalUrl': 'https://unsplash.com/photos/gFyy2Po7T-k',
'license': 'https://unsplash.com/license'
'name': 'ntp-fall-2019-14',
'source': 'will-christiansen-ice.webp',
'author': 'Will Christiansen',
'link': 'www.theskyfolk.com',
'originalUrl': '',
'license': ''
},
{
'name': '16',
'source': 'ntp-16.webp',
'author': 'Braden Jarvis',
'link': 'https://unsplash.com/@jarvisphoto',
'originalUrl': 'https://unsplash.com/photos/prSogOoFmkw',
'license': 'https://unsplash.com/license'
'name': 'ntp-fall-2019-15',
'source': 'xavier-balderas-cejudo.webp',
'author': 'Xavier Balderas Cejudo',
'link': 'https://unsplash.com/@xavibalderas?utm_source=unsplash&utm_medium=referral&utm_content=credit',
'originalUrl': '',
'license': ''
}
]
Binary file not shown.
Binary file not shown.
Binary file added components/img/newtab/backgrounds/andy-mai.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added components/img/newtab/backgrounds/louis-kim.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed components/img/newtab/ntp-1.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-10.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-11.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-12.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-13.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-14.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-15.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-16.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-2.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-3.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-4.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-5.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-6.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-7.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-8.webp
Binary file not shown.
Binary file removed components/img/newtab/ntp-9.webp
Binary file not shown.
31 changes: 15 additions & 16 deletions components/resources/brave_components_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,25 @@

<!-- Imagery links -->
<if expr="not is_android">
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND1" file="../img/newtab/ntp-1.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND2" file="../img/newtab/ntp-2.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND3" file="../img/newtab/ntp-3.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND4" file="../img/newtab/ntp-4.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND5" file="../img/newtab/ntp-5.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND6" file="../img/newtab/ntp-6.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND7" file="../img/newtab/ntp-7.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND8" file="../img/newtab/ntp-8.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND9" file="../img/newtab/ntp-9.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND10" file="../img/newtab/ntp-10.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND11" file="../img/newtab/ntp-11.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND12" file="../img/newtab/ntp-12.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND13" file="../img/newtab/ntp-13.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND14" file="../img/newtab/ntp-14.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND15" file="../img/newtab/ntp-15.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND16" file="../img/newtab/ntp-16.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_DUMMY_BRANDED_WALLPAPER_BG_1" file="../img/newtab/dummy-branded-wallpaper/background-1.jpg" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_DUMMY_BRANDED_WALLPAPER_BG_2" file="../img/newtab/dummy-branded-wallpaper/background-2.jpg" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_DUMMY_BRANDED_WALLPAPER_BG_3" file="../img/newtab/dummy-branded-wallpaper/background-3.jpg" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_DUMMY_BRANDED_WALLPAPER_LOGO" file="../img/newtab/dummy-branded-wallpaper/logo.png" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND1" file="../img/newtab/backgrounds/anders-jilden.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND2" file="../img/newtab/backgrounds/andreas-gucklhorn.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND3" file="../img/newtab/backgrounds/andy-mai.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND4" file="../img/newtab/backgrounds/annie-spratt.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND5" file="../img/newtab/backgrounds/anton-repponen.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND6" file="../img/newtab/backgrounds/ben-karpinski.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND7" file="../img/newtab/backgrounds/dc-cavalleri.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND8" file="../img/newtab/backgrounds/joe-gardner.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND9" file="../img/newtab/backgrounds/louis-kim.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND10" file="../img/newtab/backgrounds/matt-palmer.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND11" file="../img/newtab/backgrounds/oliwier-gesla.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND12" file="../img/newtab/backgrounds/svalbard-jerol-soibam.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND13" file="../img/newtab/backgrounds/will-christiansen-glacier-peak.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND14" file="../img/newtab/backgrounds/will-christiansen-ice.webp" type="BINDATA" />
<include name="IDR_BRAVE_NEW_TAB_BACKGROUND15" file="../img/newtab/backgrounds/xavier-balderas-cejudo.webp" type="BINDATA" />
</if>

<!-- WebUI private new tab resources -->
Expand Down

0 comments on commit a91f755

Please sign in to comment.