Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Welcome Page: Move from brave-ui to brave-core #2896

Merged
merged 41 commits into from
Jul 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
efffbf3
Welcome WebUI: Reclassify existing components as containers
cezaraugusto Jul 10, 2019
6962a8b
Imported from brave-ui: Welcome - Changes structure of the project
NejcZdovc Jul 24, 2018
2115e09
Imported from brave-ui: Welcome - Adds TS lint for storybook
NejcZdovc Jul 24, 2018
4153094
Imported from brave-ui: Welcome - Fixes center problem and lagging wh…
NejcZdovc Jul 26, 2018
c56a5e3
Imported from brave-ui: Welcome - overall welcome page improvements
rossmoody Aug 20, 2018
e2a2b63
Imported from brave-ui: Welcome - Update all previous non-theme `them…
petemill Aug 21, 2018
08779c8
Imported from brave-ui: Welcome - make welcome page use the new card …
cezaraugusto Aug 10, 2018
e0fa12f
Imported from brave-ui: Welcome - propless card component
cezaraugusto Aug 20, 2018
08bcbdc
Imported from brave-ui: Welcome - update welcome screen with new code…
cezaraugusto Sep 10, 2018
a1e502f
Imported from brave-ui: Welcome - add new naming convention to featur…
cezaraugusto Sep 11, 2018
d5630e9
Imported from brave-ui: Welcome - update prototype
cezaraugusto Sep 11, 2018
5812a27
Imported from brave-ui: Welcome - WIP on animations
cezaraugusto Sep 11, 2018
79f4fd9
Imported from brave-ui: Welcome - Style Updates 1
rossmoody Oct 3, 2018
6e48730
Imported from brave-ui: Welcome - Style Updates 2
rossmoody Oct 3, 2018
12e7a35
Imported from brave-ui: Welcome - Fix BG and Locale text
rossmoody Oct 5, 2018
32659f9
Imported from brave-ui: Welcome - Image change, padding change
rossmoody Oct 9, 2018
4c2edea
Imported from brave-ui: Welcome - Barrier reducing
rossmoody Oct 24, 2018
ad5687c
Imported from brave-ui: Welcome - welcome page v2
cezaraugusto Oct 30, 2018
8e3ea5a
Imported from brave-ui: Welcome - locale, animation
rossmoody Oct 31, 2018
b038c2c
Imported from brave-ui: Welcome - responsive button change
rossmoody Oct 31, 2018
2b44d5d
Imported from brave-ui: Welcome - improve animation
cezaraugusto Oct 31, 2018
420f2be
Imported from brave-ui: Welcome - fix animations
cezaraugusto Nov 6, 2018
0ecb38b
Imported from brave-ui: Welcome - Ease
rossmoody Nov 6, 2018
0b3a292
Imported from brave-ui: Welcome - prevent text selection so it looks …
cezaraugusto Nov 7, 2018
98dd9b3
Imported from brave-ui: Welcome - reduce jank on animations
cezaraugusto Nov 7, 2018
d88461f
Imported from brave-ui: Welcome - add will-change to welcome page
cezaraugusto Nov 9, 2018
56af87a
Imported from brave-ui: Welcome - remove inline styles from welcome s…
cezaraugusto Nov 9, 2018
a70b38d
Imported from brave-ui: Welcome - make welcome page images exportable
cezaraugusto Dec 6, 2018
ad6bf28
Imported from brave-ui: Welcome - animation dial in
rossmoody Dec 6, 2018
de0e793
Imported from brave-ui: Welcome - ✨ New select search engine flow for…
imptrx May 20, 2019
bedf67f
Imported from brave-ui: Welcome - 💄 Add styling for default search en…
imptrx May 21, 2019
ac1a98d
Imported from brave-ui: Welcome - ✨ Add button disable behavior; update
imptrx May 21, 2019
c809bdc
Imported from brave-ui: Welcome - ✨Add in different display text depe…
imptrx May 21, 2019
c4b5cc8
Imported from brave-ui: Welcome - 💬 Update locale text and knob
imptrx May 21, 2019
e28a9b4
Imported from brave-ui: Welcome - ♻️ Refactor logic for disabling but…
imptrx May 23, 2019
af9ca3c
Imported from brave-ui: Welcome - Welcome Panel does not need to use …
petemill May 24, 2019
cf9f143
Imported from brave-ui: Welcome - update shields text
rossmoody May 29, 2019
358691b
Imported from brave-ui: Welcome - Button focus styling
rossmoody May 31, 2019
1f6856c
Imported from brave-ui: Welcome - ✨New welcome flow for importing set…
imptrx Jun 24, 2019
bc8819d
Welcome Page WebUI: Move brave-ui paths to brave-core paths
cezaraugusto Jul 10, 2019
d95463f
allow welcome page story to be max width and height
cezaraugusto Jul 23, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/brave_welcome_ui/brave_welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Theme from 'brave-ui/theme/brave-default'
import { ThemeProvider } from 'brave-ui/theme'

// Components
import App from './components/app'
import App from './containers/app'

// Utils
import store from './store'
Expand Down
79 changes: 79 additions & 0 deletions components/brave_welcome_ui/components/button/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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 { ComponentType } from 'react'
import styled, { css } from 'brave-ui/theme'
import Button, { Props as ButtonProps } from 'brave-ui/components/buttonsIndicators/button'

interface BaseButtonProps {
active?: boolean
}

const BaseButton = styled<BaseButtonProps, 'button'>('button')`
box-sizing: border-box;
padding: 0;
margin: 0;
display: block;
line-height: 1;
background: none;
border: none;
cursor: pointer;
outline: inherit;
`

export const FooterButton = styled(Button as ComponentType<ButtonProps>)`
outline: none;
border: 1px solid ${p => p.theme.palette.grey400};
color: ${p => p.theme.color.text};

