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

Feature branch: Prefare Alerts 2.0 #1971

Merged
merged 56 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
9e71fab
feat: Pre-Fare alerts 2.0 CandidateGenerator (#1765)
cmaddox5 Jun 8, 2023
dfdc4d9
Merge branch 'master' into prefare-alerts
hannahpurcell Jun 22, 2023
61e4052
Merge branch 'master' into prefare-alerts
hannahpurcell Jul 7, 2023
24fdc60
[feature] Pre-fare alert 2.0 frontend left screen (#1787)
hannahpurcell Jul 11, 2023
65915a2
feat: Pre-Fare alerts 2.0 serializer (#1785)
cmaddox5 Jul 11, 2023
b394837
Merge branch 'master' into prefare-alerts
hannahpurcell Jul 11, 2023
63a661f
Merge branch 'master' into prefare-alerts
cmaddox5 Jul 27, 2023
3600a17
feat: Disruption Diagram - Frontend (#1825)
cmaddox5 Aug 3, 2023
0b8d4e1
In LocationContext, tag stop sequences by their routes (#1832)
jzimbel-mbta Aug 8, 2023
913850c
Merge branch 'master' into prefare-alerts
cmaddox5 Aug 15, 2023
d7e9352
tweak: PreFare simulations (#1837)
cmaddox5 Aug 30, 2023
93c81b2
[feature] Prefare alerts 2.0 audio (#1824)
hannahpurcell Oct 11, 2023
0fbad15
feat: Disruption Diagram - Backend (#1828)
jzimbel-mbta Oct 20, 2023
4a56061
Merge branch 'master' into prefare-alerts
jzimbel-mbta Oct 20, 2023
70d447c
Remove unused FreeTextLine alias in ReconstructedAlert
jzimbel-mbta Oct 20, 2023
8e537b5
fix: Do not use `../0` since releases still use Elixir 1.13
jzimbel-mbta Oct 23, 2023
d3097aa
fix: "Polyfill" Range.shift/2 until we upgrade to Elixir 1.14
jzimbel-mbta Oct 23, 2023
3920663
fix: Update location context stop sequences field in TrainCrowdingTes…
jzimbel-mbta Oct 25, 2023
2b688ec
test: D. diagram unit test for RL trunk statio closure with home stop…
jzimbel-mbta Oct 26, 2023
39124f5
Added padding-top to layout when there is no banner. (#1902)
cmaddox5 Oct 27, 2023
7469d4d
Cm/govt ctr gl affected pill fix (#1898)
cmaddox5 Oct 27, 2023
62c83ea
Cm/adjust diagram size positioning (#1896)
cmaddox5 Oct 27, 2023
4973a7a
Merge branch 'master' into prefare-alerts
cmaddox5 Oct 30, 2023
1a82f63
fix: 1. Don't pass false for canonical_only? filter, 2: Don't set par…
jzimbel-mbta Oct 30, 2023
2a5990e
Changed label to display on a single line. (#1899)
cmaddox5 Oct 30, 2023
5281794
Tweaked resizer logic so it maxHeight matches the card height on page…
cmaddox5 Oct 30, 2023
fec7754
Removed bolding of 'to' from arrow labels. (#1908)
cmaddox5 Oct 30, 2023
396e413
Added missing word. (#1904)
cmaddox5 Oct 30, 2023
8f2c5d6
Cm/alert card border radius (#1901)
cmaddox5 Oct 30, 2023
6e426ce
Fixed D branch headsign. (#1897)
cmaddox5 Oct 31, 2023
90bbf8c
Cm/e branch headsign fix (#1900)
cmaddox5 Oct 31, 2023
74c0d34
Fixed icon display when current stop is affected. (#1903)
cmaddox5 Oct 31, 2023
e84e651
feat: Consistent description of disrupted stop ranges throughout pre-…
jzimbel-mbta Nov 7, 2023
61ac0ee
Adjusted Ashmont/Braintree destination to proper formatting (#1917)
hannahpurcell Nov 8, 2023
df9a668
Refactor disruption diagram SVG (#1914)
hannahpurcell Nov 16, 2023
f5a5272
Log alert ID and screen's home stop when disruption diagram logic fai…
jzimbel-mbta Nov 17, 2023
04c6c7c
polish: Recalculate dimensions in hook (#1921)
cmaddox5 Nov 20, 2023
4f5f09a
Merge master into prefare-alerts (#1924)
cmaddox5 Nov 21, 2023
d3ac2f5
Draw D. diagrams for multi-line alerts when home stop narrows it to 1…
jzimbel-mbta Nov 30, 2023
6832349
fix: PreFare Polish - Inside shuttle (#1941)
hannahpurcell Dec 18, 2023
0d3ae47
fix: Pre-fare polish - Boundary alerts banner (#1945)
hannahpurcell Dec 19, 2023
0f4c725
fix: Pre-fare polish -- Text only resizes for bypassed stations (#1946)
hannahpurcell Dec 20, 2023
2f33def
fix: Pre-fare polish -- Station closed takeover text wrapping (#1947)
hannahpurcell Dec 20, 2023
7cd35dd
Downstream shuttle endpoint should be a circle (#1948)
hannahpurcell Jan 2, 2024
7f17999
Label splitting logic was buggy (#1949)
hannahpurcell Jan 2, 2024
7b2a79f
Prefare format in config is "Ashmont & Braintree" not "Ashmont/Braint…
hannahpurcell Jan 3, 2024
bba0faa
Sub-header for takeover alert is now regular weight (#1955)
hannahpurcell Jan 5, 2024
859d272
fix: Prefare alerts polish -- Fix GL headsign in various cases (#1957)
hannahpurcell Jan 5, 2024
7cbe12c
fix: Prefare polish -- Use FreeText to prevent station text wrapping …
hannahpurcell Jan 8, 2024
60e31f1
fix: Prefare polish -- Alerts that break assumptions use the fallback…
hannahpurcell Jan 10, 2024
0e72000
fix: Prefare polish -- Reorder audio with alerts before subway status…
hannahpurcell Jan 11, 2024
d10d5fa
fix: Prefare polish -- New abbreviation rule (#1961)
hannahpurcell Jan 11, 2024
0312b05
fix: Prefare Alerts polish -- RL headsigns for branch-only alerts (#1…
hannahpurcell Jan 30, 2024
7c99a52
fix: Prefare alerts polish -- Screenplay sim sizing / page layout (#1…
hannahpurcell Feb 1, 2024
b15c9c6
fix: Prefare polish -- "via" diagram labels need abbreviating (#1968)
hannahpurcell Feb 1, 2024
f111dc4
Merge branch 'master' into prefare-alerts
hannahpurcell Feb 1, 2024
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: 4 additions & 0 deletions assets/css/pre_fare_v2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
@import "v2/pre_fare/flex/paging_indicator";
@import "v2/pre_fare/full_line_map";
@import "v2/pre_fare/reconstructed_alert";
@import "v2/pre_fare/alert-banner";
@import "v2/pre_fare/prefare_single_screen_alert";
@import "v2/pre_fare/free_text";
@import "v2/pre_fare/shuttle_bus_info";

Expand All @@ -62,6 +64,8 @@

@import "v2/blue_bikes";

@import "v2/pre_fare/disruption_diagram/disruption_diagram";

body {
margin: 0px;
}
Expand Down
56 changes: 56 additions & 0 deletions assets/css/v2/pre_fare/alert-banner.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
.alert-banner {
font-family: Inter;
width: 100%;
font-size: 60px;
line-height: 72px;
font-weight: 600;
filter: drop-shadow(0px 30px 20px rgba(0, 0, 0, 0.25));

display: flex;
flex-wrap: wrap;

/* Background colors */
&--blue {
background-color: #b3c5e4;
}

&--red {
background-color: #f4bfbb;
}

&--orange {
background-color: #fadcb3;
}

&--yellow {
background-color: #fff7bf;
}

&--green {
background-color: #b3dac5;
}
}

.alert-banner__attention-text {
font-weight: 700;
}

.alert-banner__route-pill--short {
margin: 0 20px;
height: 96px;
}

.alert-banner__route-pill--long {
margin: 16.2px 0 0.8px 0;
}

.alert-banner--large--two-routes {
padding: 31px 65px 42px 65px;
}
.alert-banner--large--one-route {
padding: 86px 74px 102px 74px;
}
.alert-banner--small {
padding: 52px 88px;
align-items: center;
}
124 changes: 124 additions & 0 deletions assets/css/v2/pre_fare/disruption_diagram/disruption_diagram.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
.end-slot__arrow {
&--red {
fill: $line-color-red;
}

&--blue {
fill: $line-color-blue;
}

&--orange {
fill: $line-color-orange;
}

&--green {
fill: $line-color-green;
}
}

.end-slot__icon {
&--red {
stroke: $line-color-red;
}

&--blue {
stroke: $line-color-blue;
}

&--orange {
stroke: $line-color-orange;
}

&--green {
stroke: $line-color-green;
}

&--affected {
stroke: #171f26;
}
}

.shuttle-stop {
stroke: #171f26;
}

.middle-slot__background {
&--red {
fill: $line-color-red;
}

&--blue {
fill: $line-color-blue;
}

&--orange {
fill: $line-color-orange;
}

&--green {
fill: $line-color-green;
}
}

.middle-slot__icon {
&--red {
stroke: $line-color-red;
}

&--blue {
stroke: $line-color-blue;
}

&--orange {
stroke: $line-color-orange;
}

&--green {
stroke: $line-color-green;
}
}

.label--endpoint {
font-size: 35px;
font-weight: 700;

.label {
font-weight: 400;
}
}

.label-large {
font-family: Inter;
font-size: 30px;
font-weight: 500;
line-height: 35px;

&--current-stop {
font-size: 35px;
font-weight: 700;
}

&--small {
font-size: 25px;
}
}

.label-small {
font-family: Inter;
font-size: 25px;
font-weight: 500;
line-height: 35px;

&--current-stop {
font-size: 30px;
font-weight: 700;
}
}

.station-closure-icon {
fill: #171f26;

&--current-stop {
fill: #ee2e24;
}
}
4 changes: 4 additions & 0 deletions assets/css/v2/pre_fare/free_text.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@
line-height: unset;
}
}

.free-text__string--nowrap {
white-space: nowrap;
}
Loading
Loading