Commit 7eede5d1 authored by Niels Holt's avatar Niels Holt

Adjust to grunt-fcoo-plugin version ^2.0.0

parent 903e0ada
{
"name": "ifm-maps",
"version": "2.1.0",
"homepage": "https://github.com/FCOO/ifm-maps",
"authors": [
"Jesper Baasch-Larsen jla@fcoo.dk",
"Niels Holt nho@fcoo.dk"
],
"description": "",
"repository": {
"type": "git",
"url": "git://github.com/FCOO/ifm-maps.git"
},
"dependencies": {
"fcoo-application": "fcoo/fcoo-application#0.0.*",
"fcoo-leaflet": "fcoo/fcoo-leaflet#0.2.*",
"moment": "^2.11.2",
"jquery-ui": "^1.11.4",
"noty": "^2.3.8",
"leaflet-control-position": "fcoo/leaflet-control-position#latest",
"leaflet-control-legend": "fcoo/leaflet-control-legend",
"leaflet-categorized-layers": "fcoo/leaflet-categorized-layers",
"leaflet-control-osm-geocoder": "https://github.com/k4r573n/leaflet-control-osm-geocoder.git",
"leaflet-time-slider": "fcoo/leaflet-time-slider#latest",
"leaflet-control-vertical": "fcoo/leaflet-control-vertical",
"leaflet-control-datetime": "fcoo/leaflet-control-datetime",
"leaflet-languageselector": "fcoo/leaflet-languageselector",
"leaflet-control-fa-button": "fcoo/leaflet-control-fa-button",
"leaflet-tilelayer-wms-pydap": "fcoo/leaflet-tilelayer-wms-pydap",
"leaflet-tilelayer-wms-fcoo": "fcoo/leaflet-tilelayer-wms-fcoo",
"leaflet-geojsonlayer-fwarn": "fcoo/leaflet-geojsonlayer-fwarn",
"leaflet.locatecontrol": "jblarsen/leaflet-locatecontrol#^0.43.0",
"leaflet-layer-sealevel-denmark": "fcoo/leaflet-layer-sealevel-denmark",
"leaflet-layer-tides-greenland": "fcoo/leaflet-layer-tides-greenland",
"leaflet-geojsonlayer-msi": "fcoo/leaflet-geojsonlayer-msi",
"raven-js": "~3.2.1"
},
"overrides": {
"moment": {
"main": [
"min/moment.min.js"
]
},
"jquery-ui": {
"main": [
"jquery-ui.min.js",
"themes/base/core.css",
"themes/base/slider.css",
"themes/ui-lightness/theme.css",
"themes/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png",
"themes/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png"
]
},
"leaflet-languageselector": {
"main": [
"leaflet-languageselector.js",
"leaflet-languageselector.css"
]
},
"leaflet-control-osm-geocoder": {
"main": [
"Control.OSMGeocoder.js",
"images/geocoder.png"
]
},
"leaflet-plugins": {
"main": [
"control/Permalink.js"
]
}
},
"devDependencies": {
"bourbon": "latest",
"modernizr-mixin": "latest",
"mathsass": "latest"
},
"license": "MIT",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"moduleType": [
"es6"
],
"resolutions": {
"fcoo-application": "0.0.*",
"fcoo-leaflet": "0.2.*",
"jquery": "~1",
"leaflet": "1.0.0-rc.1"
}
}
\ No newline at end of file
......@@ -16,8 +16,8 @@
</head>
<body>
<div class="container">
<a class="show-for-lang-da" href="//fcoo.dk/" border="0"><img class="logo" width="270" height="90" src="//media.fcoo.dk/logos/FCOO_logo_270x90.png" alt="Forsvarets Center for Operativ Oceanografi"></a>
<a class="show-for-lang-en" href="//fcoo.dk/?lang=eng" border="0"><img class="logo" width="270" height="90" src="//media.fcoo.dk/logos/FCOO_logo_270x90.png" alt="Defence Centre for Operational Oceanography"></a>
<a class="show-for-lang-da" href="//fcoo.dk/" border="0"><img class="logo" width="270" height="90" src="../images/FCOO_logo_270x90.png" alt="Forsvarets Center for Operativ Oceanografi"></a>
<a class="show-for-lang-en" href="//fcoo.dk/?lang=eng" border="0"><img class="logo" width="270" height="90" src="../images/FCOO_logo_270x90.png" alt="Defence Centre for Operational Oceanography"></a>
<h1 class="show-for-lang-da">Sejladsudsigt</h1>
<h1 class="show-for-lang-en">Marine Forecast</h1>
......
/*
SCSS for start page of ifm.fcoo.dk
SCSS for start page of ifm.fcoo.dk
*/
//Default = lang-da
.show-for-lang-da { display: inherit !important; }
.show-for-lang-en { display: none !important; }
.show-for-lang-da { display: inherit !important; }
.show-for-lang-en { display: none !important; }
.lang-en {
.show-for-lang-en { display: inherit !important; }
.show-for-lang-da { display: none !important; }
.show-for-lang-en { display: inherit !important; }
.show-for-lang-da { display: none !important; }
}
body {
background-color: white;
margin: 0;
padding: 0;
overflow: hidden;
background-color: white;
margin: 0;
padding: 0;
overflow: hidden;
.container {
box-sizing: border-box;
margin : 0 auto;
.container {
box-sizing: border-box;
margin : 0 auto;
width : 100%;
max-width : 480px;
min-width : 280px;
width : 100%;
max-width : 480px;
min-width : 280px;
height : 100%;
min-height : 480px;
}
height : 100%;
min-height: 480px;
}
.logo, select, #map {
display: block;
margin: 0 auto;
padding: 0;
}
h1 {
margin: 5px;
text-align: center;
color: #1c4b88;
font-size: 16pt;
font-weight: bold;
font-family: Tahoma,Helvetica,sans-serif;
}
select {
width: 250px;
}
select, select option {
color: #1c4b88;
font-size: 12pt;
font-weight: bold;
font-family: Tahoma,Helvetica,sans-serif;
text-align: center;
text-align-last:center; //Chrome
}
.logo, select, #map {
display: block;
margin : 0 auto;
padding: 0;
}
h1 {
margin: 5px;
text-align: center;
color: #1c4b88;
font-size: 16pt;
font-weight: bold;
font-family: Tahoma,Helvetica,sans-serif;
}
select {
width: 250px;
}
select, select option {
color: #1c4b88;
font-size: 12pt;
font-weight: bold;
font-family: Tahoma,Helvetica,sans-serif;
text-align: center;
text-align-last:center; //Chrome
}
#map {
margin-top: 10px;
width : 100%;
height : 300px;
}
@media screen and (min-height: 481px) and (max-height: 568px) { #map {height: 380px; } }
@media screen and (min-height: 569px) and (max-height: 640px) { #map {height: 450px; } }
@media screen and (min-height: 641px) { #map {height: 550px; } }
#map {
margin-top: 10px;
width : 100%;
height : 300px;
}
@media screen and (min-height: 481px) and (max-height: 568px) { #map {height: 380px; } }
@media screen and (min-height: 569px) and (max-height: 640px) { #map {height: 450px; } }
@media screen and (min-height: 641px) { #map {height: 550px; } }
}
......@@ -21,6 +21,7 @@
"leaflet-control-legend": "fcoo/leaflet-control-legend",
"leaflet-categorized-layers": "fcoo/leaflet-categorized-layers",
"leaflet-control-osm-geocoder": "https://github.com/k4r573n/leaflet-control-osm-geocoder.git",
"leaflet-plugins": "jblarsen/leaflet-plugins#master",
"leaflet-time-slider": "fcoo/leaflet-time-slider#latest",
"leaflet-control-vertical": "fcoo/leaflet-control-vertical",
"leaflet-control-datetime": "fcoo/leaflet-control-datetime",
......
{
"name" : "ifm-maps",
"version" : "0.0.0",
"homepage" : "https://github.com/FCOO/ifm-maps",
"authors": [
"Jesper Baasch-Larsen jla@fcoo.dk",
"Niels Holt nho@fcoo.dk"
],
"description": "package.json is only use for building the package. see bower.json for more info",
"repository" : {
"type": "git",
"url" : "git://github.com/FCOO/ifm-maps.git"
},
"dependencies": {
"grunt": "^1.0.1",
"grunt-fcoo-grunt-plugin": "^2.0.0"
},
"license": "MIT"
"name": "ifm-maps",
"version": "0.0.0",
"homepage": "https://github.com/FCOO/ifm-maps",
"authors": [
"Jesper Baasch-Larsen jla@fcoo.dk",
"Niels Holt nho@fcoo.dk"
],
"description": "package.json is only use for building the package. see bower.json for more info",
"repository": {
"type": "git",
"url": "git://github.com/FCOO/ifm-maps.git"
},
"dependencies": {
"grunt": "^1.0.1",
"grunt-fcoo-grunt-plugin": "^2.0.0"
},
"license": "MIT"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment