Skip to content

Commit 78fa5db

Browse files
authored
Merge pull request #677 from Fliplet/release/DEV-160-address-field
Release/dev 160 address field
2 parents 75a0ae1 + 035b456 commit 78fa5db

File tree

15 files changed

+1656
-7
lines changed

15 files changed

+1656
-7
lines changed

css/builder.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,6 +1383,16 @@ form hr {
13831383
color: #e3e1e2;
13841384
}
13851385

1386+
/* Address field*/
1387+
1388+
.form-group.address-typeahead.fl-typeahead.selectize-dropdown {
1389+
left: 14px !important;
1390+
}
1391+
1392+
.form-group.fl-typeahead .selectize-input.focus {
1393+
border-color: #00abd1;
1394+
}
1395+
13861396
.timeStamp {
13871397
font-size: 13px;
13881398
text-align: center;

css/form.css

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,6 +1622,48 @@ form hr {
16221622
gap: 11px;
16231623
}
16241624

1625+
/* Address field*/
1626+
1627+
.form-group.address-typeahead.fl-typeahead {
1628+
left: 14px !important;
1629+
}
1630+
1631+
.google-autocomplete {
1632+
position: absolute;
1633+
background-color: #ffffff;
1634+
border: 1px solid #dcdcdc;
1635+
border-radius: 4px;
1636+
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
1637+
max-height: 300px;
1638+
overflow-y: auto;
1639+
width: 100%;
1640+
padding-left: 0;
1641+
z-index: 1000;
1642+
}
1643+
1644+
.google-autocomplete li {
1645+
display: inline-block;
1646+
width: 100%;
1647+
padding: 8px 12px;
1648+
cursor: pointer;
1649+
font-size: 12px;
1650+
line-height: 20px;
1651+
border-bottom: 1px solid #dcdcdc;
1652+
list-style: none;
1653+
align-items: baseline;
1654+
gap: 4px;
1655+
}
1656+
1657+
.google-autocomplete li:hover,
1658+
.google-autocomplete li:focus {
1659+
background-color: #f0f0f0;
1660+
}
1661+
1662+
.google-autocomplete li.active {
1663+
background-color: #e0e0e0;
1664+
font-weight: bold;
1665+
}
1666+
16251667
.timeStamp {
16261668
font-size: 16px;
16271669
text-align: center;

interface.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ <h4 class="panel-title" v-bind:class="{ collapsed: idx !== 0}" role="button" dat
386386
<h2 class="modal-title"><small>\{{ activeFieldName }}</small></h2>
387387
</div>
388388
<div class="modal-body">
389-
<a href="#" class="btn btn-default close-btn" data-dismiss="modal" aria-label="Close" v-on:click.prevent="closeEdit">Cancel</a>
389+
<a href="#" class="btn btn-default close-btn" data-dismiss="modal" aria-label="Close" v-on:click.prevent="closeEdit(false)">Cancel</a>
390390
<component :is="activeFieldConfigType" v-bind="activeField" :_fields="fields" :_idx="activeFieldIdx"></component>
391391
</div>
392392
</div>

js/build.templates.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)