Merge branch 'master' into regazzojDevelopment

pixelhumain · Aug 15, 2018 · df92b33 · df92b33
2 parents 235cc9b + 07bbbbf
commit df92b33
Show file tree

Hide file tree

Showing 10 changed files with 185 additions and 148 deletions.
diff --git a/dist/gogocarto.css b/dist/gogocarto.css
@@ -3740,7 +3740,7 @@ th {
       .gogo-load-css .gogo-theme-transiscope.gogocarto-container .element-item .collapsible-header .element-main-icon {
         display: none !important; }
       .gogo-load-css .gogo-theme-transiscope.gogocarto-container .element-item .collapsible-header .collapsible-header-title .gogo-icon-close:before {
-        background-color: #f79900;
+        background-color: #3bad78;
         color: white;
         border-radius: 3px;
         padding: 2px; }
@@ -3921,7 +3921,9 @@ th {
         font-size: 1.4rem;
         line-height: 1.8rem; }
     .gogo-load-css .gogo-theme-transiscope.gogocarto-container #element-info-bar.display-bottom .gogo-icon-close {
-      font-size: 1rem; }
+      font-size: .9rem; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #element-info-bar.display-bottom .collapsible-header .name {
+      font-size: 15px; }
     @media only screen and (max-width: 600px) {
       .gogo-load-css .gogo-theme-transiscope.gogocarto-container #element-info-bar.display-bottom .element-item .expandLabel {
         margin-right: 10px;
@@ -3940,37 +3942,6 @@ th {
       padding-bottom: .8rem; }
     .gogo-load-css .gogo-theme-transiscope.gogocarto-container #element-info-bar.display-bottom .element-item.active .inline-option-values {
       display: none; }
