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

feat(route-draw): select mode now uses action sheet #112

Merged
merged 1 commit into from
Jul 26, 2024
+351 −332
Merged

feat(route-draw): select mode now uses action sheet #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions src/css/action-sheet.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ action-sheet {
display: block;
height: 100vh;
width: 100vw;
background-color: rgba(0, 0, 0, 0.15);
background-color: rgba(0, 0, 0, 0.2);
position: fixed;
top: 0;
}
Expand All @@ -22,7 +22,7 @@ action-sheet {
flex-direction: column;
z-index: 1;
box-sizing: border-box;
padding: 0 6% 6% 6%;
padding: 0 6% 44px 6%;
}

.actionSheet-title {
Expand Down
5 changes: 0 additions & 5 deletions src/css/directions.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,6 @@
border-radius: 8px;
}

.hidden {
max-height: 0;
overflow: hidden;
}

.hidden .lblDirectionsLocations {
background-image: none;
border: none;
Expand Down
92 changes: 91 additions & 1 deletion src/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ body {
padding: 0px;
width: 100%;
color: white;
overflow-x: clip;
}

body:has(action-sheet:not(.d-none)) {
overflow-y: hidden;
}

pwa-toast, action-sheet {
Expand All @@ -83,6 +88,12 @@ input, textarea, select {
animation: fadeIn 0.15s;
}

.hidden {
max-height: 0 !important;
overflow: hidden !important;
padding: 0 !important;
}

/* DS IGN forms */
.dsign-form-label,
.signalement-select {
Expand Down Expand Up @@ -255,7 +266,7 @@ input[type=text]:focus + .dsign-form-label {
/* Show the checkmark when checked */
.chkContainer input:checked ~ .checkmark {
border: 1px solid var(--dark-green);
background-color: #E3F5EF;
background-color: var(--light-green);
}


Expand Down Expand Up @@ -344,3 +355,82 @@ input[type="range"]::-moz-range-thumb {
box-sizing: border-box;
}
/** END Range **/

/* Radio buttons */
.radio-wrapper {
display: block;
position: relative;
padding-left: 35px;
cursor: pointer;
user-select: none;
line-height: 27px;
}

.radio-wrapper:has(input:disabled) {
color: var(--grey);
}

/* Hide the browser's default radio */
.radio-wrapper input {
position: absolute;
opacity: 0;
cursor: pointer;
height: 0;
width: 0;
}

/* Create a custom radio */
.radio-input {
position: absolute;
top: 0;
left: 0;
height: 23px;
width: 23px;
background-color: white;
border: 1px solid var(--grey);
border-radius: 100%;
}

.radio-input:after {
content: "";
position: absolute;
display: none;
}

input:disabled ~ .radio-input {
background-color: var(--light-grey);
}

/* Show the checkmark when checked */
.radio-wrapper input:checked ~ .radio-input:after {
display: block;
}

/* Show the checkmark when checked */
.radio-wrapper input:checked ~ .radio-input {
border: 1px solid var(--dark-green);
background-color: var(--light-green);
}

.radio-wrapper input:checked:disabled ~ .radio-input {
border: 1px solid var(--grey);
background-color: var(--light-grey);
}


/* Style the checkmark/indicator */
.radio-wrapper input:checked ~ .radio-input:after {
content: "";
display: block;
width: 15px;
height: 15px;
border-radius: 100%;
background-color: var(--dark-green);
top: 4px;
left: 4px;
}

.radio-wrapper input:checked:disabled ~ .radio-input:after {
background-color: var(--grey);
}
/* END Radio buttons */
72 changes: 1 addition & 71 deletions src/css/map-buttons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,76 +195,6 @@
margin-right: 12px;
}

#routeDrawBtns {
position: absolute;
left: 15px;
bottom: 0;
display: flex;
align-items: center;
}

#routeDrawMode {
width: 145px;
justify-content: space-between;
position: relative;
}

#routeDrawMode:not(.routeDrawModeClose):focus-within > #routeDrawModeText,
#routeDrawMode:not(.routeDrawModeClose):hover > #routeDrawModeText {
color: var(--dark-green);
}

#routeDrawModeTransportPedestrian, #routeDrawModeTransportCar {
display: block;
width: 30px;
height: 100%;
background-position: center;
background-repeat: no-repeat;
background-image: url("assets/route-draw/pieton-green.svg");
padding-left: 8px;
}

