Skip to content

Commit

Permalink
Merge branch 'dev' into weblate
Browse files Browse the repository at this point in the history
  • Loading branch information
binh-dam-ibigroup authored Dec 4, 2024
2 parents a96cf7f + f7ed865 commit 4b59ed5
Show file tree
Hide file tree
Showing 16 changed files with 370 additions and 333 deletions.
1 change: 0 additions & 1 deletion example.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
.otp .navbar-title {
color: #fff;
font-size: 24px;
padding-top: 7px;
}

.otp.mobile .navbar-title {
Expand Down
176 changes: 6 additions & 170 deletions index.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import url(node_modules/bootstrap/dist/css/bootstrap.min.css);

@import url(react-sliding-pane/dist/react-sliding-pane.css);
@import url(lib/bike-rental.css);
@import url(node_modules/maplibre-gl/dist/maplibre-gl.css);

@import url(lib/components/admin/call-taker.css);
Expand All @@ -12,190 +13,25 @@
@import url(lib/components/user/nav-login-button.css);
@import url(lib/components/viewers/viewers.css);

@import url(lib/bike-rental.css);

@import url(react-sliding-pane/dist/react-sliding-pane.css);

/* Hide IE/Edge clear button in text input fields. */
input[type="text"]::-ms-clear {
display: none;
}

/* New app menu */
.app-menu-icon {
background: none;
border: none;
cursor: pointer;
display: flex;
flex-direction: column;
height: 15px;
justify-content: space-between;
padding: 0;
position: absolute;
top: 16px;
transition: all 1s ease;
width: 21px;
z-index: 10;
}

@media only screen and (max-width: 768px) {
#locale-selector-wrapper {
display: none;
}
.app-menu-icon {
left: 15px;
}
}

.app-menu-icon .menu-line {
border-bottom: 3px solid #ffffff;
display: block;
position: relative;
transition: all 0.5s ease;
width: 100%;
}

.app-menu-icon[aria-expanded="true"] .menu-line.top {
transform: rotate(45deg);
top: 7px;
}
.app-menu-icon[aria-expanded="true"] .menu-line.bottom {
transform: rotate(-45deg);
bottom: 5px;
}
.app-menu-icon[aria-expanded="true"] .menu-line.middle {
display: none;
}

.slide-pane {
transition: all 0.2s ease-in-out;
}

.slide-pane_from_left {
margin: 52px auto 0 0;
/* Keep pane from overflowing on smaller screens */
height: calc(100% - 52px);
}

.slide-pane__content {
padding: 6px 0;
}

.slide-pane__overlay {
z-index: 1000;
}

.app-menu {
margin: 0;
padding: 0.5rem 0;
}

.app-menu img,
.app-menu svg {
max-height: 1em;
margin: 0 2rem;
vertical-align: middle;
width: 1em;
}

.app-menu a,
.app-menu button {
background: none;
border: none;
color: inherit;
cursor: pointer;
display: flex;
font-size: 20px;
padding: 0.5rem 0;
text-decoration: none;
width: 100%;
}

/* Prevents hover styles from getting triggered on mobile */
@media (hover: hover) {
.app-menu a:hover,
.app-menu button:hover {
color: #4c97f5;
}
}

.app-menu a:focus,
.app-menu button:focus {
background-color: #ddd;
outline: 2px solid #4c97f5;
outline-offset: -2px;
}

.app-menu button[aria-selected="true"],
.sort-option button[aria-selected="true"],
#locale-selector button[aria-selected="true"] {
font-weight: bold;
}

.skip-nav-button {
color: initial;
position: fixed;
top: -30px;
}
.skip-nav-button:focus {
padding: 7px 24px;
top: 7px;
z-index: 100;
}

.view-switcher {
display: none;
}

@media (min-width: 768px) {
.view-switcher {
display: flex;
}
}

.expand-menu-chevron {
flex-grow: 1;
text-align: end;
}

.dropdown-header {
font-size: inherit;
line-height: normal;
color: inherit;
white-space: nowrap;
}

.sub-menu-container {
border-top: 1px solid #cccccc;
margin-top: 0.5rem;
padding-left: 2rem;
}

.app-menu .app-menu-divider {
border-bottom: 1px solid #ccc;
padding: 1rem 0;
}

/* Header image or title */
/* If an icon is used, visually-hide the title (but keep it visible to screen readers). */
.with-icon div.navbar-title {
height: 0;
overflow: hidden;
width: 0;
}

/* Buttons */

button.header,
button.step,
.clear-button-formatting {
background: transparent;
color: inherit;
border: 0;
color: inherit;
margin: 0;
padding: 0;
text-align: inherit;
text-decoration: none;
padding: 0;
margin: 0;
}

.clear-button-formatting:active {
Expand All @@ -217,9 +53,9 @@ button.step {
}

.overflow-ellipsis {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.map-container .leaflet-top {
Expand Down
4 changes: 4 additions & 0 deletions lib/actions/apiV2.js
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,10 @@ export const fetchNearby = (position, radius, currentServiceWeek) => {

export const findStopTimesForStop = (params) =>
function (dispatch, getState) {
// If the stop is already in the store, don't fetch it again, unless we are forcing a refetch
if (!params.forceFetch && getState().otp.transitIndex.stops[params.stopId])
return

dispatch(fetchingStopTimesForStop(params))
const { date, stopId } = params
const timeZone = getState().otp.config.homeTimezone
Expand Down
Loading

0 comments on commit 4b59ed5

Please sign in to comment.