jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consolidate CSS files after merge

Browse source
This commit is contained in:
Yohan Boniface 2018-06-02 18:24:19 +02:00
parent 502a7c26a7
commit 27bb306fd3
7 changed files with 302 additions and 367 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

234
umap/static/umap/default.css → umap/static/umap/base.css
View file

@ -1,12 +1,122 @@
div, ul, li, a, section, nav, /*
* Generic
*/
body, div, ul, ol, li, a, section, nav,
h1, h2, h3, h4, h5, h6, label, h1, h2, h3, h4, h5, h6, label,
hr, input, textarea { hr, input, textarea {
-moz-box-sizing:border-box; -moz-box-sizing:border-box;
-webkit-box-sizing:border-box; -webkit-box-sizing:border-box;
box-sizing: border-box; box-sizing: border-box;
padding: 0;
margin: 0; margin: 0;
padding: 0;
font-family: "fira_sans", -apple-system, BlinkMacSystemFont,
"Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
"Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
} }
body, div, ul, ol, li, a, section, nav,
h1, h2, h3, h4, h5, h6, label, hr {
padding: 0;
}
a {
text-decoration: none;
color: SeaGreen;
}
hr {
clear: both;
width: 100%;
height: 0;
max-width: 980px;
margin: 28px auto;
-moz-border-bottom-colors: none;
-moz-border-left-colors: none;
-moz-border-right-colors: none;
-moz-border-top-colors: none;
border-color: #ddd;
border-image: none;
border-style: solid;
border-width: 1px 0 0;
}
h1, h2 {
margin-bottom: 28px;
}
h3, h4, h5 {
margin-bottom: 14px;
}
p {
line-height: 21px;
margin-top: 14px;
margin-bottom: 14px;
}
/*
* List
*/
ul {
list-style-image:none;
list-style-position:inside;
list-style-type:none;
}
/* ************************************************* */
/* *********************** GRID ******************** */
/* ************************************************* */
.wrapper {
width: 100%;
clear: both;
}
.wrapper:after {
visibility: hidden;
display: block;
font-size: 0;
content: " ";
clear: both;
height: 0;
}
.row {
width: 100%;
max-width: 1200px;
clear: both;
margin-left: auto;
margin-right: auto;
margin-top: 0;
margin-bottom: 2rem;
}
.col {
float: left;
}
.right {
float: right;
}
.col + .col {
padding-left: 20px;
}
.half {
width: 50%;
}
.third {
width: 33.33%;
}
.two-third {
width: 66.66%
}
.quarter {
width: 25%;
}
.wide {
width: 100%;
}
.col + .wide {
padding-left: inherit;
}
.mshow, .tshow {
display: none;
}
.center {
margin-left: auto;
margin-right: auto;
float: none;
}
/* *********** */ /* *********** */
/* forms */ /* forms */
@ -151,7 +261,8 @@ input[type="file"] + .error {
line-height: 30px; line-height: 30px;
color: #fff; color: #fff;
margin: 0; margin: 0;
font-family: fira_sanslight; font-family: fira_sans;
font-weight: normal;
font-size: 1.2em; font-size: 1.2em;
padding: 0 5px; padding: 0 5px;
} }
@ -309,6 +420,123 @@ i.info {
transition: all .7s; transition: all .7s;
} }
.umap-delete:before, .umap-empty:before, .umap-to-polygon:before,
.umap-clone:before, .umap-edit:before,
.umap-to-polyline:before {
background-repeat: no-repeat;
text-indent: 38px;
height: 24px;
line-height: 24px;
display: inline-block;
background-image: url('./img/24.png');
vertical-align: bottom;
content: " ";
}
.dark .umap-delete:before, .dark .umap-empty:before,
.dark .umap-to-polygon:before,
.dark .umap-clone:before,
.dark .umap-edit:before,
.dark .umap-to-polyline:before {
background-image: url('./img/24-white.png');
vertical-align: middle;
}
.umap-to-polygon:before {
background-position: -80px -48px;
}
.umap-to-polyline:before {
background-position: -120px -48px;
}
.umap-clone:before {
background-position: -160px -88px;
}
.umap-delete:before {
background-position: -40px -8px;
}
.umap-edit:before {
background-position: -6px -6px;
}
.umap-empty:before {
background-position: -160px -126px;
}
.umap-edit-actions {
padding-top: 5px;
clear: both;
}
.umap-edit-actions li {
height: 36px;
line-height: 36px;
cursor: pointer;
margin-bottom: 5px;
border-radius: 2px;
border: 1px solid #222;
}
.umap-edit-actions li i {
background-image: url('./img/24-white.png');
background-repeat: no-repeat;
display: table-cell;
width: 36px;
height: 36px;
}
.umap-edit-actions li span {
display: table-cell;
vertical-align: middle;
}
.umap-edit-actions li:hover {
background-color: #353c3e;
}
.umap-form-iconfield {
position: relative;
overflow: hidden;
padding-bottom: 5px;
padding-top: 5px;
line-height: 30px;
}
.umap-icon-list, .umap-pictogram-list {
clear: both;
}
.umap-icon-choice {
display: block;
float: left;
width: 30px;
height: 30px;
line-height: 30px;
position: relative;
cursor: pointer;
background-image: url('./img/icon-bg.png');
text-align: center;
box-shadow: 0 0 4px 0 black inset;
margin-bottom: 5px;
margin-right: 5px;
}
.umap-icon-choice img {
vertical-align: middle;
max-width: 24px;
}
.umap-icon-choice:hover,
.umap-icon-choice.selected,
.umap-color-picker span:hover {
box-shadow: 0 0 4px 0 black;
}
.umap-icon-choice .leaflet-marker-icon {
bottom: 0;
left: 30px;
position: absolute;
}
.umap-color-picker {
clear: both;
margin-bottom: 20px;
overflow: hidden;
display: none;
}
.umap-color-picker span {
width: 20px;
height: 20px;
display: block;
padding: 0;
margin: 0;
cursor: pointer;
float: left;
}
/* *********** */ /* *********** */

