Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mesh
meshmap
Commits
91c333a6
Commit
91c333a6
authored
Nov 01, 2019
by
Eric - kg6wxc
Browse files
Merge branch 'fixLayerPopup' into 'master'
bugfix: make the layers popup larger. See merge request
!10
parents
856ed1c8
77e5c0cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
webpage/css/meshmap-default.css
View file @
91c333a6
...
...
@@ -208,3 +208,6 @@ MAP_DETAILS {
text-align
:
center
;
display
:
inline
;
}
.leaflet-control-layers-expanded
,
.leaflet-control-layers-list
{
height
:
200px
!important
;
}
\ No newline at end of file
webpage/map_display.php
View file @
91c333a6
...
...
@@ -245,30 +245,6 @@ echo "<meta property='og:image' content='" . $_SERVER['REQUEST_SCHEME'] . "://"
//echo $page_header . "\n";
echo
"<title>"
.
$USER_SETTINGS
[
'pageTitle'
]
.
"</title>
\n
"
;
/*
* check for the users custom.css files and use them if exists...
* load the "-default" files first (meshmap-default.css)
* and the user files second, that way changes in the users file(s)
* will override the default ones (if I understand CSS correctly)
*/
echo
"<link href='css/meshmap-default.css' rel='stylesheet'>
\n
"
;
if
(
file_exists
(
"./css/meshmap.css"
))
{
echo
"<link href='css/meshmap.css' rel='stylesheet'>
\n
"
;
}
//same thing but for legend.css (which controls the map legend)
echo
"<link href='css/map-legend-default.css' rel='stylesheet'>
\n
"
;
if
(
file_exists
(
"./css/map-legend.css"
))
{
echo
"<link href='css/map-legend.css' rel='stylesheet'>
\n
"
;
}
//same thing, but for some custom controls
//these can be used to move the main buttons (on the left) around on the map
echo
"<link href='css/leaflet-custom-control-vertical-center-default.css' rel='stylesheet'>
\n
"
;
if
(
file_exists
(
"./css/leaflet-custom-control-vertical-center.css"
))
{
echo
"<link href='css/leaflet-custom-control-vertical-center.css' rel='stylesheet'>
\n
"
;
}
/*
* If the client has internet access load everything from there
* if not, use the local resources.
...
...
@@ -299,6 +275,31 @@ echo "<link href='css/L.Control.SlideMenu.css' rel='stylesheet'>\n";
echo
"<script src='javascripts/leaflet-ruler.js'></script>
\n
"
;
echo
"<link rel='stylesheet' type='text/css' href='css/leaflet-ruler.css'>
\n
"
;
/*
* check for the users custom.css files and use them if exists...
* load the "-default" files first (meshmap-default.css)
* and the user files second, that way changes in the users file(s)
* will override the default ones (if I understand CSS correctly)
* These can also be used to override CSS values from anything above!
*/
echo
"<link href='css/meshmap-default.css' rel='stylesheet'>
\n
"
;
if
(
file_exists
(
"./css/meshmap.css"
))
{
echo
"<link href='css/meshmap.css' rel='stylesheet'>
\n
"
;
}
//same thing but for legend.css (which controls the map legend)
echo
"<link href='css/map-legend-default.css' rel='stylesheet'>
\n
"
;
if
(
file_exists
(
"./css/map-legend.css"
))
{
echo
"<link href='css/map-legend.css' rel='stylesheet'>
\n
"
;
}
//same thing, but for some custom controls
//these can be used to move the main buttons (on the left) around on the map
echo
"<link href='css/leaflet-custom-control-vertical-center-default.css' rel='stylesheet'>
\n
"
;
if
(
file_exists
(
"./css/leaflet-custom-control-vertical-center.css"
))
{
echo
"<link href='css/leaflet-custom-control-vertical-center.css' rel='stylesheet'>
\n
"
;
}
echo
"
\n
"
;
echo
"</head>
\n
"
;
echo
"<body>
\n
"
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment