Skip to content

Commit

Permalink
Merge pull request #4357 from brave/bsc-revert-ntp-backgrounds
Browse files Browse the repository at this point in the history 
Reverting fall/winter NTP images as there were quality images with them
  • Loading branch information
@bsclifton
bsclifton authored Jan 10, 2020
2 parents fd3b8ce + 3f95fb9 commit 721b4f0
Show file tree
Hide file tree
Showing 36 changed files with 195 additions and 177 deletions.
31 changes: 16 additions & 15 deletions browser/ui/webui/brave_webui_source.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,22 @@ void CustomizeWebUIHTMLSource(const std::string &name,
{ "314e7529efec41c8867019815f4d8dad.svg", IDR_BRAVE_NEW_TAB_IMG4 },
{ "6c337c63662ee0ba4e57f6f8156d69ce.svg", IDR_BRAVE_NEW_TAB_IMG2 },
// New tab Backgrounds
{ "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 },
{ "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 }, // NOLINT
Expand Down
86 changes: 45 additions & 41 deletions components/brave_new_tab_ui/data/LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,63 @@
anders-jilden.webp:
URL: https://unsplash.com/photos/uwbajDCODj4
License: https://unsplash.com/license
ntp-1.webp:
URL: https://www.pexels.com/photo/red-white-and-blue-abstract-painting-1045850/
License: https://www.pexels.com/photo-license/

andreas-gucklhorn.webp:
URL: https://unsplash.com/photos/mawU2PoJWfU
ntp-2.webp:
URL: https://unsplash.com/photos/zjyP-UYI-ko
License: https://unsplash.com/license

andy-mai.webp:
URL: https://unsplash.com/photos/4knR_YzeUVc
ntp-3.webp:
URL: https://unsplash.com/photos/E4944K_4SvI
License: https://unsplash.com/license

annie-spratt.webp:
URL: https://unsplash.com/photos/C9jP5AlgcuQ
ntp-4.webp:
URL: https://unsplash.com/photos/eXHeq48Z-Q4
License: https://unsplash.com/license

anton-repponen.webp:
URL: https://unsplash.com/photos/sfgH9dXcMRw
License: https://unsplash.com/license
ntp-5.webp:
URL: https://www.flickr.com/photos/spacex/16510243060/
License: https://creativecommons.org/licenses/by-nc/2.0/

ben-karpinski.webp:
URL: Contributor sent the hi-res version through email
License: Used with permission
ntp-6.webp:
URL: https://www.flickr.com/photos/spacex/16236321533/
License: https://creativecommons.org/licenses/by-nc/2.0/

dc-cavalleri.webp:
URL: Contributor sent the hi-res version through email
License: Used with permission
ntp-7.webp:
URL: https://www.flickr.com/photos/spacex/40126461851/
License: https://creativecommons.org/licenses/by-nc/2.0/

joe-gardner.webp:
URL: https://unsplash.com/photos/4xv3lqnanYc
License: Used with permission
ntp-8.webp:
URL: https://www.instagram.com/p/BZRQxf9hRpw/
License: used with permission

louis-kim.webp:
URL: Contributor sent the hi-res version through email
License: Used with permission
ntp-9.webp:
URL: https://www.instagram.com/p/BI7w_dFAlR0/
License: used with permission

matt-palmer.webp:
URL: https://unsplash.com/photos/veMnvjmfoxw
License: Used with permission
ntp-10.webp:
URL: https://www.instagram.com/p/Bo9ft6LBv6V/
License: used with permission

oliwier-gesla.webp:
URL: Contributor sent the hi-res version through email
License: Used with permission
ntp-11.webp:
URL: https://www.instagram.com/p/BNyaAuFBiSt/
License: used with permission

svalbard-jerol-soibam.webp:
URL: Contributor sent the hi-res version through email
License: Used with permission
ntp-12.webp:
URL: https://www.pexels.com/photo/aerial-view-of-seashore-near-large-grey-rocks-853199/
License: https://www.pexels.com/photo-license/

will-christiansen-glacier-peak.webp:
URL: Contributor sent the hi-res version through email
License: Used with permission
ntp-13.webp:
URL: https://www.pexels.com/photo/scenic-view-of-forest-during-night-time-1252869/
License: https://www.pexels.com/photo-license/

will-christiansen-ice.webp:
URL: Contributor sent the hi-res version through email
License: Used with permission
ntp-14.webp:
URL: https://www.pexels.com/photo/bridge-california-cliff-golden-gate-bridge-7653/
License: https://www.pexels.com/photo-license/

ntp-15.webp:
URL: https://unsplash.com/photos/gFyy2Po7T-k
License: https://unsplash.com/license

xavier-balderas-cejudo.webp:
URL: https://unsplash.com/photos/kxIE049IZ1g
ntp-16.webp:
URL: https://unsplash.com/photos/prSogOoFmkw
License: https://unsplash.com/license
126 changes: 66 additions & 60 deletions components/brave_new_tab_ui/data/backgrounds.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,93 +6,99 @@

export const images: NewTab.Image[] = [
{
'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'
'name': '1',
'source': 'ntp-1.webp',
'author': 'Pok Rie',
'link': 'https://www.pexels.com/@pok-rie-33563'
},
{
'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'
'name': '2',
'source': 'ntp-2.webp',
'author': 'Jack Millard',
'link': 'https://unsplash.com/@millarjb'
},
{
'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'
'name': '3',
'source': 'ntp-3.webp',
'author': 'Buzz Andersen',
'link': 'https://unsplash.com/@ldandersen'
},
{
'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'
'name': '4',
'source': 'ntp-4.webp',
'author': 'Frank McKenna',
'link': 'https://unsplash.com/@frankiefoto'
},
{
'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'
'name': '5',
'source': 'ntp-5.webp',
'author': 'SpaceX',
'link': 'https://www.flickr.com/photos/spacex/'
},
{
'name': 'ntp-fall-2019-6',
'source': 'ben-karpinski.webp',
'author': 'Ben Karpinski',
'link': 'https://www.benkarpinski.com/landscapes'
'name': '6',
'source': 'ntp-6.webp',
'author': 'SpaceX',
'link': 'https://www.flickr.com/photos/spacex/'
},
{
'name': 'ntp-fall-2019-7',
'source': 'dc-cavalleri.webp',
'author': 'D.C. Cavalleri',
'link': 'https://gradivis.com'
'name': '7',
'source': 'ntp-7.webp',
'author': 'SpaceX',
'link': 'https://www.flickr.com/photos/spacex/'
},
{
'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'
'name': '8',
'source': 'ntp-8.webp',
'author': 'Will Christiansen',
'link': 'https://www.theskyfolk.com'
},
{
'name': 'ntp-fall-2019-9',
'source': 'louis-kim.webp',
'author': 'Louis Kim',
'link': 'http://louiskimphotography.com'
'name': '9',
'source': 'ntp-9.webp',
'author': 'Will Christiansen',
'link': 'https://www.theskyfolk.com'
},
{
'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'
'name': '10',
'source': 'ntp-10.webp',
'author': 'Will Christiansen',
'link': 'https://www.theskyfolk.com'
},
{
'name': 'ntp-fall-2019-11',
'source': 'oliwier-gesla.webp',
'author': 'Oliwier Gesla',
'link': 'https://www.instagram.com/oliwiergesla/'
'name': '11',
'source': 'ntp-11.webp',
'author': 'Nout Gons',
'link': 'https://www.instagram.com/ntgns/'
},
{
'name': 'ntp-fall-2019-12',
'source': 'svalbard-jerol-soibam.webp',
'author': 'Jerol Soibam',
'link': 'https://www.instagram.com/jerol_soibam'
'name': '12',
'source': 'ntp-12.webp',
'author': 'Artem Bali',
'link': 'https://www.pexels.com/@belart84'
},
{
'name': 'ntp-fall-2019-13',
'source': 'will-christiansen-glacier-peak.webp',
'author': 'Will Christiansen',
'link': 'www.theskyfolk.com'
'name': '13',
'source': 'ntp-13.webp',
'author': 'Hristo Fidanov',
'link': 'https://www.pexels.com/@hristo-fidanov-520662'
},
{
'name': 'ntp-fall-2019-14',
'source': 'will-christiansen-ice.webp',
'author': 'Will Christiansen',
'link': 'www.theskyfolk.com'
'name': '14',
'source': 'ntp-14.webp',
'author': 'Life of Pix',
'link': 'https://www.pexels.com/@life-of-pix'
},
{
'name': '15',
'source': 'ntp-15.webp',
'author': 'Cassie Boca',
'link': 'https://unsplash.com/@cassieboca'
},
{
'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'
'name': '16',
'source': 'ntp-16.webp',
'author': 'Braden Jarvis',
'link': 'https://unsplash.com/@jarvisphoto'
}
]
Loading

0 comments on commit 721b4f0

Please sign in to comment.