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.

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

Bonsai 2.0 #32

Merged
merged 1 commit into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
439 changes: 238 additions & 201 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bonsai",
"author": "AnderZeng <aquesada.dev@gmail.com>",
"version": "1.5",
"version": "2.0",
"description": "Web page inspired by the Bonsai project from Frontend Practice",
"type": "module",
"private": "true",
Expand All @@ -21,9 +21,9 @@
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"prettier": "3.2.5",
"vite": "^5.2.10",
"prettier": "3.3.3",
"vite": "^5.4.2",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-static-copy": "^1.0.3"
"vite-plugin-static-copy": "^1.0.6"
}
}
Binary file modified src/assets/favicon/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/favicon/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/favicon/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/favicon/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/favicon/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/favicon/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 6 additions & 9 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
type="image/png"
sizes="16x16"
href="assets/favicon/favicon-16x16.png" />
<link rel="manifest" href="assets/favicon/site.webmanifest" />
<link
rel="mask-icon"
href="assets/favicon/safari-pinned-tab.svg"
Expand Down Expand Up @@ -167,14 +166,12 @@
</ul>
</nav>
<div class="page-header__buttons-container">
<ul>
<li class="page-header__button page-header__button-login">
<a role="button" class="page-header__button-label">Log In</a>
</li>
<li class="page-header__button page-header__button-trial">
<a role="button" class="page-header__button-label">Start free</a>
</li>
</ul>
<div class="page-header__button page-header__button-login">
<a role="button" class="page-header__button-label">Log In</a>
</div>
<div class="page-header__button page-header__button-trial">
<a role="button" class="page-header__button-label">Start free</a>
</div>
</div>
</header>
<main class="page-content">
Expand Down
7 changes: 1 addition & 6 deletions src/styles/base-styles/page-header/page-header-buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@
flex-grow: 1;
flex-basis: 0;
justify-content: flex-end;
}

.page-header__buttons-container ul {
list-style: none;
display: flex;
gap: 1rem;
padding: 0;
}

.page-header__button {
Expand All @@ -32,5 +26,6 @@

.page-header__button-trial {
color: white;
border: solid 2px var(--color-green-primary);
background-color: var(--color-green-primary);
}
2 changes: 1 addition & 1 deletion src/styles/base-styles/page-header/page-header.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

.page-header {
max-width: 1200px;
margin: auto;
margin: 1rem auto;
display: flex;
flex-wrap: wrap;
align-items: center;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(medium-screen-page-header-buttons.css);

.page-header {
flex-direction: column;
gap: 2em;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.page-header__buttons-container {
margin-top: 1em;
}

.page-header__buttons-container ul {
flex-direction: row-reverse;
margin-top: 2.5em;
}