diff options
| -rwxr-xr-x | StoneIsland/www/css/cart.css | 8 | ||||
| -rwxr-xr-x | StoneIsland/www/index.html | 32 | ||||
| -rwxr-xr-x | StoneIsland/www/js/index.js | 4 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/blogs/ArchiveView.js | 1 | ||||
| -rw-r--r-- | StoneIsland/www/js/lib/etc/accessibility.js | 5 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/nav/AddressView.js | 4 |
6 files changed, 29 insertions, 25 deletions
diff --git a/StoneIsland/www/css/cart.css b/StoneIsland/www/css/cart.css index 1a68099d..c5725349 100755 --- a/StoneIsland/www/css/cart.css +++ b/StoneIsland/www/css/cart.css @@ -318,11 +318,15 @@ color:#000; } .dropdown-wrapper .dropdown { - font-size:14px; + font-size:16px; box-sizing:border-box; + display: flex; + justify-content: center; align-items: center; text-align: center; - padding:10px 0; + height: 48px; + margin-left: 3px; + padding:0; border:1px solid #a9a9a9; position:relative; } diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 76cedaa5..546cd915 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -1139,44 +1139,44 @@ </script> <script type="text/html" id="address_template"> - <label for="address_name">First Name</label> - <input type="text" id="address_name" name="Name" aria-placeholder="First Name"> + <label for="address_name_{{_id}}">First Name</label> + <input type="text" id="address_name_{{_id}}" name="Name" aria-placeholder="First Name"> <span class="err"></span> - <label for="address_surname">Last Name</label> - <input type="text" id="address_surname" name="Surname" aria-placeholder="Last Name"> + <label for="address_surname_{{_id}}">Last Name</label> + <input type="text" id="address_surname_{{_id}}" name="Surname" aria-placeholder="Last Name"> <span class="err"></span> - <label for="address_address1">Address line 1</label> - <input type="text" id="address_address1" name="Address1" aria-placeholder="Address Line 1"> + <label for="address_address1_{{_id}}">Address line 1</label> + <input type="text" id="address_address1_{{_id}}" name="Address1" aria-placeholder="Address Line 1"> <span class="err"></span> - <label for="address_address2">Address line 2</label> - <input type="text" id="address_address2" name="Address2" aria-placeholder="Address Line 2"> + <label for="address_address2_{{_id}}">Address line 2</label> + <input type="text" id="address_address2_{{_id}}" name="Address2" aria-placeholder="Address Line 2"> <span class="err"></span> <div class="half-input"> - <label for="address_city">City</label> - <label for="address_state">State</label> + <label for="address_city_{{_id}}">City</label> + <label for="address_state_{{_id}}">State</label> </div> <div class="half-input"> - <input type="text" id="address_city" name="City" aria-placeholder="City"> + <input type="text" id="address_city_{{_id}}" name="City" aria-placeholder="City"> <div class="select-wrapper"> <span></span> - <select id="address_state" name="Province"> + <select id="address_state_{{_id}}" name="Province"> {{PROVINCES}} </select> </div> </div> <div class="half-input"> - <label for="address_zip">Zip</label> + <label for="address_zip_{{_id}}">Zip</label> <label>Country</label> </div> <div class="half-input"> - <input type="text" id="address_zip" name="ZipCode" aria-placeholder="ZIP" required> + <input type="text" id="address_zip_{{_id}}" name="ZipCode" aria-placeholder="ZIP" required> <div class="country-wrapper-static"> <span class="country-label">UNITED STATES</span> <!-- @@ -1187,8 +1187,8 @@ </div> </div> - <label for="address_phone">Phone Number</label> - <input type="number" id="address_phone" name="Phone" aria-placeholder="PHONE NUMBER"> + <label for="address_phone_{{_id}}">Phone Number</label> + <input type="number" id="address_phone_{{_id}}" name="Phone" aria-placeholder="PHONE NUMBER"> <span class="err"></span> <!-- <div class="checkbox-container save_as_default"> diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js index a8caa2e5..e358fc56 100755 --- a/StoneIsland/www/js/index.js +++ b/StoneIsland/www/js/index.js @@ -90,8 +90,8 @@ var app = (function(){ } app.api_ready = function(){ - if (is_iphone_x) { - StatusBar.hide() + if (is_iphone_x && 'StatusBar' in window) { + window.StatusBar.hide() } app.view = null diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js index 12aaf7de..0d769e95 100755 --- a/StoneIsland/www/js/lib/blogs/ArchiveView.js +++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js @@ -21,7 +21,6 @@ var ArchiveView = ScrollableView.extend({ this.scroller = new IScroll('#archive .scroll', app.iscroll_options) this.$subtitle = this.$('.subtitle') this.subtitle_html = this.$subtitle.html() - }, back: function(){ diff --git a/StoneIsland/www/js/lib/etc/accessibility.js b/StoneIsland/www/js/lib/etc/accessibility.js index ad04980c..614c3796 100644 --- a/StoneIsland/www/js/lib/etc/accessibility.js +++ b/StoneIsland/www/js/lib/etc/accessibility.js @@ -1,7 +1,6 @@ $(function(){ - $("h1").each(function(el){ - console.log(el) - el['aria-label'] = 'Section title is ' + el.innerText + $("h1").each(function(){ + this['aria-label'] = 'Section title is ' + this.innerText }) }) diff --git a/StoneIsland/www/js/lib/nav/AddressView.js b/StoneIsland/www/js/lib/nav/AddressView.js index 02163d51..364b35ff 100755 --- a/StoneIsland/www/js/lib/nav/AddressView.js +++ b/StoneIsland/www/js/lib/nav/AddressView.js @@ -1,4 +1,6 @@ +var AddressID = Math.round(Date.now() % 1000) + var AddressView = SerializableView.extend({ template: $("#address_template").html(), @@ -14,7 +16,7 @@ var AddressView = SerializableView.extend({ this.parent = opt.parent this.checkPhone = 'checkPhone' in opt ? opt.checkPhone : true this.setElement( this.parent.$(".address") ) - this.$el.html(this.template) + this.$el.html(this.template.replace(/{{_id}}/g, AddressID++)) }, populate: function(data){ |