Skip to content

fix: use official CMU brand color - #6D6E71 #460

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

Merged
katiez667 merged 4 commits into from
Jun 20, 2026
Merged

fix: use official CMU brand color - #6D6E71 #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ebf69c
fix: adhere to cmu brand color - iron gray
natsuki615 Jun 11, 2026
74bd499
fix: style
natsuki615 Jun 11, 2026
758100e
fix: condense cmu.css after change
natsuki615 Jun 11, 2026
a180456
fix: color-blind friendly colors in build status
natsuki615 Jun 11, 2026
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
2 changes: 1 addition & 1 deletion app/assets/stylesheets/cmu.css
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions app/assets/stylesheets/organization_build_statuses.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}

.step-card.approved {
background: #f4fbf8;
background: rgba(0, 123, 192, 0.1);
}

.step-card.pending {
Expand All @@ -29,7 +29,7 @@

.step-meta {
font-size: 12px;
color: #0f6e56;
color: #043673;
margin-top: 2px;
}

Expand All @@ -43,16 +43,16 @@
.badge-approved {
font-size: 12px;
font-weight: 500;
color: #0f6e56;
background: #e1f5ee;
color: #043673;
background: rgba(0, 123, 192, 0.3);
padding: 3px 10px;
}

.badge-pending {
font-size: 12px;
font-weight: 500;
color: #a32d2d;
background: #fcebeb;
color: rgba(196, 18, 48);
background: rgba(196, 18, 48, 0.2);
padding: 3px 10px;
}

Expand Down
12 changes: 6 additions & 6 deletions app/assets/stylesheets/tabulator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
width: 100%;
border-bottom: 1px solid #999;
background-color: #fff;
color: #555;
color: #6d6e71;
font-weight: bold;
white-space: nowrap;
overflow: hidden;
Expand Down Expand Up @@ -246,7 +246,7 @@
.tabulator-col-sorter.tabulator-col-sorter-element
.tabulator-arrow:hover {
cursor: pointer;
border-bottom: 6px solid #555;
border-bottom: 6px solid #6d6e71;
}

.tabulator
Expand Down Expand Up @@ -274,7 +274,7 @@
.tabulator-col-sorter.tabulator-col-sorter-element
.tabulator-arrow:hover {
cursor: pointer;
border-bottom: 6px solid #555;
border-bottom: 6px solid #6d6e71;
}

.tabulator
Expand Down Expand Up @@ -302,7 +302,7 @@
.tabulator-col-sorter.tabulator-col-sorter-element
.tabulator-arrow:hover {
cursor: pointer;
border-top: 6px solid #555;
border-top: 6px solid #6d6e71;
}

.tabulator
Expand Down Expand Up @@ -473,7 +473,7 @@
.tabulator .tabulator-footer {
border-top: 1px solid #999;
background-color: #fff;
color: #555;
color: #6d6e71;
font-weight: bold;
white-space: nowrap;
user-select: none;
Expand Down Expand Up @@ -534,7 +534,7 @@
.tabulator .tabulator-footer .tabulator-paginator {
flex: 1;
text-align: right;
color: #555;
color: #6d6e71;
font-family: inherit;
font-weight: inherit;
font-size: inherit;
Expand Down
2 changes: 1 addition & 1 deletion app/views/memberships/new_memberships/_step_csv_upload.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<br/>
<div style="display: grid; grid-template-columns: 1fr 1fr; gap: 3em; align-items: center;">
<div>
<p style="line-height: 1.7; color: #555;">
<p style="line-height: 1.7; color: #6D6E71;">
Organizations are required to register their own members with Spring Carnival's
management application "Binder" so builders can check out tools and scissor lifts,
and buy from our store themselves. Please fill out the spreadsheet template SCC
Expand Down
4 changes: 2 additions & 2 deletions app/views/shifts/new_shifts/_step_csv_upload.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<br/>
<div style="display: grid; grid-template-columns: 1fr 1fr; gap: 3em; align-items: center;">
<div>
<p style="line-height: 1.7; color: #555;">
<p style="line-height: 1.7; color: #6D6E71;">
Shifts are scheduled time slots where designated members oversee Midway operations.
The three types of shifts are Watch Shifts, Security Shifts, and Coordinator Shifts,
each serving a different role in keeping Midway safe and organized during Spring Carnival.
</p>
<p style="line-height: 1.7; color: #555;">
<p style="line-height: 1.7; color: #6D6E71;">
Upload a CSV with the headers: <code>organization</code>, <code>starts_at</code>, <code>ends_at</code>,
<code>description</code>, <code>shift_type</code>, and optionally semi-colon separated <code>andrewids<code>.
</p>
Expand Down
Loading