From 9bf4a2b5a11827b31cff0f4b7b0955bea9b6ea1d Mon Sep 17 00:00:00 2001 From: Anthony <55033931+anthonyj33@users.noreply.github.com> Date: Wed, 8 Mar 2023 00:26:38 -0800 Subject: [PATCH 1/6] Add titles to team members --- views/index.html.hbs | 20 ++++++++++++++++---- views/style.scss | 11 +++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/views/index.html.hbs b/views/index.html.hbs index a96d5d3..7e829dd 100644 --- a/views/index.html.hbs +++ b/views/index.html.hbs @@ -454,19 +454,31 @@
Brandon Joe -

Hi there, I’m Brandon Joe, an undergraduate student at UCSD. My interest for Computer Science started with creating broken games and block programming projects, but evolved into proficiency in several coding languages and leadership in stem-based organizations.

+
+

Brandon Joe,

Chief Executive Officer
+

Hi there, I’m Brandon Joe, an undergraduate student at UCSD. My interest for Computer Science started with creating broken games and block programming projects, but evolved into proficiency in several coding languages and leadership in stem-based organizations.

+
Ethan Kosaki -

Hi, I’m Ethan Kosaki. I enjoy using programming in creative ways to solve different problems. Through TreasureHacks, I want to create a community for computer science students around the world. Treasure Hacks is my way to spread a love of programming with other students.

+
+

Ethan Kosaki,

Chief Financial Officer
+

Hi, I’m Ethan Kosaki. I enjoy using programming in creative ways to solve different problems. Through TreasureHacks, I want to create a community for computer science students around the world. Treasure Hacks is my way to spread a love of programming with other students.

+
Ethan Wang -

Hello, I’m Ethan Wang. I have always been intrigued about how things work, and I enjoy creating games. My passion for computer science has allowed me to win the sponsorship award at a local hackathon, as well as land an internship at Hopscotch Technologies.

+
+

Ethan Wang,

Chief Technical Officer
+

Hello, I’m Ethan Wang. I have always been intrigued about how things work, and I enjoy creating games. My passion for computer science has allowed me to win the sponsorship award at a local hackathon, as well as land an internship at Hopscotch Technologies.

+
Anthony Jenanian -

Hi, I'm Anthony Jenanian, a high school student and aspiring programmer. I've developed a passion for coding because it always presents a new and unique challenge. I'm the Chief Community Officer at Treasure Hacks and I'm looking forward to growing and strengthening our community!

+
+

Anthony Jenanian,

Chief Community Officer
+

Hi, I'm Anthony Jenanian, a high school student and aspiring programmer. I've developed a passion for coding because it always presents a new and unique challenge. I'm the Chief Community Officer at Treasure Hacks and I'm looking forward to growing and strengthening our community!

