From 662c9901a32b5e348c5dbb7ce2be4958a3c599b1 Mon Sep 17 00:00:00 2001 From: Bjorn Holine Date: Fri, 27 Nov 2015 16:20:03 -0600 Subject: [PATCH] Updated preventative styling to be more specific to the map container and added max-height img rule --- bower.json | 2 +- dist/assets/css/storelocator.css | 12 +++++++----- dist/assets/css/storelocator.min.css | 2 +- .../plugins/storeLocator/jquery.storelocator.js | 2 +- .../storeLocator/jquery.storelocator.min.js | 2 +- package.json | 2 +- readme.md | 4 ++++ src/css/storelocator.scss | 15 ++++++++------- storelocator.jquery.json | 2 +- 9 files changed, 25 insertions(+), 18 deletions(-) diff --git a/bower.json b/bower.json index cb1291e..d5aae8b 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "jquery-storelocator-plugin", - "version": "2.2.0", + "version": "2.2.1", "description": "This jQuery plugin takes advantage of Google Maps API version 3 to create an easy to implement store locator. No back-end programming is required, you just need to feed it KML, XML, or JSON data with all the location information.", "repository": { "type": "git", diff --git a/dist/assets/css/storelocator.css b/dist/assets/css/storelocator.css index 69788ad..28b8c7d 100644 --- a/dist/assets/css/storelocator.css +++ b/dist/assets/css/storelocator.css @@ -17,18 +17,20 @@ color: #ae2118; font-weight: bold; } +/* Avoid image issues with Google Maps and CSS resets */ +.bh-sl-map-container img { + max-height: none !important; + max-width: none !important; + border-radius: 0 !important; + box-shadow: none !important; } + .bh-sl-container { float: left; margin-left: 20px; width: 875px; font: normal 14px/20px Arial, Helvetica, sans-serif; color: #555555; - /* Avoid image issues with Google Maps and CSS resets */ /* Avoid issues with Google Maps and CSS frameworks */ } - .bh-sl-container img { - max-width: none !important; - border-radius: 0 !important; - box-shadow: none !important; } .bh-sl-container > * { box-sizing: content-box !important; } .bh-sl-container .bh-sl-form-container { diff --git a/dist/assets/css/storelocator.min.css b/dist/assets/css/storelocator.min.css index db44cc0..f6b6ef9 100644 --- a/dist/assets/css/storelocator.min.css +++ b/dist/assets/css/storelocator.min.css @@ -1 +1 @@ -#page-header{float:left;display:block}#page-header .bh-sl-title{color:#797874}.gm-style a,.gm-style div,.gm-style label,.gm-style span{font-family:Arial,Helvetica,sans-serif}.bh-sl-error{clear:both;float:left;width:100%;padding:10px 0;color:#ae2118;font-weight:700}.bh-sl-container{float:left;margin-left:20px;width:875px;font:400 14px/20px Arial,Helvetica,sans-serif;color:#555}.bh-sl-container img{max-width:none!important;border-radius:0!important;box-shadow:none!important}.bh-sl-container>*{box-sizing:content-box!important}.bh-sl-container .bh-sl-form-container{clear:left;float:left;margin-top:15px;width:100%}.bh-sl-container .form-input{float:left;margin-top:3px}.bh-sl-container .form-input label{font-weight:700}.bh-sl-container .form-input input,.bh-sl-container .form-input select{margin:0 15px 0 10px;padding:6px 12px;line-height:16px;border:1px solid #ccc;font:400 14px/18px Arial,Helvetica,sans-serif;-webkit-border-radius:4px;border-radius:4px}.bh-sl-container button{float:left;cursor:pointer;margin-top:3px;padding:6px 12px;border:none;background:#004479;font:700 14px/18px Arial,Helvetica,sans-serif;color:#fff;white-space:nowrap;-webkit-border-radius:4px;border-radius:4px}.bh-sl-container .bh-sl-loading{float:left;margin:4px 0 0 10px;width:16px;height:16px;background:url(../img/ajax-loader.gif) no-repeat}.bh-sl-container .bh-sl-filters-container{clear:both;float:left;width:100%;margin:15px 0}.bh-sl-container .bh-sl-filters-container .bh-sl-filters{list-style:none;float:left;padding:0;margin:0 100px 0 0}.bh-sl-container .bh-sl-filters-container .bh-sl-filters li{display:block;clear:left;float:left;width:100%;margin:5px 0}.bh-sl-container .bh-sl-filters-container .bh-sl-filters li label{display:inline}.bh-sl-container .bh-sl-filters-container .bh-sl-filters li input{display:block;float:left;margin:2px 8px 2px 0}.bh-sl-container .bh-sl-map-container{clear:left;float:left;margin-top:27px;height:530px;width:875px}.bh-sl-container .bh-sl-map-container a{color:#005293;text-decoration:none}.bh-sl-container .bh-sl-map-container a:active,.bh-sl-container .bh-sl-map-container a:hover{text-decoration:underline}.bh-sl-container .bh-sl-loc-list{float:left;width:30%;height:530px;overflow-x:auto;font-size:13px}.bh-sl-container .bh-sl-loc-list ul{display:block;clear:left;float:left;width:100%;list-style:none;margin:0;padding:0}.bh-sl-container .bh-sl-loc-list ul li{display:block;clear:left;float:left;margin:3% 4%;cursor:pointer;width:92%;border:1px solid #fff}.bh-sl-container .bh-sl-loc-list .list-label{float:left;margin:10px 0 0 6px;padding:4px;width:10%;max-width:21px;text-align:center;background:#00192d;color:#fff;font-weight:700;border-radius:15px}.bh-sl-container .bh-sl-loc-list .list-details{float:left;margin-left:6px;width:80%}.bh-sl-container .bh-sl-loc-list .list-details .list-content{padding:10px}.bh-sl-container .bh-sl-loc-list .list-details .loc-dist{font-weight:700;font-style:italic;color:#8e8e8e}.bh-sl-container .bh-sl-loc-list .list-focus{border:1px solid rgba(0,82,147,.4);-moz-box-shadow:0 0 8px rgba(0,82,147,.4);-webkit-box-shadow:0 0 8px rgba(0,82,147,.4);box-shadow:0 0 8px rgba(0,100,180,.4);transition:border .2s linear 0s,box-shadow .2s linear 0s}.bh-sl-container .bh-sl-loc-list .bh-sl-close-directions-container{width:100%;height:20px;position:relative}.bh-sl-container .bh-sl-loc-list .bh-sl-close-directions-container .bh-sl-close-icon{top:0;right:6px}.bh-sl-container .bh-sl-loc-list .bh-sl-noresults-title{font-weight:700}.bh-sl-container .loc-name{font-weight:700;font-size:15px}.bh-sl-container .bh-sl-map{float:left;width:70%;height:530px}.bh-sl-container .bh-sl-pagination-container{clear:both}.bh-sl-container .bh-sl-pagination-container ol{list-style-type:none;text-align:center;margin:0;padding:10px 0}.bh-sl-container .bh-sl-pagination-container ol li{display:inline-block;padding:10px;cursor:pointer;font:700 14px Arial,Helvetica,sans-serif;color:#005293}.bh-sl-container .bh-sl-pagination-container ol .bh-sl-current{color:#555;cursor:auto;text-decoration:none}.bh-sl-overlay{position:fixed;left:0;top:0;width:100%;height:100%;z-index:10000;background:url(../img/overlay-bg.png) repeat}.bh-sl-overlay .bh-sl-modal-window{position:absolute;left:50%;margin-left:-460px;margin-top:60px;width:920px;height:620px;z-index:10010;background:#fff;border-radius:10px;box-shadow:0 0 10px #656565}.bh-sl-overlay .bh-sl-modal-window .bh-sl-map-container{margin-top:50px}.bh-sl-overlay .bh-sl-modal-window .bh-sl-modal-content{float:left;padding:0 22px}.bh-sl-overlay .bh-sl-modal-window .bh-sl-close-icon{top:13px;right:22px}.bh-sl-close-icon{position:absolute;cursor:pointer;height:24px;width:24px}.bh-sl-close-icon:after,.bh-sl-close-icon:before{position:absolute;top:3px;right:3px;bottom:0;left:50%;background:#ccc;content:'';display:block;height:24px;margin:-3px 0 0 -1px;width:3px;-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)}.bh-sl-close-icon:hover:after,.bh-sl-close-icon:hover:before{background:#b3b3b3}.bh-sl-close-icon:before{-webkit-transform:rotate(-45deg);-moz-transform:rotate(-45deg);-ms-transform:rotate(-45deg);-o-transform:rotate(-45deg);transform:rotate(-45deg)} \ No newline at end of file +#page-header{float:left;display:block}#page-header .bh-sl-title{color:#797874}.gm-style a,.gm-style div,.gm-style label,.gm-style span{font-family:Arial,Helvetica,sans-serif}.bh-sl-error{clear:both;float:left;width:100%;padding:10px 0;color:#ae2118;font-weight:700}.bh-sl-map-container img{max-height:none!important;max-width:none!important;border-radius:0!important;box-shadow:none!important}.bh-sl-container{float:left;margin-left:20px;width:875px;font:400 14px/20px Arial,Helvetica,sans-serif;color:#555}.bh-sl-container>*{box-sizing:content-box!important}.bh-sl-container .bh-sl-form-container{clear:left;float:left;margin-top:15px;width:100%}.bh-sl-container .form-input{float:left;margin-top:3px}.bh-sl-container .form-input label{font-weight:700}.bh-sl-container .form-input input,.bh-sl-container .form-input select{margin:0 15px 0 10px;padding:6px 12px;line-height:16px;border:1px solid #ccc;font:400 14px/18px Arial,Helvetica,sans-serif;-webkit-border-radius:4px;border-radius:4px}.bh-sl-container button{float:left;cursor:pointer;margin-top:3px;padding:6px 12px;border:none;background:#004479;font:700 14px/18px Arial,Helvetica,sans-serif;color:#fff;white-space:nowrap;-webkit-border-radius:4px;border-radius:4px}.bh-sl-container .bh-sl-loading{float:left;margin:4px 0 0 10px;width:16px;height:16px;background:url(../img/ajax-loader.gif) no-repeat}.bh-sl-container .bh-sl-filters-container{clear:both;float:left;width:100%;margin:15px 0}.bh-sl-container .bh-sl-filters-container .bh-sl-filters{list-style:none;float:left;padding:0;margin:0 100px 0 0}.bh-sl-container .bh-sl-filters-container .bh-sl-filters li{display:block;clear:left;float:left;width:100%;margin:5px 0}.bh-sl-container .bh-sl-filters-container .bh-sl-filters li label{display:inline}.bh-sl-container .bh-sl-filters-container .bh-sl-filters li input{display:block;float:left;margin:2px 8px 2px 0}.bh-sl-container .bh-sl-map-container{clear:left;float:left;margin-top:27px;height:530px;width:875px}.bh-sl-container .bh-sl-map-container a{color:#005293;text-decoration:none}.bh-sl-container .bh-sl-map-container a:active,.bh-sl-container .bh-sl-map-container a:hover{text-decoration:underline}.bh-sl-container .bh-sl-loc-list{float:left;width:30%;height:530px;overflow-x:auto;font-size:13px}.bh-sl-container .bh-sl-loc-list ul{display:block;clear:left;float:left;width:100%;list-style:none;margin:0;padding:0}.bh-sl-container .bh-sl-loc-list ul li{display:block;clear:left;float:left;margin:3% 4%;cursor:pointer;width:92%;border:1px solid #fff}.bh-sl-container .bh-sl-loc-list .list-label{float:left;margin:10px 0 0 6px;padding:4px;width:10%;max-width:21px;text-align:center;background:#00192d;color:#fff;font-weight:700;border-radius:15px}.bh-sl-container .bh-sl-loc-list .list-details{float:left;margin-left:6px;width:80%}.bh-sl-container .bh-sl-loc-list .list-details .list-content{padding:10px}.bh-sl-container .bh-sl-loc-list .list-details .loc-dist{font-weight:700;font-style:italic;color:#8e8e8e}.bh-sl-container .bh-sl-loc-list .list-focus{border:1px solid rgba(0,82,147,.4);-moz-box-shadow:0 0 8px rgba(0,82,147,.4);-webkit-box-shadow:0 0 8px rgba(0,82,147,.4);box-shadow:0 0 8px rgba(0,100,180,.4);transition:border .2s linear 0s,box-shadow .2s linear 0s}.bh-sl-container .bh-sl-loc-list .bh-sl-close-directions-container{width:100%;height:20px;position:relative}.bh-sl-container .bh-sl-loc-list .bh-sl-close-directions-container .bh-sl-close-icon{top:0;right:6px}.bh-sl-container .bh-sl-loc-list .bh-sl-noresults-title{font-weight:700}.bh-sl-container .loc-name{font-weight:700;font-size:15px}.bh-sl-container .bh-sl-map{float:left;width:70%;height:530px}.bh-sl-container .bh-sl-pagination-container{clear:both}.bh-sl-container .bh-sl-pagination-container ol{list-style-type:none;text-align:center;margin:0;padding:10px 0}.bh-sl-container .bh-sl-pagination-container ol li{display:inline-block;padding:10px;cursor:pointer;font:700 14px Arial,Helvetica,sans-serif;color:#005293}.bh-sl-container .bh-sl-pagination-container ol .bh-sl-current{color:#555;cursor:auto;text-decoration:none}.bh-sl-overlay{position:fixed;left:0;top:0;width:100%;height:100%;z-index:10000;background:url(../img/overlay-bg.png) repeat}.bh-sl-overlay .bh-sl-modal-window{position:absolute;left:50%;margin-left:-460px;margin-top:60px;width:920px;height:620px;z-index:10010;background:#fff;border-radius:10px;box-shadow:0 0 10px #656565}.bh-sl-overlay .bh-sl-modal-window .bh-sl-map-container{margin-top:50px}.bh-sl-overlay .bh-sl-modal-window .bh-sl-modal-content{float:left;padding:0 22px}.bh-sl-overlay .bh-sl-modal-window .bh-sl-close-icon{top:13px;right:22px}.bh-sl-close-icon{position:absolute;cursor:pointer;height:24px;width:24px}.bh-sl-close-icon:after,.bh-sl-close-icon:before{position:absolute;top:3px;right:3px;bottom:0;left:50%;background:#ccc;content:'';display:block;height:24px;margin:-3px 0 0 -1px;width:3px;-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)}.bh-sl-close-icon:hover:after,.bh-sl-close-icon:hover:before{background:#b3b3b3}.bh-sl-close-icon:before{-webkit-transform:rotate(-45deg);-moz-transform:rotate(-45deg);-ms-transform:rotate(-45deg);-o-transform:rotate(-45deg);transform:rotate(-45deg)} \ No newline at end of file diff --git a/dist/assets/js/plugins/storeLocator/jquery.storelocator.js b/dist/assets/js/plugins/storeLocator/jquery.storelocator.js index 277f5fe..4d34c42 100644 --- a/dist/assets/js/plugins/storeLocator/jquery.storelocator.js +++ b/dist/assets/js/plugins/storeLocator/jquery.storelocator.js @@ -1,4 +1,4 @@ -/*! jQuery Google Maps Store Locator - v2.2.0 - 2015-11-21 +/*! jQuery Google Maps Store Locator - v2.2.1 - 2015-11-27 * http://www.bjornblog.com/web/jquery-store-locator-plugin * Copyright (c) 2015 Bjorn Holine; Licensed MIT */ diff --git a/dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js b/dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js index 6b7d1bf..2fdbd19 100644 --- a/dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js +++ b/dist/assets/js/plugins/storeLocator/jquery.storelocator.min.js @@ -1,4 +1,4 @@ -/*! jQuery Google Maps Store Locator - v2.2.0 - 2015-11-21 +/*! jQuery Google Maps Store Locator - v2.2.1 - 2015-11-27 * http://www.bjornblog.com/web/jquery-store-locator-plugin * Copyright (c) 2015 Bjorn Holine; Licensed MIT */ diff --git a/package.json b/package.json index f5398d3..84fb340 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jquery-storelocator-plugin", - "version": "2.2.0", + "version": "2.2.1", "description": "This jQuery plugin takes advantage of Google Maps API version 3 to create an easy to implement store locator. No back-end programming is required, you just need to feed it KML, XML, or JSON data with all the location information.", "repository": { "type": "git", diff --git a/readme.md b/readme.md index e344525..cf2d9ea 100644 --- a/readme.md +++ b/readme.md @@ -27,6 +27,10 @@ for even faster loading. ## Changelog +### Version 2.2.1 + +* Updated preventative styling to be more specific to the map container and added max-height img rule. + ### Version 2.2.0 * Added check for Google Maps API. diff --git a/src/css/storelocator.scss b/src/css/storelocator.scss index b5924a6..c5fa2a2 100644 --- a/src/css/storelocator.scss +++ b/src/css/storelocator.scss @@ -34,6 +34,14 @@ $arialFont: Arial, Helvetica, sans-serif; font-weight: bold; } +/* Avoid image issues with Google Maps and CSS resets */ +.bh-sl-map-container img { + max-height: none !important; + max-width: none !important; + border-radius: 0 !important; + box-shadow: none !important; +} + .bh-sl-container { float: left; margin-left: 20px; @@ -41,13 +49,6 @@ $arialFont: Arial, Helvetica, sans-serif; font: normal 14px/20px $arialFont; color: $textgray; - /* Avoid image issues with Google Maps and CSS resets */ - img { - max-width: none !important; - border-radius: 0 !important; - box-shadow: none !important; - } - /* Avoid issues with Google Maps and CSS frameworks */ > * { box-sizing: content-box !important; diff --git a/storelocator.jquery.json b/storelocator.jquery.json index 604d4e1..47fd6c2 100644 --- a/storelocator.jquery.json +++ b/storelocator.jquery.json @@ -3,7 +3,7 @@ "title": "jQuery Google Maps Store Locator", "description": "This jQuery plugin takes advantage of Google Maps API version 3 to create an easy to implement store locator. No back-end programming is required, you just need to feed it KML, XML, or JSON data with all the location information.", "keywords": ["jquery","locator","store", "location", "locations", "maps", "map", "stores", "find"], - "version": "2.2.0", + "version": "2.2.1", "author": { "name": "Bjorn Holine", "url": "http://www.bjornblog.com/"