218
umap/static/umap/umap.css → umap/static/umap/content.css
View file

@ -1,164 +1,6 @@
/* ************************************************* */
/* *********************** FONT ******************** */
/* ************************************************* */
@font-face {
font-family: 'fira_sans';
src: url('./font/FiraSans-Light.woff2') format('woff2'),
url('./font/FiraSans-Light.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'fira_sans';
src: url('./font/FiraSans-SemiBold.woff2') format('woff2'),
url('./font/FiraSans-SemiBold.woff') format('woff');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'fira_sans';
src: url('./font/FiraSans-LightItalic.woff2') format('woff2'),
url('./font/FiraSans-LightItalic.woff') format('woff');
font-weight: normal;
font-style: italic;
}
/*
* Generic
*/
body, div, ul, ol, li, a, section, nav,
h1, h2, h3, h4, h5, h6, label,
hr, input, textarea {
-moz-box-sizing:border-box;
-webkit-box-sizing:border-box;
box-sizing: border-box;
margin: 0;
font-family: "fira_sans", -apple-system, BlinkMacSystemFont,
"Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
"Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
}
body, div, ul, ol, li, a, section, nav,
h1, h2, h3, h4, h5, h6, label, hr {
padding: 0;
}
a {
text-decoration: none;
color: SeaGreen;
}
hr {
clear: both;
width: 100%;
height: 0;
max-width: 980px;
margin: 28px auto;
-moz-border-bottom-colors: none;
-moz-border-left-colors: none;
-moz-border-right-colors: none;
-moz-border-top-colors: none;
border-color: #ddd;
border-image: none;
border-style: solid;
border-width: 1px 0 0;
}
h1, h2 {
margin-bottom: 28px;
}
h3, h4, h5 {
margin-bottom: 14px;
}
p {
line-height: 21px;
margin-top: 14px;
margin-bottom: 14px;
}
/*
* List
*/
ul {
list-style-image:none;
list-style-position:inside;
list-style-type:none;
}
/* ************************************************* */
/* *********************** GRID ******************** */
/* ************************************************* */
.wrapper {
width: 100%;
clear: both;
}
.wrapper:after {
visibility: hidden;
display: block;
font-size: 0;
content: " ";
clear: both;
height: 0;
}
.row {
width: 100%;
max-width: 1200px;
clear: both;
margin-left: auto;
margin-right: auto;
margin-top: 0;
margin-bottom: 2rem;
}
.col {
float: left;
}
.right {
float: right;
}
.col + .col {
padding-left: 20px;
}
.half {
width: 50%;
}
.third {
width: 33.33%;
}
.two-third {
width: 66.66%
}
.quarter {
width: 25%;
}
.wide {
width: 100%;
}
.col + .wide {
padding-left: inherit;
}
.mshow, .tshow {
display: none;
}
.center {
margin-left: auto;
margin-right: auto;
float: none;
}
/* /*
* Content * Content
*/ */
.tintbox, .tintbox a {
font-family: serif;
}
.tintbox {
background-color: #f2f2f2;
padding: 28px;
}
.tintbox p {
color: #6f6f6f;
}
body.content { body.content {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -166,23 +8,6 @@ body.content {
} }
/*
Foundation use a position:relative; on body, which break the 100% rule
on #map
*/
body.map_detail {
width: 100%;
height: 100%;
position: inherit;
}
/* Global alert */
.alert-box.global {
z-index: 1001;
margin-right: auto;
margin-left: auto;
}
/* Search form */ /* Search form */
input::-webkit-input-placeholder, ::-webkit-input-placeholder { input::-webkit-input-placeholder, ::-webkit-input-placeholder {
color: #a5a5a5; color: #a5a5a5;
@ -241,34 +66,6 @@ input:-moz-placeholder, :-moz-placeholder {
background-image: url("./openstreetmap.png"); background-image: url("./openstreetmap.png");
} }
/*
* Navigation
*/
header {
margin: 14px 0;
}
footer {
height: 140px;
margin-top: 40px;
background-color: #2E3641;
text-align: center;
line-height: 140px;
color: #8F96A3;
}
footer a.branding {
background-image: url("./img/logo_filigree.png");
background-position: left center;
background-repeat: no-repeat;
background-size: 60px auto;
font-size: 30px;
font-weight: bold;
height: 140px;
padding-left: 70px;
color: #8F96A3;
display: inline-block;
}
/* **************************** */ /* **************************** */
/* home */ /* home */
@ -374,6 +171,9 @@ h2.section {
color: #efefef; color: #efefef;
text-decoration: underline; text-decoration: underline;
} }
body.content #umap-ui-container {
background-color: #fff;
}
/* **************************** */ /* **************************** */
@ -479,21 +279,9 @@ ul.umap-autocomplete {
/* **************************** */ /* **************************** */
/* Override Leaflet.Storage */ /* Override Leaflet.Storage */
/* **************************** */ /* **************************** */
body.content #umap-ui-container {
/* width: 100%;
top: 0;
right: 0;
left: 0;
bottom: inherit;
height: 30%;*/
background-color: #fff;
}
#id_editors + br + span.helptext { #id_editors + br + span.helptext {
display: none; display: none;
} }
.umap-loader {
background-color: #79c1c0 !important;
}
.leaflet-container a.button { .leaflet-container a.button {
color: #eeeeec; color: #eeeeec;
} }

