Skip to content

Commit

Permalink
add blue theme and fix score text in display
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderjoe committed Jan 23, 2024
1 parent bcc89ee commit 27718d3
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 54 deletions.
4 changes: 2 additions & 2 deletions ui/src/components/display-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,14 @@ export const DemoCard: Component<IDisplayCard> = (props: IDisplayCard) => {
<div class="flex justify-center items-center text-2xl font-bold mb-2">
<div class="text-center">
<p class="text-white light:text-black">{props.game.home_team.name}</p>
<p class="text-white light:text-200 bg-700 py-2 px-4 rounded">
<p class="text-white light:text-200 bg-700 py-2 px-4 rounded inline-block">
{props.game.home_team.score.points}
</p>
</div>
<span class="text-sm text-gray-400 mt-6 mx-3"> - </span>
<div class="text-center">
<p class="text-white light:text-black">{props.game.away_team.name}</p>
<p class="text-white light:text-200 bg-700 py-2 px-4 rounded">
<p class="text-white light:text-200 bg-700 py-2 px-4 rounded inline-block">
{props.game.away_team.score.points}
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const Navbar: Component<Props> = (props: Props) => {
<Select
value={theme()}
onChange={changeTheme}
options={["blackout", "logan", "lavender", "light"]}
options={["blackout", "logan", "lavender", "light", "blue"]}
placeholder="Select a theme"
itemComponent={props => <SelectItem item={props.item}>{props.item.rawValue}</SelectItem>}
>
Expand Down
115 changes: 64 additions & 51 deletions ui/tailwind.config.ts
Original file line number Diff line number Diff line change
@@ -1,64 +1,77 @@
import type { Config } from 'tailwindcss';
const { createThemes } = require('tw-colors');
import type { Config } from "tailwindcss";
const { createThemes } = require("tw-colors");

export default {
darkMode: ['class'],
content: ['./src/**/*.{html,js,jsx,md,mdx,ts,tsx}'],
presets: [require('./ui.preset.js')],
darkMode: ["class"],
content: ["./src/**/*.{html,js,jsx,md,mdx,ts,tsx}"],
presets: [require("./ui.preset.js")],
plugins: [
createThemes({
light: {
primary: '#ffffff',
secondary: '#efefef',
'800': '#dcdcdc',
'700': '#bdbdbd',
'600': '#989898',
'500': '#7c7c7c',
'400': '#656565',
'300': '#525252',
'200': '#464646',
'100': '#3d3d3d',
'50': '#292929',
primary: "#ffffff",
secondary: "#efefef",
"800": "#dcdcdc",
"700": "#bdbdbd",
"600": "#989898",
"500": "#7c7c7c",
"400": "#656565",
"300": "#525252",
"200": "#464646",
"100": "#3d3d3d",
"50": "#292929"
},
blackout: {
'50': '#f2f2f2',
'100': '#d9d9d9',
'200': '#bfbfbf',
'300': '#a6a6a6',
'400': '#8c8c8c',
'500': '#737373',
'600': '#595959',
'700': '#404040',
'800': '#262626',
secondary: '#0d0d0d',
primary: '#000000',
"50": "#f2f2f2",
"100": "#d9d9d9",
"200": "#bfbfbf",
"300": "#a6a6a6",
"400": "#8c8c8c",
"500": "#737373",
"600": "#595959",
"700": "#404040",
"800": "#262626",
secondary: "#0d0d0d",
primary: "#000000"
},
logan: {
'50': '#f8f8fa',
'100': '#f2f3f5',
'200': '#e7e6ee',
'300': '#d3d3df',
'400': '#bbb9cc',
'500': '#aaa7bf',
'600': '#8984a3',
'700': '#777190',
'800': '#645e79',
secondary: '#534e64',
primary: '#353342',
"50": "#f8f8fa",
"100": "#f2f3f5",
"200": "#e7e6ee",
"300": "#d3d3df",
"400": "#bbb9cc",
"500": "#aaa7bf",
"600": "#8984a3",
"700": "#777190",
"800": "#645e79",
secondary: "#534e64",
primary: "#353342"
},
lavender: {
'50': '#fbf8fc',
'100': '#f6eef9',
'200': '#f0e0f4',
'300': '#e4c7eb',
'400': '#d2a2de',
'500': '#be7ece',
'600': '#b471c3',
'700': '#944da3',
'800': '#7c4386',
secondary: '#65376c',
primary: '#461e4d',
"50": "#fbf8fc",
"100": "#f6eef9",
"200": "#f0e0f4",
"300": "#e4c7eb",
"400": "#d2a2de",
"500": "#be7ece",
"600": "#b471c3",
"700": "#944da3",
"800": "#7c4386",
secondary: "#65376c",
primary: "#461e4d"
},
}),
],
blue: {
"50": "#f4f6fb",
"100": "#e8ecf6",
"200": "#cbd8ec",
"300": "#9db6dc",
"400": "#6990c7",
"500": "#4672b1",
"600": "#4B5563",
"700": "#374151",
"800": "#374151",
secondary: "#1F2937",
primary: "#111827"
}
})
]
} satisfies Config;

0 comments on commit 27718d3

Please sign in to comment.