mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-07-19 12:04:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Theme welcome and choose your account pages

Browse Source
This commit is contained in:
Lukas Hirt
2020-11-18 12:53:00 +01:00
parent bd6b335da0
commit 5e4e89d26a
5 changed files with 123 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
changelog/unreleased/theme-konnectd-subpages.md Normal file
View File

@@ -0,0 +1,8 @@
Change: Theme welcome and choose account pages
Tags: konnectd
We've themed the konnectd pages Welcome and Choose account.
All text has a white color now to be easily readable on the dark background.
https://github.com/owncloud/ocis/pull/887

156
konnectd/pkg/assets/embed.go
View File

File diff suppressed because one or more lines are too long

4
konnectd/ui/src/components/Loading.js
View File

@@ -13,9 +13,7 @@ import renderIf from 'render-if';
import { retryHello } from '../actions/common';
import { ErrorMessage } from '../errors';
function Loading(props) {
const { error } = props;
function Loading({ error, dispatch }) {
const retry = (event) => {
event.preventDefault();
dispatch(retryHello());

7
konnectd/ui/src/containers/Login/Chooseaccount.js
View File

@@ -69,10 +69,10 @@ function Chooseaccount({ loading, errors, classes, hello, history, dispatch }) {
return (
<div>
<Typography variant="h5" component="h3">
<Typography variant="h5" component="h3" className="oc-light">
<FormattedMessage id="konnect.chooseaccount.headline" defaultMessage="Choose an account"></FormattedMessage>
</Typography>
<Typography variant="subtitle1" className={classes.subHeader}>
<Typography variant="subtitle1" className={classes.subHeader + " oc-light"}>
<FormattedMessage id="konnect.chooseaccount.subHeader" defaultMessage="to sign in to Kopano">
</FormattedMessage>
</Typography>
@@ -86,7 +86,7 @@ function Chooseaccount({ loading, errors, classes, hello, history, dispatch }) {
disabled={!!loading}
onClick={(event) => logon(event)}
><ListItemAvatar><Avatar>{username.substr(0, 1)}</Avatar></ListItemAvatar>
<ListItemText primary={username} />
<ListItemText className="oc-light" primary={username} />
</ListItem>
<ListItem
button
@@ -102,6 +102,7 @@ function Chooseaccount({ loading, errors, classes, hello, history, dispatch }) {
</Avatar>
</ListItemAvatar>
<ListItemText
className="oc-light"
primary={
<FormattedMessage
id="konnect.chooseaccount.useOther.label"

6
konnectd/ui/src/containers/Welcome/Welcomescreen.js
View File

@@ -29,18 +29,18 @@ class Welcomescreen extends React.PureComponent {
const loading = hello === null;
return (
<ResponsiveScreen loading={loading}>
<Typography variant="h5" component="h3">
<Typography variant="h5" component="h3" className="oc-light">
<FormattedMessage
id="konnect.welcome.headline"
defaultMessage="Welcome {displayName}"
values={{displayName: hello.displayName}}>
</FormattedMessage>
</Typography>
<Typography variant="subtitle1" className={classes.subHeader}>
<Typography variant="subtitle1" className={classes.subHeader + " oc-light"}>
{hello.username}
</Typography>
<Typography gutterBottom>
<Typography gutterBottom className="oc-light">
<FormattedMessage id="konnect.welcome.message"
defaultMessage="You are signed in - awesome!"></FormattedMessage>
</Typography>