#routeDrawModeTransportCar {
background-image: url("assets/route-draw/voiture-green.svg");
background-size: 17px;
background-position: 13px 13px;
}

#routeDrawModeText {
white-space: nowrap;
}

#routeDrawModeArrow {
width: 30px;
height: 100%;
background-image: url("assets/route-draw/chevron_right.svg");
background-repeat: no-repeat;
background-position: center;
transition: transform 0.2s ease-out;
}

#routeDrawMode:not(.routeDrawModeClose):focus-within > #routeDrawModeArrow,
#routeDrawMode:not(.routeDrawModeClose):hover > #routeDrawModeArrow {
transform: rotate(-90deg);
}

#routeDrawHelp {
background-color: var(--dark-green);
color: white;
border: unset;
justify-content: center;
}

#routeDrawBtns > div {
display: flex;
align-items: center;
position: relative;
font-family: "Open Sans Semibold";
margin-right: 6px;
right: unset;
font-size: 13px;
}

#routeDrawEdit {
background-color: white;
border-radius: 5px;
Expand Down Expand Up @@ -438,7 +368,7 @@

#routeDrawEdit > .button > span {
position: relative;
bottom: -40px;
bottom: -44px;
}

#mapCenter {
Expand Down
6 changes: 1 addition & 5 deletions src/css/map.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@
justify-content: flex-end;
}

#bottomButtons > .maplibregl-control-container > .maplibregl-ctrl-bottom-left {
bottom: 56px;
}

#routeDrawBtns.d-none + .maplibregl-control-container > .maplibregl-ctrl-bottom-left {
.maplibregl-control-container > .maplibregl-ctrl-bottom-left {
bottom: -3px;
}

Expand Down
9 changes: 8 additions & 1 deletion src/css/media-queries.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@
padding: 0 15px 15px calc(var(--safe-area-inset-left) + 42px);
transition: top 0.3s;
display: none;
}
}

#sheetContent {
width: min(50vw, calc(100vh + var(--safe-area-inset-left) + 42px));
padding: 0 15px 15px calc(var(--safe-area-inset-left) + 42px);
left: 0;
border-top-left-radius: 0px;
}

#informationsWindow,
#isochroneWindow,
Expand Down
2 changes: 2 additions & 0 deletions src/css/my-account.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@
overflow-y: scroll;
}

#myaccount-routes:has(.tools-layer-advanced-menu:hover),
#myaccount-landmarks:has(.tools-layer-advanced-menu:hover),
#myaccount-landmarks:has(label[id^=landmark-show-advanced-tools_ID_]:hover),
#myaccount-routes:has(label[id^=route-show-advanced-tools_ID_]:hover) {
overflow-y: visible;
Expand Down
11 changes: 3 additions & 8 deletions src/css/position.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@
#interactivityPopup,
#editoPopup,
#onlinePopup,
#locationPopup,
#routeDrawHelpPopup {
#locationPopup {
position: relative;
padding: 24px;
font-family: "Open Sans";
Expand All @@ -196,16 +195,14 @@
#interactivityPopup .divPositionTitle,
#editoPopup .divPositionTitle,
#onlinePopup .divPositionTitle,
#locationPopup .divPositionTitle,
#routeDrawHelpPopup .divPositionTitle {
#locationPopup .divPositionTitle {
margin-right: 30px;
}

.interactivityPopup,
.editoPopup,
.onlinePopup,
.locationPopup,
.routeDrawHelpPopup {
.locationPopup {
position: fixed;
z-index: 9999;
}
Expand All @@ -220,7 +217,6 @@
top: 20px;
}

.routeDrawHelpPopup>.maplibregl-popup-content,
.editoPopup>.maplibregl-popup-content,
.interactivityPopup>.maplibregl-popup-content,
.onlinePopup>.maplibregl-popup-content,
Expand All @@ -230,7 +226,6 @@
padding: 0;
}

.routeDrawHelpPopup>.maplibregl-popup-tip,
.editoPopup>.maplibregl-popup-tip,
.onlinePopup>.maplibregl-popup-tip,
.interactivityPopup>.maplibregl-popup-tip,
Expand Down
Loading