style updates

- logo
- primary colors
- text changes
pull/949/head
alpineux 2022-02-06 17:25:02 -07:00
parent 5d74e86222
commit 6136406506
30 changed files with 31066 additions and 6214 deletions

View File

@ -1,2 +1,44 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 428 389.11">
<circle cx="214.15" cy="181" r="171" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="20"/><path d="M413,134.11H15.29a15,15,0,0,0-15,15v15.3C.12,168,0,171.52,0,175.11c0,118.19,95.81,214,214,214,116.4,0,211.1-92.94,213.93-208.67,0-.44.07-.88.07-1.33v-30A15,15,0,0,0,413,134.11Z"/></svg> <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 490 490" style="enable-background:new 0 0 490 490;" xml:space="preserve">
<g>
<path d="M84.765,454.31h66.17V280.967h-66.17V454.31z M100.077,296.28h35.545v142.717h-35.545V296.28z"/>
<path d="M66.17,345.589H0v108.72h66.17V345.589z M50.857,438.997H15.313v-78.095h35.545V438.997z"/>
<path d="M169.529,454.31h66.17V193.16h-66.17V454.31z M184.842,208.472h35.545v230.525h-35.545V208.472z"/>
<path d="M254.294,454.31h66.17V35.13h-66.17V454.31z M269.606,50.442h35.545v388.555h-35.545V50.442z"/>
<path d="M405.235,454.31V116.612h-66.177V454.31H405.235z M354.371,131.924h35.552v307.073h-35.552V131.924z"/>
<path d="M423.823,454.87H490V246.409h-66.177V454.87z M439.135,261.722h35.552v177.836h-35.552V261.722z"/>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -68,7 +68,7 @@ export default function LoginForm() {
<Form> <Form>
<div className={styles.header}> <div className={styles.header}>
<Icon icon={<Logo />} size="xlarge" className={styles.icon} /> <Icon icon={<Logo />} size="xlarge" className={styles.icon} />
<h1 className="center">umami</h1> <h1 className="center">alpineUX</h1>
</div> </div>
<FormRow> <FormRow>
<label htmlFor="username"> <label htmlFor="username">

View File

@ -17,11 +17,11 @@ export default function Footer() {
<div className="col-12 col-md-4"> <div className="col-12 col-md-4">
<FormattedMessage <FormattedMessage
id="message.powered-by" id="message.powered-by"
defaultMessage="Powered by {name}" defaultMessage="Powered by alpineUX analytics"
values={{ values={{
name: ( name: (
<Link href="https://umami.is"> <Link href="https://alpineux.com">
<b>umami</b> <b>alpineUX</b>
</Link> </Link>
), ),
}} }}

View File

@ -1,15 +1,15 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import Image from 'next/image';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import classNames from 'classnames'; import classNames from 'classnames';
import Link from 'components/common/Link'; import Link from 'components/common/Link';
import Icon from 'components/common/Icon';
import LanguageButton from 'components/settings/LanguageButton'; import LanguageButton from 'components/settings/LanguageButton';
import ThemeButton from 'components/settings/ThemeButton'; import ThemeButton from 'components/settings/ThemeButton';
import UpdateNotice from 'components/common/UpdateNotice'; import UpdateNotice from 'components/common/UpdateNotice';
import UserButton from 'components/settings/UserButton'; import UserButton from 'components/settings/UserButton';
import Button from 'components/common/Button'; import Button from 'components/common/Button';
import Logo from 'assets/logo.svg'; import Logo from 'public/alpine-social.png';
import styles from './Header.module.css'; import styles from './Header.module.css';
import useLocale from 'hooks/useLocale'; import useLocale from 'hooks/useLocale';
import XMark from 'assets/xmark.svg'; import XMark from 'assets/xmark.svg';
@ -31,8 +31,11 @@ export default function Header() {
<div className={styles.nav}> <div className={styles.nav}>
<div className=""> <div className="">
<div className={styles.title}> <div className={styles.title}>
<Icon icon={<Logo />} size="large" className={styles.logo} /> {/*<Icon icon={<Logo />} size="large" className={styles.logo} />*/}
<Link href={user ? '/' : 'https://umami.is'}>umami</Link> <Image src={Logo} width="40px" height="40px" alt="alpineUX logo" />
<span style={{ marginLeft: '10px', fontFamily: 'Helvetica Neue' }}>
<Link href={user ? '/' : 'https://alpineux.com'}>analytics</Link>
</span>
</div> </div>
</div> </div>
<Button <Button

View File

@ -10,7 +10,7 @@ export default function Layout({ title, children, header = true, footer = true }
return ( return (
<> <>
<Head> <Head>
<title>umami{title && ` - ${title}`}</title> <title>alpineUX{title && ` - ${title}`}</title>
</Head> </Head>
{header && <Header />} {header && <Header />}

25334
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

BIN
public/alpine-social.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 597 B

After

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 888 B

After

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

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 not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,8 +1,31 @@
@font-face {
font-family: Helvetica Neue Medium;
src: url('fonts/helveticaneue/HelveticaNeue Medium.ttf');
}
@font-face {
font-family: Helvetica Neue Light;
src: url('fonts/helveticaneue/HelveticaNeue Light.ttf');
}
@font-face {
font-family: Helvetica Neue Thin;
src: url('fonts/helveticaneue/HelveticaNeue Thin.ttf');
}
@font-face {
font-family: Helvetica Neue;
src: url('fonts/helveticaneue/HelveticaNeue.ttf');
}
@font-face {
font-family: Cherolina;
src: url('fonts/cherolina/Cherolina.ttf');
}
html, html,
body { body {
font-family: Inter, -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, font-family: Helvetica Neue Medium, Arial, sans-serif;
Ubuntu, Cantrell, 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
'Segoe UI Symbol';
font-weight: 400; font-weight: 400;
line-height: 1.8; line-height: 1.8;
padding: 0; padding: 0;
@ -52,11 +75,6 @@ body {
'Noto Sans Hebrew', sans-serif !important; 'Noto Sans Hebrew', sans-serif !important;
} }
.he-IL {
display: inline-block;
direction: rtl;
}
*, *,
*:before, *:before,
*:after { *:after {

View File

@ -11,10 +11,10 @@
--gray800: #4b4b4b; --gray800: #4b4b4b;
--gray900: #2c2c2c; --gray900: #2c2c2c;
--primary400: #2680eb; --primary400: #5c7366;
--primary500: #1473e6; --primary500: #495c51;
--primary600: #0d66d0; --primary600: #37453d;
--primary700: #095aba; --primary700: #242e28;
--font-size-xlarge: 36px; --font-size-xlarge: 36px;
--font-size-large: 24px; --font-size-large: 24px;

11837
yarn.lock

File diff suppressed because it is too large Load Diff