diff --git a/css/styles.css b/css/styles.css index 4c6331e..c279c94 100644 --- a/css/styles.css +++ b/css/styles.css @@ -14556,7 +14556,7 @@ a:hover { #MainContent { top: 0; z-index: 0; - overflow: hidden; + overflow-x: hidden; } /* line 89, global.scss */ @@ -14741,17 +14741,26 @@ header .container .row .menu ul li.active a:hover, header .container .row .menu line-height: 36px; padding: 0 10px; background: white; - border: 2px solid #ddd; + border: 2px solid #f2f2f2; border-radius: 5px; position: relative; + transition: .4s; +} +/* line 51, sections/modules.scss */ +.modules .content .dropdown.droppable.drop-active { + border: 2px solid #bf0f3d; +} +/* line 55, sections/modules.scss */ +.modules .content .dropdown.drop-inactive { + opacity: .4; } -/* line 49, sections/modules.scss */ +/* line 59, sections/modules.scss */ .modules .content .dropdown .label { font-size: 0.75rem; font-weight: bold; color: black; } -/* line 55, sections/modules.scss */ +/* line 65, sections/modules.scss */ .modules .content .dropdown .data { position: absolute; font-size: 0.625rem; @@ -14760,17 +14769,49 @@ header .container .row .menu ul li.active a:hover, header .container .row .menu right: 10px; top: 0; } -/* line 64, sections/modules.scss */ +/* line 74, sections/modules.scss */ .modules .content .dropdown:after { content: '\f107'; font-family: "FontAwesome"; position: absolute; font-weight: bold; - color: #ddd; + color: #2f2f2f; top: 0; right: -25px; } -/* line 78, sections/modules.scss */ +/* line 84, sections/modules.scss */ +.modules .content .dropdown.active { + border: 2px solid #ddd; +} +/* line 86, sections/modules.scss */ +.modules .content .dropdown.active:after { + color: #ddd; +} +/* line 95, sections/modules.scss */ +.modules .content .dropdown-links .link { + width: 100%; + height: 20px; + border-top: 1px solid #ddd; + border-right: 1px solid #ddd; +} +/* line 100, sections/modules.scss */ +.modules .content .dropdown-links .link:first-child { + border-left: 1px solid #ddd; +} +/* line 104, sections/modules.scss */ +.modules .content .dropdown-links .link.source { + border: 0; + position: relative; +} +/* line 107, sections/modules.scss */ +.modules .content .dropdown-links .link.source:before { + content: ''; + position: absolute; + right: 50%; + height: 100%; + border-left: 1px solid #ddd; +} +/* line 118, sections/modules.scss */ .modules .content .div-drop { width: 100px; padding: 10px; diff --git a/js/scripts.js b/js/scripts.js index 0292181..0c79f9c 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -4,6 +4,8 @@ function allowDrop(ev) { function drag(ev) { ev.dataTransfer.setData("text", ev.target.id); + $('.dropdown').addClass('drop-inactive'); + $('.droppable').removeClass('drop-inactive').addClass('drop-active'); } function drop(ev) { @@ -17,3 +19,9 @@ function drop(ev) { // ev.target.appendChild(module.get(0)); console.log(module.text()); } + + +function dragLeave(ev) { + $('.dropdown').removeClass('drop-inactive'); + $('.droppable').removeClass('drop-active'); +} diff --git a/modules.php b/modules.php index 0c03ba2..62c4773 100644 --- a/modules.php +++ b/modules.php @@ -5,17 +5,17 @@
-
Differenze culturali
+
Differenze culturali

Sfruttare le differenze culturali per ottimizzare il processo di vendita

-
Accoglienza
+
Accoglienza

Mettere il cliente nella condizione ideale per compiere un acquisto

-
Gestione della cassa
+
Gestione della cassa

Ottimizzare il tempo di attesa per il pagamento delle merci

@@ -25,15 +25,64 @@

Company overview

-
- -
-
+
+
+
Italia
20 100
- +
+ +
+
+
+
+
+
+
+ +
+
+
+
Bari
+
8 40
+
+
+
+
+
Milano
+
2 20
+
+
+
+
+
Roma
+
8 40
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
Duomo
+
2
+
+
+
+
+
Sempione
+
2
+
+
diff --git a/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/global.scssc b/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/global.scssc index 9ebb8eb..99c1709 100644 Binary files a/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/global.scssc and b/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/global.scssc differ diff --git a/scss/.sass-cache/5f9cd8e8aad7f3f5cd444b9e1c83afcdd207f75c/modules.scssc b/scss/.sass-cache/5f9cd8e8aad7f3f5cd444b9e1c83afcdd207f75c/modules.scssc index bf311cc..9d81145 100644 Binary files a/scss/.sass-cache/5f9cd8e8aad7f3f5cd444b9e1c83afcdd207f75c/modules.scssc and b/scss/.sass-cache/5f9cd8e8aad7f3f5cd444b9e1c83afcdd207f75c/modules.scssc differ diff --git a/scss/global.scss b/scss/global.scss index 8768d1d..a7622f1 100644 --- a/scss/global.scss +++ b/scss/global.scss @@ -83,7 +83,7 @@ a{ #MainContent{ top: 0; z-index: 0; - overflow: hidden; + overflow-x: hidden; } #map{ diff --git a/scss/sections/modules.scss b/scss/sections/modules.scss index a1df53d..287cb3b 100644 --- a/scss/sections/modules.scss +++ b/scss/sections/modules.scss @@ -42,9 +42,19 @@ line-height: 36px; padding: 0 10px; background: white; - border: 2px solid $grey; + border: 2px solid $light-grey; border-radius: 5px; position: relative; + transition: .4s; + + &.droppable{ + &.drop-active{ + border: 2px solid $red; + } + } + &.drop-inactive{ + opacity: .4; + } .label{ font-size: $font-12; @@ -66,14 +76,44 @@ font-family: $icon; position: absolute; font-weight: bold; - color: $grey; + color: $dark-grey; top: 0; right: -25px; } + &.active{ + border: 2px solid $grey; + &:after{ + color: $grey; + } + } + } + .dropdown-links{ + .link{ + width: 100%; + height: 20px; + border-top: 1px solid $grey; + border-right: 1px solid $grey; + &:first-child{ + border-left: 1px solid $grey; + } + + &.source{ + border: 0; + position: relative; + &:before{ + content: ''; + position: absolute; + right: 50%; + height: 100%; + border-left: 1px solid $grey; + } + } + } + } .div-drop{ width: 100px;