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.

Sign up for GitHub

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

feat: adjust colors #842

Merged
merged 1 commit into from
Feb 25, 2024
Merged

feat: adjust colors #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions clients/design-system/src/components/AppBar/AppBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const AppBar = (props: AppBarProps) => {
const { topRightSlot, children, siteTitle } = props;

return (
<>
<div className="app-bar">
<nav className={`navbar navbar-expand-lg navbar-light`}>
<div className="container">

Expand All @@ -41,7 +41,7 @@ export const AppBar = (props: AppBarProps) => {
</div>
</div>
</nav>
</>
</div>
);
};

Expand Down
11 changes: 8 additions & 3 deletions clients/design-system/src/components/AppBar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,23 @@
}
}

.app-bar{
background-color: $color-white;
box-shadow: rgba(0, 0, 0, 0.12) 0px 4px 30px 0px;
}

.app-bar-light {
padding: 0;
background-color: transparent;
box-shadow: rgba(0, 0, 0, 0.12) 0px 4px 30px 0px;
background-color: rgb(255, 253, 251);
box-shadow: rgba(0, 0, 0, 0.12) 0px 0px 2px 0px, rgba(0, 0, 0, 0.14) 0px 1.008px 2px 0px;
ul {
padding: 0;
margin: 0;
li {
margin-right: 2rem;
padding: 0;
a {
color: $color-off-black;
color: $color-blue;
display: inline-block;
text-decoration: none;
padding-top: 1rem;
Expand Down
4 changes: 4 additions & 0 deletions clients/design-system/src/styles/utils/_bg-color.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
@import './color-pallette';

.bgOffWhite {
background-color: $color-off-white !important;
}

.bgBrandDark {
background-color: $color-berkeley-blue !important;
}
Expand Down
5 changes: 3 additions & 2 deletions clients/design-system/src/styles/utils/_color-pallette.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* base color pallette */
$color-berkeley-blue: #003366;
$color-berkeley-blue: #094581;
$color-gold: #ffd700;
$color-sky-blue: #87ceeb;
$color-sgbus-green: #71cd2f;
Expand All @@ -8,7 +8,8 @@ $color-white: #FFF;
$color-black: #000;
$color-gray: #939699;
$color-off-black: #1e1e1f;
$color-off-white: #f1f4f9;
// $color-off-white: #f1f4f9;
$color-off-white: #f4fafd;
$color-blue: #005580;

/* common color abstractions */
Expand Down
4 changes: 2 additions & 2 deletions clients/design-system/stories/pages/Homepage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default {
export const Default = () => (
<>
<AppBar
siteTitle='Game Masters Portal'
siteTitle='NekosGate'
topRightSlot={<><Button href="/login" color="secondary" size="small">Login</Button></>}
>
<ul className="navbar-nav me-auto">
Expand All @@ -39,7 +39,7 @@ export const Default = () => (
Commodo quis imperdiet massa tincidunt nunc pulvinar sapien et ligula.
</Alert>

<Paper elevation='2'>
<Paper elevation='2' className='p-5'>
<Typography variant="h1">Et malesuada fames ac turpis.</Typography>
<Typography variant="intro">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vehicula metus quis sagittis malesuada. Nulla facilisi. Duis feugiat tellus eu justo hendrerit, nec congue odio congue.
Expand Down
Loading