30
umap/static/umap/font.css Normal file
View file

@ -0,0 +1,30 @@
/* ************************************************* */
/* *********************** FONT ******************** */
/* ************************************************* */
@font-face {
font-family: 'fira_sans';
src: url('./font/FiraSans-Light.woff2') format('woff2'),
url('./font/FiraSans-Light.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'fira_sans';
src: url('./font/FiraSans-SemiBold.woff2') format('woff2'),
url('./font/FiraSans-SemiBold.woff') format('woff');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'fira_sans';
src: url('./font/FiraSans-LightItalic.woff2') format('woff2'),
url('./font/FiraSans-LightItalic.woff') format('woff');
font-weight: normal;
font-style: italic;
}

141
umap/static/umap/storage.css → umap/static/umap/map.css
View file

@ -11,14 +11,6 @@
right: 0; right: 0;
} }
.clearafter:after {
visibility: hidden;
display: block;
font-size: 0;
content: " ";
clear: both;
height: 0;
}
/* *********** */ /* *********** */
/* Controls */ /* Controls */
@ -556,7 +548,7 @@ ul.photon-autocomplete {
.umap-caption i, .umap-caption i,
.umap-browse-datalayers i { .umap-browse-datalayers i {
background-repeat: no-repeat; background-repeat: no-repeat;
background-image: url('./../src/img/16.png'); background-image: url('./img/16.png');
display: inline; display: inline;
padding: 0 10px; padding: 0 10px;
cursor: pointer; cursor: pointer;
@ -565,7 +557,7 @@ ul.photon-autocomplete {
vertical-align: middle; vertical-align: middle;
} }
.dark .umap-browse-datalayers i { .dark .umap-browse-datalayers i {
background-image: url('./../src/img/16-white.png'); background-image: url('./img/16-white.png');
} }
.umap-browse-datalayers li[draggable] .drag-handle { .umap-browse-datalayers li[draggable] .drag-handle {
float: right; float: right;
@ -574,7 +566,7 @@ ul.photon-autocomplete {
cursor: move; cursor: move;
} }
.leaflet-inplace-toolbar a { .leaflet-inplace-toolbar a {
background-image: url('./../src/img/16-white.png'); background-image: url('./img/16-white.png');
background-color: #323737!important; background-color: #323737!important;
} }
.leaflet-toolbar-tip { .leaflet-toolbar-tip {
@ -855,7 +847,7 @@ a.add-datalayer:hover,
/* ********************************* */ /* ********************************* */
.umap-icon-16 { .umap-icon-16 {
background-repeat: no-repeat; background-repeat: no-repeat;
background-image: url('./../src/img/16.png'); background-image: url('./img/16.png');
display: inline; display: inline;
padding: 0 10px; padding: 0 10px;
} }
@ -1062,128 +1054,6 @@ a.add-datalayer:hover,
} }
/* ********************************* */
/* Forms utils */
/* ********************************* */
.umap-delete:before, .umap-empty:before, .umap-to-polygon:before,
.umap-clone:before, .umap-edit:before,
.umap-to-polyline:before {
background-repeat: no-repeat;
text-indent: 38px;
height: 24px;
line-height: 24px;
display: inline-block;
background-image: url('./img/24.png');
vertical-align: bottom;
content: " ";
}
.dark .umap-delete:before, .dark .umap-empty:before,
.dark .umap-to-polygon:before,
.dark .umap-clone:before,
.dark .umap-edit:before,
.dark .umap-to-polyline:before {
background-image: url('./img/24-white.png');
vertical-align: middle;
}
.umap-to-polygon:before {
background-position: -80px -48px;
}
.umap-to-polyline:before {
background-position: -120px -48px;
}
.umap-clone:before {
background-position: -160px -88px;
}
.umap-delete:before {
background-position: -40px -8px;
}
.umap-edit:before {
background-position: -6px -6px;
}
.umap-empty:before {
background-position: -160px -126px;
}
.umap-edit-actions {
padding-top: 5px;
clear: both;
}
.umap-edit-actions li {
height: 36px;
line-height: 36px;
cursor: pointer;
margin-bottom: 5px;
border-radius: 2px;
border: 1px solid #222;
}
.umap-edit-actions li i {
background-image: url('./img/24-white.png');
background-repeat: no-repeat;
display: table-cell;
width: 36px;
height: 36px;
}
.umap-edit-actions li span {
display: table-cell;
vertical-align: middle;
}
.umap-edit-actions li:hover {
background-color: #353c3e;
}
.umap-form-iconfield {
position: relative;
overflow: hidden;
padding-bottom: 5px;
padding-top: 5px;
line-height: 30px;
}
.umap-icon-list, .umap-pictogram-list {
clear: both;
}
.umap-icon-choice {
display: block;
float: left;
width: 30px;
height: 30px;
line-height: 30px;
position: relative;
cursor: pointer;
background-image: url('./img/icon-bg.png');
text-align: center;
box-shadow: 0 0 4px 0 black inset;
margin-bottom: 5px;
margin-right: 5px;
}
.umap-icon-choice img {
vertical-align: middle;
max-width: 24px;
}
.umap-icon-choice:hover,
.umap-icon-choice.selected,
.umap-color-picker span:hover {
box-shadow: 0 0 4px 0 black;
}
.umap-icon-choice .leaflet-marker-icon {
bottom: 0;
left: 30px;
position: absolute;
}
.umap-color-picker {
clear: both;
margin-bottom: 20px;
overflow: hidden;
display: none;
}
.umap-color-picker span {
width: 20px;
height: 20px;
display: block;
padding: 0;
margin: 0;
cursor: pointer;
float: left;
}
/* ********************************* */ /* ********************************* */
/* Ajax loader */ /* Ajax loader */
/* ********************************* */ /* ********************************* */
@ -1209,13 +1079,14 @@ a.add-datalayer:hover,
right: 0; right: 0;
height: 4px; height: 4px;
z-index: 10100; z-index: 10100;
background-color: DarkRed; background-color: #79c1c0 !important;
-webkit-transform: translateX(100%); -webkit-transform: translateX(100%);
-moz-transform: translateX(100%); -moz-transform: translateX(100%);
-o-transform: translateX(100%); -o-transform: translateX(100%);
transform: translateX(100%); transform: translateX(100%);
} }
@-webkit-keyframes shift-rightwards @-webkit-keyframes shift-rightwards
{ {
0% 0%

24
umap/static/umap/nav.css
View file

@ -1,3 +1,27 @@
header {
margin: 14px 0;
}
footer {
height: 140px;
margin-top: 40px;
background-color: #2E3641;
text-align: center;
line-height: 140px;
color: #8F96A3;
}
footer a.branding {
background-image: url("./img/logo_filigree.png");
background-position: left center;
background-repeat: no-repeat;
background-size: 60px auto;
font-size: 30px;
font-weight: bold;
height: 140px;
padding-left: 70px;
color: #8F96A3;
display: inline-block;
}
.umap-nav { .umap-nav {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

11
umap/templates/base.html
View file

@ -4,17 +4,6 @@
<head> <head>
<title>{% block head_title %}{{ SITE_NAME }}{% endblock %}</title> <title>{% block head_title %}{{ SITE_NAME }}{% endblock %}</title>
<meta charset="utf-8"> <meta charset="utf-8">
{% compress css %}
<!-- Included CSS Files (Compressed) -->
<link rel="stylesheet" href="{{ STATIC_URL }}umap/default.css">
<link rel="stylesheet" href="{{ STATIC_URL }}umap/umap.css">
<link rel="stylesheet" href="{{ STATIC_URL }}umap/nav.css">
<link rel="stylesheet" href="{{ STATIC_URL }}umap/theme.css">
{% endcompress css %}
<!-- IE Fix for HTML5 Tags -->
<!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
{% block extra_head %} {% block extra_head %}
{% endblock extra_head %} {% endblock extra_head %}

7
umap/templates/umap/css.html
View file

@ -7,4 +7,9 @@
<link rel="stylesheet" href="{{ STATIC_URL }}umap/vendors/toolbar/leaflet.toolbar.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}umap/vendors/toolbar/leaflet.toolbar.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}umap/vendors/measurable/Leaflet.Measurable.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}umap/vendors/measurable/Leaflet.Measurable.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}umap/vendors/fullscreen/leaflet.fullscreen.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}umap/vendors/fullscreen/leaflet.fullscreen.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}umap/storage.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}umap/font.css">
<link rel="stylesheet" href="{{ STATIC_URL }}umap/base.css">
<link rel="stylesheet" href="{{ STATIC_URL }}umap/content.css">
<link rel="stylesheet" href="{{ STATIC_URL }}umap/nav.css">
<link rel="stylesheet" href="{{ STATIC_URL }}umap/map.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}umap/theme.css">