&:hover {
opacity: .9;
}

&:focus {
box-shadow: 0 0 0 2px rgba(255,80,0,0.2);
}
`

export const SkipButton = styled(BaseButton)`
color: ${p => p.theme.color.text};
text-decoration: underline;
font-weight: 300;
letter-spacing: 0;

&:hover {
opacity: .9;
}
`

export const PrimaryButton = styled(Button as ComponentType<ButtonProps>)`
outline: none;

&:hover {
opacity: .9;
}

&:focus {
box-shadow: 0 0 0 2px rgba(255,80,0,0.2);
}
`

export const Bullet = styled(BaseButton as ComponentType<any>)`
padding: 0 7px;
font-size: 36px;
color: #7C7D8C;
letter-spacing: 0;

&:hover {
color: #343546;
}

${p => p.active && css`
color: #FB542B;

&:hover {
color: #C72E03;
}
`}
`
81 changes: 81 additions & 0 deletions components/brave_welcome_ui/components/images/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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 styled, { keyframes } from 'styled-components'

import LionImage from './lion_logo.svg'
import ImportImage from './welcome_import.svg'
import RewardsImage from './welcome_rewards.svg'
import SearchImage from './welcome_search.svg'
import ShieldsImage from './welcome_shields.svg'
import ThemeImage from './welcome_theme.svg'
import WelcomeImage from './welcome_bg.svg'

const BaseImage = styled<{}, 'img'>('img')`
box-sizing: border-box;
display: block;
max-width: 100%;
`

export const WelcomeLionImage = styled(BaseImage).attrs({ src: LionImage })`
height: 140px;
`

export const WelcomeImportImage = styled(BaseImage).attrs({ src: ImportImage })`
height: 190px;
`

export const WelcomeRewardsImage = styled(BaseImage).attrs({ src: RewardsImage })`
height: 190px;
`

export const WelcomeSearchImage = styled(BaseImage).attrs({ src: SearchImage })`
height: 190px;
`

export const WelcomeShieldsImage = styled(BaseImage).attrs({ src: ShieldsImage })`
height: 190px;
`

export const WelcomeThemeImage = styled(BaseImage).attrs({ src: ThemeImage })`
height: 190px;
`

interface BackgroundProps {
position: string
}

export const topToBottom = keyframes`
from {
transform: translateY(-100%);
}

to {
transform: translateY(0);
}
`

export const BackgroundContainer = styled<{}, 'div'>('div')`
box-sizing: border-box;
width: inherit;
height: inherit;
position: absolute;
animation-delay: 0s;
animation-name: ${topToBottom};
animation-duration: 2000ms;
animation-timing-function: ease-in-out;
animation-fill-mode: forwards;
animation-iteration-count: 1;
overflow: hidden;
`

export const Background = styled<BackgroundProps, 'div'>('div')`
box-sizing: border-box;
background: url('${WelcomeImage}') repeat-x;
width: 500%;
height: inherit;
will-change: transform;
transform: translateX(${p => p.position});
transition: transform ease-in-out 1200ms;
`
25 changes: 25 additions & 0 deletions components/brave_welcome_ui/components/images/lion_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions components/brave_welcome_ui/components/images/welcome_bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading