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

Mappy holidays 2024 #1635

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 22 additions & 10 deletions css/80_app.css
Original file line number Diff line number Diff line change
Expand Up @@ -2943,23 +2943,22 @@ img.tag-reference-wiki-image {
border-radius: 0;
pointer-events: auto;
}

/*
.map-control > button:not(.disabled):focus,
.map-control > button:not(.disabled):active {
background: rgba(0, 0, 0, .8);
}
.map-control > button.active,
.map-control > button.active:active {
background: #7092ff;
}

@media (hover: hover) {
.map-control > button:not(.disabled):hover {
background: rgba(0, 0, 0, .8);
}
.map-control > button.active:hover {
background: #7092ff;
}
} */
@media (hover: hover) {
/* .map-control > button:not(.disabled):hover {
background: rgba(0, 0, 0, .8);
}
.map-control > button.active:hover {
background: #7092ff;
} */
}

.map-control > button.disabled .icon {
Expand Down Expand Up @@ -4202,6 +4201,19 @@ li.issue-fix-item button:not(.actionable) .fix-icon {
pointer-events: none;
}

.snowflake-overlay {
position: absolute;
z-index: 3;
top: 0;
left: 0;
right: 0;
bottom: 0;
width: 100%;
height: 100%;
pointer-events: none;
touch-action: none;
}

.overlay * {
pointer-events: auto;
}
Expand Down
168 changes: 168 additions & 0 deletions css/80_app_fb.css
Original file line number Diff line number Diff line change
Expand Up @@ -1076,3 +1076,171 @@ img.rapid-catalog-dataset-thumbnail.inverted {
margin: 4px;
border-radius: 5px;
}


/* Background layer list customizations */
ul.layer-list.layer-background-list li button.background-favorite-button {
background-color: inherit;
}
button.background-favorite-button .icon {
fill-opacity: 0;
stroke-width: 1;
}
button.background-favorite-button.active .icon {
fill-opacity: inherit;
}
.background-pane .layer-list button.background-favorite-button {
border: 0;
}

li.best > label > span.best > svg {
color: #e98733;
height: 19px;
}


/* 3D Map
------------------------------------------------------- */
.three-d-map {
position: absolute;
overflow: hidden;
width: 300px;
height: 300px;
right: 0;
bottom: 0;
z-index: 1;
margin-right: 30px;
border: #aaa 1px solid;
border-radius: 6px;
box-shadow: rgb(0 0 0 / 42%) 0px 0px 0px 3px;
}

.ideditor[dir='ltr'] .map-in-map {
left: 10px;
}
.ideditor[dir='rtl'] .map-in-map {
right: 10px;
}

div.holiday-banner {
color: rgba(252, 251, 233, 0.85);
font-family: 'Great Vibes', cursive;
font-weight: 400;
margin: 0 0 .8em 0;
font-size: 3.3em;
width: 300px;
text-align: center;
margin-top: -15px;
text-shadow: 0 0 80px rgba(223, 221, 170, 0.85),0 0 30px rgba(252, 249, 233, 0.85),0 0 6px DarkRed;
}
div.card-container-yule_log {
padding-bottom: 0px;
width:400px;
height:250px;
}

div.card-content.card-content-yule_log {
background:url('https://media.giphy.com/media/ZHXz9MZbJI1YA/giphy.gif');
height: 100%;
}
div.holiday-banner.smaller {
margin: 0 0 .8em 0;
font-size: 2.5em;
width: 300px;
font-weight: 300;
margin-top: -5px;
}

.bar-button::before {
content: '';
display: block;
position: absolute;
top: -7px;
left: -3px;
right: 0;
height: 23px;
background: url('img/snowcover1.png') no-repeat 0 0,
url('img/snowcover2.png') no-repeat 50% 0,
url('img/snowcover3.png') no-repeat 100% 0;
}

.bar-button:nth-child(odd) {
box-shadow: 0px 0px 10px 3px #f00;
background: #f00;
animation: red-light-glow 3s ease-in-out alternate infinite;
}

.bar-button:nth-child(even),
.bar-button.ai-features-toggle {
box-shadow: 0px 0px 10px 3px #0f08;
background: #0f08;
animation: green-light-glow 3s 1.5s ease-in-out alternate infinite;
}


@keyframes red-light-glow {
0% {
box-shadow: 0px 0px 10px 6px #f00;
background: #f00;
}
100% {
box-shadow: 0px 0px 6px 3px #f008;
background: #f008;
}
}


@keyframes green-light-glow {
0% {
box-shadow: 0px 0px 6px 3px #0f08;
background: #0f08;
}
100% {
box-shadow: 0px 0px 10px 6px #0f0;
background: #0f0;
}
}

div.map-controls .map-control {
background: #aaaaaa88;
border-radius: 4px;
}

div.map-controls > .map-control > button > svg {
display:none;
}

div.map-controls div.bearing_n {
display:none;
}

div.map-control.bearing button {
background: url('img/holiday_reset_bearing.png')
}
div.map-control.help-control button {
background: url('img/holiday_help.svg')
}
div.map-control.preferences-control button {
background: url('img/holiday_preferences.svg')
}
div.map-control.issues-control button {
background: url('img/holiday_issues.svg')
}
div.map-control.map-data-control button {
background: url('img/holiday_map-data.svg')
}
div.map-control.background-control button {
background: url('img/holiday_background.svg')
}
div.map-control.geolocate button {
background: url('img/holiday_geolocate.svg')
}
div.map-control.zoom-to-selection button {
background: url('img/holiday_zoom-to-selection.svg')
}
div.map-control.zoombuttons button.zoom-in {
background: url('img/holiday_zoom-in.svg')
}
div.map-control.zoombuttons button.zoom-out {
background: url('img/holiday_zoom-out.svg')
}
6 changes: 6 additions & 0 deletions data/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,9 @@ en:
note_created_date: Created Date
note_created_user: Created By
note_link_text: Note on openstreetmap.org
yule_log:
title: Yule Log
key: Y
location:
title: Location
unknown_location: Unknown Location
Expand Down Expand Up @@ -2786,6 +2789,9 @@ en:
toggle_measurement_card:
label: Toggle measurement panel
key: M # <Command> + <Shift> + <this key> to toggle the Measurement Info panel
toggle_yule_log:
label: Toggle Yule Log panel
key: Y # <Command> + <Shift> + <this key> to toggle the Yule Log panel

units:
feet: "{quantity} ft"
Expand Down
5 changes: 5 additions & 0 deletions data/shortcuts.json
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,11 @@
"modifiers": ["⌘", "⇧"],
"shortcuts": ["shortcuts.command.toggle_measurement_card.key"],
"text": "shortcuts.command.toggle_measurement_card.label"
},
{
"modifiers": ["⌘", "⇧"],
"shortcuts": ["shortcuts.command.toggle_yule_log.key"],
"text": "shortcuts.command.toggle_yule_log.label"
}
]
}
Expand Down
Binary file added dist/img/holiday_candy_cane_cursor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/holiday_christmas_tree_cursor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/holiday_gingerbread_man_cursor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/holiday_reset_bearing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/holiday_santa_claus_cursor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/holiday_santa_sleigh_cursor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/icons/snowflake1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/icons/snowflake2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/icons/snowflake3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/icons/snowflake4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/icons/snowflake5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/icons/snowflake6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/icons/snowflake7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/img/icons/teapot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions holidays/holiday_background.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading