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

Jump to bottom

Fixing to add the new logo #98

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixing to add the new logo #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6e8093
Updated logo + others
joycelynmng Jun 21, 2023
2bc9a2a
Merge remote-tracking branch 'origin/main' into logo-css
joycelynmng Jun 21, 2023
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
Binary file added .DS_Store
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove all these .DS_Store files? They're a mac specific thing that shouldn't be in git!

Binary file not shown.
3 changes: 1 addition & 2 deletions app/views/home_page/_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<div class="mx-auto max-w-md px-4 sm:max-w-3xl sm:px-6 lg:px-8 lg:max-w-7xl lg:grid lg:grid-cols-2 lg:gap-24">
<div>
<div class="flex items-center">
<%= render "icons/fire", classes: "h-14 w-14" %>
<h1 class="ml-1 text-3xl font-extrabold hidden lg:block">hotseat.io</h1>
<%= render "icons/hotseatlogotext_red", classes: "absolute w-522 h-150 left-101 top-340" %>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid using absolute positioning here? Happy to pair on this with you if helpful!

</div>
<div class="mt-20">
<%# <%= render 'update_badge', link: 'https://blog.hotseat.io/posts/referrals/', title: 'Referrals', body: 'Win $50 for the most referrals by Feb 1!' %1> %>
Expand Down
1 change: 1 addition & 0 deletions app/views/home_page/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<main>
<%= render "layouts/navbar" %>
<%= render "header" %>

<!-- Testimonial/stats section -->
Expand Down
6 changes: 6 additions & 0 deletions app/views/icons/_hotseatlogored.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<svg width="120" height="120" viewBox="0 0 360 360" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M272.65 121.16V170.52H227.21V121.16H198V241.07H227.21V194.09H272.65V241.07H301.86V121.16H272.65Z" fill="#ED1C24" />
<path d="M226.37 121.16H106.46V151.14H226.37V121.16Z" fill="#ED1C24" />
<path d="M167.23 196.87H47.3201V226.85H167.23V196.87Z" fill="#ED1C24" />
<path d="M189.29 162.09H143.55V185.92H189.29V162.09Z" fill="#ED1C24" />
</svg>
11 changes: 11 additions & 0 deletions app/views/icons/_hotseatlogotext_red.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<svg width="360" height="360" viewBox="0 0 360 360" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M91.2201 156.53H45.3701V167.99H91.2201V156.53Z" fill="#ED1C24" />
<path d="M68.6 185.49H22.75V196.95H68.6V185.49Z" fill="#ED1C24" />
<path d="M77.0401 172.19H59.55V181.3H77.0401V172.19Z" fill="#ED1C24" />
<mask id="mask0_178_842" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="22" y="156" width="316" height="48">
<path d="M337.25 156.53H22.75V203.46H337.25V156.53Z" fill="white" />
</mask>
<g mask="url(#mask0_178_842)">
<path d="M318.7 190.27C318.7 199.74 323.99 202.94 331.57 202.94H337.25V193.47H333.27C330.79 193.47 329.87 192.56 329.87 190.4V175.77H337.19V166.49H329.87V157.61H318.7V166.49H314.26V175.77H318.7V190.27ZM297.67 184.72C297.67 190.53 293.95 193.73 289.7 193.73C285.45 193.73 281.73 190.46 281.73 184.65C281.73 178.84 285.52 175.7 289.7 175.7C293.88 175.7 297.67 178.9 297.67 184.71M270.37 184.64C270.37 196.14 277.49 203.45 286.37 203.45C291.79 203.45 295.65 200.97 297.67 197.77V202.93H308.84V166.48H297.67V171.64C295.71 168.44 291.86 165.96 286.44 165.96C277.49 165.96 270.37 173.15 270.37 184.64ZM265.86 190.85H253.97C253.06 192.81 251.29 194.38 248.16 194.38C244.57 194.38 241.63 192.16 241.24 187.39H266.52C266.65 186.28 266.72 185.17 266.72 184.12C266.72 173.02 259.21 165.96 248.56 165.96C237.91 165.96 230.14 173.15 230.14 184.71C230.14 196.27 237.85 203.46 248.56 203.46C257.64 203.46 264.11 197.97 265.87 190.85M248.43 174.91C252.15 174.91 255.29 177.2 255.29 181.18H241.31C241.96 177.13 244.77 174.91 248.43 174.91ZM225.5 192.35C225.3 178.76 205.58 182.88 205.58 177.07C205.58 175.31 207.02 174.26 209.63 174.26C212.77 174.26 214.66 175.89 214.99 178.37H225.31C224.59 171.18 219.37 165.96 209.96 165.96C200.55 165.96 195.13 171.06 195.13 177.26C195.13 190.65 214.99 186.41 214.99 192.28C214.99 193.91 213.49 195.22 210.61 195.22C207.54 195.22 205.25 193.52 204.99 190.97H193.95C194.47 198.02 201.01 203.45 210.74 203.45C219.89 203.45 225.5 198.68 225.5 192.34M171.16 190.25C171.16 199.72 176.45 202.92 184.03 202.92H189.71V193.45H185.73C183.25 193.45 182.33 192.54 182.33 190.38V175.75H189.65V166.47H182.33V157.59H171.16V166.47H166.72V175.75H171.16V190.25ZM136.93 184.7C136.93 178.5 140.46 175.62 144.51 175.62C148.56 175.62 152.09 178.49 152.09 184.7C152.09 190.91 148.37 193.78 144.38 193.78C140.39 193.78 136.93 190.84 136.93 184.7ZM163.45 184.7C163.45 173.14 155.22 165.95 144.51 165.95C133.8 165.95 125.57 173.14 125.57 184.7C125.57 196.26 133.67 203.45 144.38 203.45C155.09 203.45 163.45 196.26 163.45 184.7ZM108.58 202.92H119.75V157.07H108.58V175.03H91.21V157.07H80.04V202.92H91.21V184.04H108.58V202.92Z" fill="#ED1C24" />
</g>
</svg>
5 changes: 2 additions & 3 deletions app/views/layouts/_navbar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<div class="flex justify-between items-center h-16">
<!-- Header -->
<%= link_to "/", class: "block flex px-2 lg:px-0 items-center focus:outline-none focus:ring-2 focus:ring-inset focus:ring-red-500" do %>
<%= render "icons/fire", classes: "h-8" %>
<h1 class="ml-1 text-lg font-extrabold hidden lg:block">hotseat.io</h1>
<%= render "icons/hotseatlogored", classes: "h-8" %>
<% end %>

