diff --git a/frontend/static/css/admin.css b/frontend/static/css/admin.css index 438ce9f..6171889 100644 --- a/frontend/static/css/admin.css +++ b/frontend/static/css/admin.css @@ -154,9 +154,9 @@ h5>.badge { .cards { - padding-left: 5px; + /*padding-left: 5px;*/ padding-bottom: 15px; - padding-top: 5px; + padding-top: 15px; } .row { @@ -167,12 +167,22 @@ h5>.badge { .sticky { z-index: 2; position: sticky; - top: 0; + top: 56px; /*background: white; box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2);*/ - padding: 10px; + padding: 15px 0; margin-right: 15px; margin-bottom: 15px; + background-color:rgba(233, 236, 239,0.7); +} + +#cd-cart .sticky{ + background-color:white; + top:30px; + padding:15px; + margin:0px; + margin-top:-10px; + background-color:rgba(233, 236, 239,0.9); } .sticky-sm { @@ -259,13 +269,24 @@ h5>.badge { padding: 0; } +#cd-cart .cd-cart-items h6.card-title { + font-size:12px; + padding:0; + margin:0; +} + +.cd-cart-items .badge, +#catalog .badge.badge-secondary{ + display:none; +} + @media only screen and (min-width: 1200px) { #cd-cart>* { padding: 0 2em; } } -#cd-cart>* { +#cd-cart>*{ padding: 0 1em; } @@ -350,36 +371,36 @@ h5>.badge { /* * Toggle on cart icon */ -.green { +.green{ color: #FFF; padding: 6px 12px 6px 12px; - border: 2px solid #999faf; + /*border: 2px solid #006878;*/ color: #999faf; - display: inline-block; + /*display: inline-block;*/ position: relative; transition: .4s; } .green .number { - padding: 2px 7px; - background: #999faf; + width:25px; + height:25px; position: absolute; border-radius: 50px; font-weight: 700; - font-size: 12px; + font-size: 15px; font-family: inherit; - color: #FFF; - top: -20px; - right: -20px; + color: black; + top: -10px; + right: -10px; margin:0; - border: 2px solid #FFF; + border: 0px; } .green:hover { cursor: pointer; - background: #006878 !important; + /*background: #006878 !important;*/ color: #FFF !important; - border: 2px solid #006878; + /*border: 2px solid #006878;*/ transition: 0.4s; } #wizard-result{ diff --git a/frontend/static/css/colors.css b/frontend/static/css/colors.css index a65c5fd..c864807 100644 --- a/frontend/static/css/colors.css +++ b/frontend/static/css/colors.css @@ -54,7 +54,7 @@ /*Colors for color*/ .mreport-primary-color-1{ - color:#006878; + color:#006878!important; } .mreport-primary-color-2{ @@ -66,7 +66,7 @@ } .mreport-secondary-color-1{ - color:#FFA80E; + color:#FFA80E!important; } .mreport-secondary-color-2{ diff --git a/frontend/static/css/composer.css b/frontend/static/css/composer.css index f561704..8d67f35 100644 --- a/frontend/static/css/composer.css +++ b/frontend/static/css/composer.css @@ -566,13 +566,13 @@ span.text-edit.badge.mreport-secondary-color-2-bg{ } span.designed-dataviz { - right: 30px; - position: absolute; + /*right: 30px;*/ + /*position: absolute;*/ font-family: "Font Awesome 5 Free"; - font-size: 25px; + font-size: 20px; font-weight: 700; /*color: #218838;*/ - margin-top: -10px; + /*margin-top: -10px;*/ } span.designed-dataviz:before { diff --git a/frontend/static/html/import.html b/frontend/static/html/import.html index be0fdfb..d2311a7 100644 --- a/frontend/static/html/import.html +++ b/frontend/static/html/import.html @@ -1,8 +1,8 @@ diff --git a/frontend/static/js/admin.js b/frontend/static/js/admin.js index ff8fec1..7449b45 100644 --- a/frontend/static/js/admin.js +++ b/frontend/static/js/admin.js @@ -31,8 +31,11 @@ admin = (function () { }; $(this).addClass("active"); if($(this).attr("data-page") == "reports" && $("#cd-cart").hasClass("speed-in") || - $(this).attr("data-page") =="composer" && $("#cd-cart").hasClass("speed-in")){ + $(this).attr("data-page") =="composer" && $("#cd-cart").hasClass("speed-in")|| + $(this).attr("data-page") =="home" && $("#cd-cart").hasClass("speed-in")){ $("#cd-cart").toggleClass("speed-in"); + $( "#catalog-content" ).css('margin-right','0'); + $( "#catalog-content" ).css('transition','margin-right .6s'); }; }); }); @@ -430,10 +433,18 @@ admin = (function () { /* Toggle the cart to appear */ $(".green").click(function () { $("#cd-cart").toggleClass("speed-in"); + $( "#catalog-content" ).css('margin-right','360px'); + $( "#catalog-content" ).css('transition','margin-right .6s'); + if($("#cd-cart").hasClass("speed-in") == false){ + $("#catalog-content" ).css('margin-right','0'); + $("#catalog-content" ).css('transition','margin-right .6s'); + } }); /* Toggle the cart to disappear */ $("#togglePanier").click(function () { $("#cd-cart").toggleClass("speed-in"); + $( "#catalog-content" ).css('margin-right','0'); + $( "#catalog-content" ).css('transition','margin-right .6s'); }); }; diff --git a/frontend/static/js/import.js b/frontend/static/js/import.js index a910244..4f17815 100644 --- a/frontend/static/js/import.js +++ b/frontend/static/js/import.js @@ -251,7 +251,7 @@ import_wizard = (function () { _html.querySelectorAll("template").forEach(function(template) { if (template.dataset.target) { //inject import modal and button in admin.html - document.querySelector(template.dataset.target).appendChild(template.content.firstElementChild); + document.querySelector(template.dataset.target).prepend(template.content.firstElementChild); } }); diff --git a/frontend/templates/admin.html b/frontend/templates/admin.html index f89bf62..6e670ab 100644 --- a/frontend/templates/admin.html +++ b/frontend/templates/admin.html @@ -97,7 +97,8 @@

Mreport - Accueil

-

Données

+
+

Données

-
- -
-
- -
-
- -
- -
-
- - -
-
-
- 0 -
-
- -
+
@@ -145,10 +129,17 @@
{{title}}
- Editer - Supprimer - - +
+ +
+ + +
+
+
@@ -159,11 +150,12 @@
{{title}}
+
-

Rapports

+

Rapports

@@ -433,11 +425,40 @@
Fermer -

Selection

+
+
+
+

Filtrer

+
+
+ +
+
+
+ +
+

Selection

+
+ +
+
+ +
+
+
+ + +
+
+ +
+ +