From 018db9ae9b670785a5d6f4a48b1e0abf7a6b0fcd Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Sun, 19 May 2019 13:49:45 +0200 Subject: [PATCH 1/2] Harmonize modals --- index.html | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 77e7780..0d9164a 100644 --- a/index.html +++ b/index.html @@ -520,14 +520,25 @@ />

-

- + + + + From f1a20413b089e197f25932060639a6bd8e673225 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Sun, 19 May 2019 13:46:52 +0200 Subject: [PATCH 2/2] Upgrade to latest bootstrap --- css/style.css | 29 +++-- index.html | 279 ++++++++++++++++++++++-------------------- js/control/Message.js | 2 +- package.json | 11 +- yarn.lock | 43 ++++--- 5 files changed, 190 insertions(+), 174 deletions(-) diff --git a/css/style.css b/css/style.css index 2bcc8ef..25126bd 100644 --- a/css/style.css +++ b/css/style.css @@ -65,11 +65,6 @@ table.dataTable { /* align with leaflet-control */ padding: 0.5rem 10px; } -.navbar-brand { - float: right; - margin-left: 1rem; - margin-right: 0; -} .nav-link .fa { margin-right: 0.2em; } @@ -262,7 +257,7 @@ https://css-tricks.com/svg-line-animation-works/ background: none; outline: none; - /* bootstrap .btn-default */ + /* bootstrap .btn-secondary */ background-image: linear-gradient(to bottom, #fff 0, #e0e0e0 100%); background-repeat: repeat-x; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), @@ -270,15 +265,25 @@ https://css-tricks.com/svg-line-animation-works/ border: 1px solid #adadad; } -/* activated Font Awesome icon and Bootstrap button -(for EasyButton add ' active' to icon class property) */ -.fa.active, -.btn.active, -.btn.active:hover, -.btn.active:focus { +/* activated Font Awesome icon (for EasyButton add ' active' to icon class property) */ +.fa.active { /* use same color as leaflet-locatecontrol */ color: #2074b6; } +/* Bootstrap button */ +.btn-secondary:not(:disabled):not(.disabled).active, +.btn-secondary.active, +.btn-secondary:hover, +.btn-outline-secondary:not(:disabled):not(.disabled).active, +.btn-outline-secondary:hover { + /* use same color as leaflet-locatecontrol */ + color: #2074b6; + background-color: #e6e6e6; +} + +button.btn { + box-shadow: none !important; +} .leaflet-bar button { /* override button for horizontal fa center in Firefox */ diff --git a/index.html b/index.html index 0d9164a..9f7fccf 100644 --- a/index.html +++ b/index.html @@ -15,30 +15,28 @@ -