Merge pull request #678 from Fliplet/production

Merge Production into Master

Author: armine-fliplet

css/builder.css

@@ -1204,10 +1204,6 @@ form hr {
   border: 0;
 }
 
-#data-source-provider {
-  margin-bottom: -10px;
-}
-
 .columns-notification .btn-generate-columns {
   margin-top: 10px;
 }
@@ -1387,3 +1383,20 @@ form hr {
   color: #e3e1e2;
 }
 
+/* Address field*/
+
+.form-group.address-typeahead.fl-typeahead.selectize-dropdown {
+  left: 14px !important;
+}
+
+.form-group.fl-typeahead .selectize-input.focus {
+  border-color: #00abd1;
+}
+
+.timeStamp {
+  font-size: 13px;
+  text-align: center;
+  color: #514f4f;
+  padding: 10px 10px;
+  background-color: #eaeaea;
+}

css/form.css

@@ -1095,6 +1095,22 @@ html[dir="rtl"] .radio.radio-icon input[type="radio"] + label > span.check {
   border-radius: 4px;
 }
 
+.tox .tox-toolbar__primary {
+  justify-content: space-between;
+}
+
+.tox:not(.tox-tinymce-inline) .tox-editor-header {
+  padding: 4px !important;
+}
+
+.tox .tox-toolbar__group {
+  padding: 0px !important;
+}
+
+.tox.tox-tinymce {
+  min-height: 130px !important;
+}
+
 @media screen and (max-width: 1280px) {
   .tox-toolbar__primary {
     justify-content: space-between;
@@ -1606,3 +1622,52 @@ form hr {
   gap: 11px;
 }
 
+/* Address field*/
+
+.form-group.address-typeahead.fl-typeahead {
+  left: 14px !important;
+}
+
+.google-autocomplete {
+  position: absolute;
+  background-color: #ffffff;
+  border: 1px solid #dcdcdc;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+  max-height: 300px;
+  overflow-y: auto;
+  width: 100%;
+  padding-left: 0;
+  z-index: 1000;
+}
+
+.google-autocomplete li {
+  display: inline-block;
+  width: 100%;
+  padding: 8px 12px;
+  cursor: pointer;
+  font-size: 12px;
+  line-height: 20px;
+  border-bottom: 1px solid #dcdcdc;
+  list-style: none;
+  align-items: baseline;
+  gap: 4px;
+}
+
+.google-autocomplete li:hover,
+.google-autocomplete li:focus {
+  background-color: #f0f0f0;
+}
+
+.google-autocomplete li.active {
+  background-color: #e0e0e0;
+  font-weight: bold;
+}
+
+.timeStamp {
+  font-size: 16px;
+  text-align: center;
+  color: #514f4f;
+  padding: 10px 10px;
+  background-color: #eaeaea;
+}

interface.html

@@ -386,7 +386,7 @@ <h4 class="panel-title" v-bind:class="{ collapsed: idx !== 0}" role="button" dat
                   <h2 class="modal-title"><small>\{{ activeFieldName }}</small></h2>
                 </div>
                 <div class="modal-body">
-                  <a href="#" class="btn btn-default close-btn" data-dismiss="modal" aria-label="Close" v-on:click.prevent="closeEdit">Cancel</a>
+                  <a href="#" class="btn btn-default close-btn" data-dismiss="modal" aria-label="Close" v-on:click.prevent="closeEdit(false)">Cancel</a>
                   <component :is="activeFieldConfigType" v-bind="activeField" :_fields="fields" :_idx="activeFieldIdx"></component>
                 </div>
               </div>