-    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .inline-option-values {
-      width: 100%; }
-      .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .inline-option-values .inline-option-value:last-child {
-        float: right;
-        margin-right: 0; }
-        .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .inline-option-values .inline-option-value:last-child .option-value {
-          color: #175259; }
-    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .menu-element {
-      text-align: right;
-      padding: 0;
-      padding-right: 10px;
-      height: 2.3rem !important; }
-      .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .menu-element .menu-element-item .menu-icon {
-        font-size: 18px !important; }
-        .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .menu-element .menu-element-item .menu-icon:before {
-          line-height: 2.3rem !important; }
-      .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .menu-element .menu-element-item-text {
-        font-size: 11px;
-        line-height: 2.5rem; }
-    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .expandLabel {
-      display: none; }
-    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .location {
-      font-weight: normal;
-      color: #3bad78; }
-      .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .location .postalCode {
-        font-size: 14px; }
-    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .collapsible-body-main-content {
-      padding-bottom: 0; }
-    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .collapsible-body .tags-container {
-      margin-bottom: 0;
-      padding-bottom: 1rem; }
     .gogo-load-css .gogo-theme-transiscope.gogocarto-container .leaflet-control-zoom-in, .gogo-load-css .gogo-theme-transiscope.gogocarto-container .leaflet-control-zoom-out, .gogo-load-css .gogo-theme-transiscope.gogocarto-container .feature-button {
       color: #175259; }
       .gogo-load-css .gogo-theme-transiscope.gogocarto-container .leaflet-control-zoom-in:hover, .gogo-load-css .gogo-theme-transiscope.gogocarto-container .leaflet-control-zoom-out:hover, .gogo-load-css .gogo-theme-transiscope.gogocarto-container .feature-button:hover {
@@ -3979,16 +3950,19 @@ th {
     .gogo-load-css .gogo-theme-transiscope.gogocarto-container .leaflet-control-layers {
       margin-right: 17px !important; }
     .gogo-load-css .gogo-theme-transiscope.gogocarto-container .gogo-map-control {
-      background-color: #175259;
-      color: white;
-      border: none;
       text-transform: uppercase;
       font-weight: bold;
       font-size: 12px !important;
       line-height: 22px;
-      padding: 5px 15px; }
+      padding: 5px 15px;
+      background-color: white;
+      color: #f79900;
+      border: 1px solid #d7d7d7;
+      -webkit-box-shadow: 1px 2px 4px 1px rgba(0, 0, 0, 0.12);
+      -moz-box-shadow: 1px 2px 4px 1px rgba(0, 0, 0, 0.12);
+      box-shadow: 1px 2px 4px 1px rgba(0, 0, 0, 0.12); }
       .gogo-load-css .gogo-theme-transiscope.gogocarto-container .gogo-map-control .gogo-icon-list {
-        color: #3bad78; }
+        color: inherit; }
     .gogo-load-css .gogo-theme-transiscope.gogocarto-container #map-gogo-controls {
       width: 100%; }
     .gogo-load-css .gogo-theme-transiscope.gogocarto-container .leaflet-control-zoom.leaflet-bar.leaflet-control {
@@ -4048,9 +4022,56 @@ th {
         -webkit-box-shadow: none;
         -moz-box-shadow: none;
         box-shadow: none; }
-        @media only screen and (min-width: 1201px) {
+        @media (min-width: 1500px) {
           .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-list-header .show-directory-menu-button {
             left: 0px; } }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item:not(.active) {
+      -webkit-box-shadow: none;
+      -moz-box-shadow: none;
+      box-shadow: none; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .collapsible-header {
+      border-bottom: 1px solid #f3f6f4; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .collapsible-body {
+      border-bottom: none; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .section {
+      margin-right: 0; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .inline-option-values {
+      width: 100%; }
+      .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .inline-option-values .inline-option-value:last-child {
+        float: right;
+        margin-right: 0; }
+        .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .inline-option-values .inline-option-value:last-child .option-value {
+          color: #175259; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .menu-element {
+      text-align: right;
+      padding: 0;
+      padding-right: 10px;
+      height: 2.3rem !important; }
+      .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .menu-element .menu-element-item .menu-icon {
+        font-size: 18px !important; }
+        .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .menu-element .menu-element-item .menu-icon:before {
+          line-height: 2.3rem !important; }
+      .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .menu-element .menu-element-item-text {
+        font-size: 11px;
+        line-height: 2.5rem; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .expandLabel {
+      display: none; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .location {
+      font-weight: normal;
+      color: #3bad78; }
+      .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .location .postalCode {
+        font-size: 14px; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .collapsible-body-main-content {
+      padding-bottom: 0; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .collapsible-body .tags-container {
+      margin-bottom: 0;
+      padding-bottom: 1rem; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .element-item .section-taxonomy .category-wrapper:last-child .option-value:last-child {
+      margin-bottom: 0; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-content-list .collapsible.popout > li {
+      margin-bottom: 3px; }
+    .gogo-load-css .gogo-theme-transiscope.gogocarto-container #directory-list-spinner-loader .spinner-layer {
+      border-color: #175259; }
     .gogo-load-css .gogo-theme-transiscope.gogocarto-container #gogo-controls-mobile .feature-button {
       margin-right: 0;
       float: left; }

diff --git a/dist/gogocarto.js b/dist/gogocarto.js
diff --git a/dist/gogocarto.min.css b/dist/gogocarto.min.css
diff --git a/dist/gogocarto.min.css.gz b/dist/gogocarto.min.css.gz
diff --git a/dist/gogocarto.min.js b/dist/gogocarto.min.js
diff --git a/dist/gogocarto.min.js.gz b/dist/gogocarto.min.js.gz
diff --git a/src/js/modules/ajax.module.ts b/src/js/modules/ajax.module.ts
@@ -193,6 +193,7 @@ export class AjaxModule
 			complete: () =>
 			{
 			  this.isRetrievingElements = false;
+			  this.currBoundsRetrieving = null; 
 			  clearTimeout(this.loaderTimer);
 			  setTimeout( () => $('#directory-loading').hide(), 250);
 			  if (this.requestWaitingToBeExecuted)

diff --git a/src/scss/themes/transiscope/_element.scss b/src/scss/themes/transiscope/_element.scss
@@ -7,7 +7,7 @@
 
     .collapsible-header-title .gogo-icon-close {       
       &:before {
-        background-color: $secondary;
+        background-color: $primary;
         color: white;
         border-radius: 3px;
         padding: 2px;
@@ -252,7 +252,9 @@
 }
 
 #element-info-bar.display-bottom {
-  .gogo-icon-close { font-size: 1rem; }
+  .gogo-icon-close { font-size: .9rem; }
+  .collapsible-header .name { font-size: 15px; } 
+
   @media #{$small-only} { 
     .element-item .expandLabel {
       margin-right: 10px;
@@ -272,51 +274,4 @@
     .collapsible-header { padding-bottom: .8rem; }
     .inline-option-values { display: none; }
   }
-}
-
-#directory-content-list {  
-
-  .element-item {
-    .inline-option-values {
-      width: 100%;
-      .inline-option-value:last-child {
-        float: right;
-        margin-right: 0;
-        .option-value { color: $dark; }
-      }
-    }
-
-    .menu-element {
-      text-align: right;
-      padding: 0;
-      padding-right: 10px;
-      height: 2.3rem !important;
-      .menu-element-item .menu-icon {
-        font-size: 18px !important;
-        &:before { line-height: 2.3rem !important; }
-      }
-
-      .menu-element-item-text {
-        font-size: 11px;
-        line-height: 2.5rem;
-      }
-    }
-
-
-    .expandLabel { display: none }
-
-    .location {
-      font-weight: normal;
-      color: $primary;
-      .postalCode { font-size: 14px; }
-    }
-
-    .collapsible-body-main-content { padding-bottom: 0; }
-
-    .collapsible-body .tags-container {
-      margin-bottom: 0;
-      padding-bottom: 1rem;
-    } 
-
-  }  
-}
+}
diff --git a/src/scss/themes/transiscope/_list.scss b/src/scss/themes/transiscope/_list.scss
@@ -31,10 +31,67 @@
     padding-top: 6px;
     @include box-shadow-1(none);
 
-    @media #{$large-only} { left: 0px; }
+    @media (min-width: 1500px) { left: 0px; }
   }
 
   background-color: $light;
   color: $primary;
   text-align: left;
+}
+
+#directory-content-list .element-item {
+
+  &:not(.active) { @include box-shadow-1(none); }
+  .collapsible-header { border-bottom: 1px solid $light };
+  .collapsible-body { border-bottom: none; }
+  .section { margin-right: 0; }
+
+  .inline-option-values {
+    width: 100%;
+    .inline-option-value:last-child {
+      float: right;
+      margin-right: 0;
+      .option-value { color: $dark; }
+    }
+  }
+
+  .menu-element {
+    text-align: right;
+    padding: 0;
+    padding-right: 10px;
+    height: 2.3rem !important;
+    .menu-element-item .menu-icon {
+      font-size: 18px !important;
+      &:before { line-height: 2.3rem !important; }
+    }
+
+    .menu-element-item-text {
+      font-size: 11px;
+      line-height: 2.5rem;
+    }
+  }      
+
+  .expandLabel { display: none }
+
+  .location {
+    font-weight: normal;
+    color: $primary;
+    .postalCode { font-size: 14px; }
+  }
+
+  .collapsible-body-main-content { padding-bottom: 0; }
+
+  .collapsible-body .tags-container {
+    margin-bottom: 0;
+    padding-bottom: 1rem;
+  } 
+
+  .section-taxonomy .category-wrapper:last-child .option-value:last-child { margin-bottom: 0; }
+
+}
+
+#directory-content-list .collapsible.popout > li { margin-bottom: 3px; }
+
+#directory-list-spinner-loader .spinner-layer {
+    border-color: $dark;
 }
diff --git a/src/scss/themes/transiscope/_map.scss b/src/scss/themes/transiscope/_map.scss
@@ -10,16 +10,18 @@
 .leaflet-control-layers { margin-right: 17px !important}
 
 .gogo-map-control {
-  background-color: $dark;
-  color: white;
-  border: none;
   text-transform: uppercase;
   font-weight: bold;
   font-size: 12px !important;
   line-height: 22px;
   padding: 5px 15px;
 
-  .gogo-icon-list { color: $primary; }
+  background-color: white;
+  color: $secondary;
+  border: 1px solid #d7d7d7;
+  @include box-shadow-1(1px 2px 4px 1px rgba(0, 0, 0, 0.12));
+
+  .gogo-icon-list { color: inherit; }
 }
 
 #map-gogo-controls {