Skip to content

Commit

Permalink
Merge branch '2024_1_staging' of github.com:opengis/waymark into 2024…
Browse files Browse the repository at this point in the history
…_1_staging

# Conflicts:
#	languages/waymark.pot
  • Loading branch information
morehawes committed Jan 8, 2024
2 parents 868cd5c + 5884ec0 commit 01e3388
Show file tree
Hide file tree
Showing 5 changed files with 127 additions and 97 deletions.
1 change: 1 addition & 0 deletions assets/css/admin.css
Expand Up @@ -346,6 +346,7 @@ div.widget-content div.waymark-parameters-container div.waymark-controls input[t
* ============= SETTINGS =============
* ====================================
*/
body.waymark_page_waymark-settings #waymark-admin-container.waymark-active-waymark-settings-tab-misc .waymark-settings-section-cluster_options,
body.waymark_page_waymark-settings #waymark-admin-container.waymark-active-waymark-settings-tab-misc .waymark-settings-section-interaction_options,
body.waymark_page_waymark-settings #waymark-admin-container.waymark-active-waymark-settings-tab-misc .waymark-settings-section-elevation_options,
body.waymark_page_waymark-settings #waymark-admin-container.waymark-active-waymark-settings-tab-misc .waymark-settings-section-shortcode_options,
Expand Down

0 comments on commit 01e3388

Please sign in to comment.