diff --git a/resources/scripts/TransitionRouter.tsx b/resources/scripts/TransitionRouter.tsx index dc0ec7a95..cf738e17a 100644 --- a/resources/scripts/TransitionRouter.tsx +++ b/resources/scripts/TransitionRouter.tsx @@ -18,15 +18,17 @@ export default ({ basename, children }: Props) => ( {children} -

- © 2015 - 2019  - - Pterodactyl Software - -

+
+

+ © 2015 - 2019  + + Pterodactyl Software + +

+
diff --git a/resources/scripts/components/App.tsx b/resources/scripts/components/App.tsx index 3db5c0886..eab411e95 100644 --- a/resources/scripts/components/App.tsx +++ b/resources/scripts/components/App.tsx @@ -39,7 +39,7 @@ const App = () => { return ( -
+
diff --git a/resources/scripts/components/account/DesignElementsContainer.tsx b/resources/scripts/components/account/DesignElementsContainer.tsx index ffa9c0ac7..fc4ad61f8 100644 --- a/resources/scripts/components/account/DesignElementsContainer.tsx +++ b/resources/scripts/components/account/DesignElementsContainer.tsx @@ -5,65 +5,71 @@ import ContentBox from '@/components/elements/ContentBox'; export default class DesignElementsContainer extends React.PureComponent { render () { return ( -
-
- -

- Your demands have been received: Dark Mode will be default in Pterodactyl 0.8! -

-

Back

-
-
-

Form Elements

-
- - -

- This is some descriptive helper text to explain how things work. + +

+
+ +

+ Your demands have been received: Dark Mode will be default in Pterodactyl 0.8!

-
- - -

- This field has an error. -

-
- - -
- - -
- - - - -
- - -
- - +

Back

+ +
+

Form Elements

+
+ + +

+ This is some descriptive helper text to explain how things work. +

+
+ + +

+ This field has an error. +

+
+ + +
+ + +
+ + + + +
+ + +
+ + +
-
+ ); } } diff --git a/resources/scripts/routers/AccountRouter.tsx b/resources/scripts/routers/AccountRouter.tsx index d6ecd04c3..7631d566f 100644 --- a/resources/scripts/routers/AccountRouter.tsx +++ b/resources/scripts/routers/AccountRouter.tsx @@ -1,11 +1,49 @@ import * as React from 'react'; -import { Route, RouteComponentProps } from 'react-router-dom'; +import { Link, NavLink, Route, RouteComponentProps } from 'react-router-dom'; import DesignElementsContainer from '@/components/account/DesignElementsContainer'; import AccountOverviewContainer from '@/components/account/AccountOverviewContainer'; export default ({ match }: RouteComponentProps) => (
- - +
+
+
+ + Pterodactyl + +
+
+ + Dashboard + + + Account + +
+
+
+
+ + +
); diff --git a/tailwind.js b/tailwind.js index 1ca42c0cb..ec7f6c291 100644 --- a/tailwind.js +++ b/tailwind.js @@ -44,7 +44,7 @@ View the full documentation at https://tailwindcss.com. let colors = { 'transparent': 'transparent', - 'black': '#1F2933', + 'black': 'hsl(210, 27%, 10%)', 'white': '#ffffff', 'basically-white': '#fafafb', @@ -196,6 +196,12 @@ module.exports = { 'system-ui', 'sans-serif', ], + 'header': [ + '"IBM Plex Sans"', + '"Roboto"', + 'system-ui', + 'sans-serif', + ], 'serif': [ 'Constantia', '"Lucida Bright"',