+
diff --git a/views/style.scss b/views/style.scss index 85800be..be5921c 100644 --- a/views/style.scss +++ b/views/style.scss @@ -1607,4 +1607,15 @@ div.names-container { margin-top: 50px; order: 3; } +} + +.person-title { + color: #ababab; +} + +.person-title > p.name { + color: white; + display: inline; + font-size: 1.3rem; + font-weight: bold; } \ No newline at end of file From 2f2b5a17e6d7b1d8c6db092ed7ceb30a25be5b58 Mon Sep 17 00:00:00 2001 From: Anthony <55033931+anthonyj33@users.noreply.github.com> Date: Sun, 12 Mar 2023 12:29:14 -0700 Subject: [PATCH 2/6] Text sizing --- views/index.html.hbs | 8 ++++---- views/style.scss | 9 ++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/views/index.html.hbs b/views/index.html.hbs index 7e829dd..d7fc6a4 100644 --- a/views/index.html.hbs +++ b/views/index.html.hbs @@ -455,28 +455,28 @@
Brandon Joe
-

Brandon Joe,

Chief Executive Officer
+

Brandon Joe,

Chief Executive Officer

Hi there, I’m Brandon Joe, an undergraduate student at UCSD. My interest for Computer Science started with creating broken games and block programming projects, but evolved into proficiency in several coding languages and leadership in stem-based organizations.

Ethan Kosaki
-

Ethan Kosaki,

Chief Financial Officer
+

Ethan Kosaki,

Chief Financial Officer

Hi, I’m Ethan Kosaki. I enjoy using programming in creative ways to solve different problems. Through TreasureHacks, I want to create a community for computer science students around the world. Treasure Hacks is my way to spread a love of programming with other students.

Ethan Wang
-

Ethan Wang,

Chief Technical Officer
+

Ethan Wang,

Chief Technical Officer

Hello, I’m Ethan Wang. I have always been intrigued about how things work, and I enjoy creating games. My passion for computer science has allowed me to win the sponsorship award at a local hackathon, as well as land an internship at Hopscotch Technologies.

Anthony Jenanian
-

Anthony Jenanian,

Chief Community Officer
+

Anthony Jenanian,

Chief Community Officer

Hi, I'm Anthony Jenanian, a high school student and aspiring programmer. I've developed a passion for coding because it always presents a new and unique challenge. I'm the Chief Community Officer at Treasure Hacks and I'm looking forward to growing and strengthening our community!

diff --git a/views/style.scss b/views/style.scss index be5921c..b67a3e8 100644 --- a/views/style.scss +++ b/views/style.scss @@ -1611,11 +1611,18 @@ div.names-container { .person-title { color: #ababab; + white-space: nowrap; + font-size: 1.3rem; + margin-bottom: 0.3rem; } .person-title > p.name { color: white; display: inline; - font-size: 1.3rem; + font-size: 1.5rem; font-weight: bold; +} + +.person-title + p { + line-height: max(24px,1.2vw); } \ No newline at end of file From 677d3947bb2c7a724d62504322e8c1c2ed8a9bd0 Mon Sep 17 00:00:00 2001 From: Anthony <55033931+anthonyj33@users.noreply.github.com> Date: Sun, 12 Mar 2023 13:41:27 -0700 Subject: [PATCH 3/6] Wrap person-title properly --- views/index.html.hbs | 8 ++++---- views/style.scss | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/views/index.html.hbs b/views/index.html.hbs index d7fc6a4..46dd273 100644 --- a/views/index.html.hbs +++ b/views/index.html.hbs @@ -455,28 +455,28 @@
Brandon Joe
-

Brandon Joe,

Chief Executive Officer

+

Brandon Joe

Chief Executive Officer

Hi there, I’m Brandon Joe, an undergraduate student at UCSD. My interest for Computer Science started with creating broken games and block programming projects, but evolved into proficiency in several coding languages and leadership in stem-based organizations.

Ethan Kosaki
-

Ethan Kosaki,

Chief Financial Officer

+

Ethan Kosaki

Chief Financial Officer

Hi, I’m Ethan Kosaki. I enjoy using programming in creative ways to solve different problems. Through TreasureHacks, I want to create a community for computer science students around the world. Treasure Hacks is my way to spread a love of programming with other students.

Ethan Wang
-

Ethan Wang,

Chief Technical Officer

+

Ethan Wang

Chief Technical Officer

Hello, I’m Ethan Wang. I have always been intrigued about how things work, and I enjoy creating games. My passion for computer science has allowed me to win the sponsorship award at a local hackathon, as well as land an internship at Hopscotch Technologies.

Anthony Jenanian
-

Anthony Jenanian,

Chief Community Officer

+

Anthony Jenanian

Chief Community Officer

Hi, I'm Anthony Jenanian, a high school student and aspiring programmer. I've developed a passion for coding because it always presents a new and unique challenge. I'm the Chief Community Officer at Treasure Hacks and I'm looking forward to growing and strengthening our community!

diff --git a/views/style.scss b/views/style.scss index b67a3e8..5cca86f 100644 --- a/views/style.scss +++ b/views/style.scss @@ -1623,6 +1623,17 @@ div.names-container { font-weight: bold; } +.person-title .name::after { + content: ","; +} + .person-title + p { line-height: max(24px,1.2vw); +} + +@media only screen and (max-width: 1200px) { + .person-title .name::after { + content: "\a"; + white-space: pre; + } } \ No newline at end of file From c10e69bdb06efd0cf328b22993eb47d5948ac2e7 Mon Sep 17 00:00:00 2001 From: Awesome-E <54484616+Awesome-E@users.noreply.github.com> Date: Sun, 12 Mar 2023 14:18:03 -0700 Subject: [PATCH 4/6] improve spacing --- views/style.scss | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/views/style.scss b/views/style.scss index 5cca86f..0887636 100644 --- a/views/style.scss +++ b/views/style.scss @@ -236,11 +236,16 @@ hr { height: 100%; padding: 24px; display: flex; - align-items: center; + align-items: stretch; gap: 16px; transition: opacity 0.2s; background-color: #2C1C4B; border-radius: 20px; + > div { + display: flex; + flex-direction: column; + justify-content: space-evenly; + } } img.founder-img { width: 200px; @@ -250,6 +255,7 @@ hr { border-radius: 16px; z-index: 1; flex-shrink: 0; + margin: auto; } .row.team-container { position: relative; @@ -259,6 +265,7 @@ hr { @media (max-width: 850px) { .team-founder { flex-direction: column; + align-items: center; } } @media (max-width: 640px) { @@ -1613,7 +1620,7 @@ div.names-container { color: #ababab; white-space: nowrap; font-size: 1.3rem; - margin-bottom: 0.3rem; + margin-bottom: 8px; } .person-title > p.name { From 08da8d42267ef835e05a50b01da6de8b2099ac27 Mon Sep 17 00:00:00 2001 From: Awesome-E <54484616+Awesome-E@users.noreply.github.com> Date: Sun, 12 Mar 2023 14:19:09 -0700 Subject: [PATCH 5/6] update layout change threshold --- views/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/style.scss b/views/style.scss index 0887636..a3e5b74 100644 --- a/views/style.scss +++ b/views/style.scss @@ -262,7 +262,7 @@ hr { justify-content: space-between; margin-block: 20px 50px; } - @media (max-width: 850px) { + @media (max-width: 950px) { .team-founder { flex-direction: column; align-items: center; From 4a8f1adb9839cc171766016714366eefc55ada6a Mon Sep 17 00:00:00 2001 From: Awesome-E <54484616+Awesome-E@users.noreply.github.com> Date: Sun, 12 Mar 2023 14:27:52 -0700 Subject: [PATCH 6/6] Anthony please learn SCSS and respect formatting - Reorganize excess SCSS on the bottom of the file so that it is within the right parent rule - Re-add newline at end of file --- views/style.scss | 49 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/views/style.scss b/views/style.scss index a3e5b74..c49b0a8 100644 --- a/views/style.scss +++ b/views/style.scss @@ -246,6 +246,26 @@ hr { flex-direction: column; justify-content: space-evenly; } + .person-title { + color: #ababab; + white-space: nowrap; + font-size: 1.3rem; + margin-bottom: 8px; + > p.name { + color: white; + display: inline; + font-size: 1.5rem; + font-weight: bold; + } + .name::after { content: ","; } + + p { line-height: max(24px,1.2vw); } + } + @media only screen and (max-width: 1200px) { + .person-title .name::after { + content: "\a"; + white-space: pre; + } + } } img.founder-img { width: 200px; @@ -1615,32 +1635,3 @@ div.names-container { order: 3; } } - -.person-title { - color: #ababab; - white-space: nowrap; - font-size: 1.3rem; - margin-bottom: 8px; -} - -.person-title > p.name { - color: white; - display: inline; - font-size: 1.5rem; - font-weight: bold; -} - -.person-title .name::after { - content: ","; -} - -.person-title + p { - line-height: max(24px,1.2vw); -} - -@media only screen and (max-width: 1200px) { - .person-title .name::after { - content: "\a"; - white-space: pre; - } -} \ No newline at end of file