<% unless current_page?(root_path) %>
Expand All @@ -18,7 +17,7 @@
suggestionUrl: search_suggestions_url,
initialValue: @query || "",
magnifyingGlass: true,
placeholder: "Search",
placeholder: "Search for classes, instructors, etc...",
},
html_options: {
class: "w-full",
Expand Down
Binary file added public/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added public/images/.DS_Store
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions public/images/hotseat_white.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/images/hotseatlogo_gray.svg
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to confirm, we aren't actually using these svg files anywhere are we? It seems like we're just using the SVGs defined in .erb files.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/images/hotseatlogo_red.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/images/hotseatlogotext_gray.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/images/hotseatlogotext_red.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/images/hotseatlogotext_white.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 4 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,15 +1787,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"

caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001366:
version "1.0.30001370"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001370.tgz#0a30d4f20d38b9e108cc5ae7cc62df9fe66cd5ba"
integrity sha512-3PDmaP56wz/qz7G508xzjx8C+MC2qEm4SYhSEzC9IBROo+dGXFWRuaXkWti0A9tuI00g+toiriVqxtWMgl350g==

caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426:
version "1.0.30001439"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz#ab7371faeb4adff4b74dad1718a6fd122e45d9cb"
integrity sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001366, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426:
version "1.0.30001492"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001492.tgz"
integrity sha512-2efF8SAZwgAX1FJr87KWhvuJxnGJKOnctQa8xLOskAXNXq8oiuqgl6u1kk3fFpsp3GgvzlRjiK1sl63hNtFADw==

chalk@^2.0.0:
version "2.4.2"
Expand Down