Skip to content

Commit

Permalink
Use asset_url instead of asset_data_uri
Browse files Browse the repository at this point in the history
  • Loading branch information
eliotjordan committed Jan 26, 2018
1 parent 991ef28 commit 9e55171
Show file tree
Hide file tree
Showing 3 changed files with 227 additions and 10 deletions.
14 changes: 7 additions & 7 deletions vendor/assets/stylesheets/leaflet-geocoder-mapzen.css.erb
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ img.leaflet-pelias-layer-icon {
}

.leaflet-pelias-layer-icon-point {
background-image: url(<%= asset_data_uri 'point_icon.png' %>);
background-image: url(<%= asset_url 'point_icon.png' %>);
}

.leaflet-pelias-layer-icon-polygon {
background-image: url(<%= asset_data_uri 'polygon_icon.png' %>);
background-image: url(<%= asset_url 'polygon_icon.png' %>);
}

@media only screen and (min--moz-device-pixel-ratio: 1.25),
Expand All @@ -113,11 +113,11 @@ only screen and (min-device-pixel-ratio: 1.25),
only screen and (min-resolution: 120dpi),
only screen and (min-resolution: 1.25dppx) {
.leaflet-pelias-layer-icon-point {
background-image: url(<%= asset_data_uri 'point_icon@2x.png' %>);
background-image: url(<%= asset_url 'point_icon@2x.png' %>);
}

.leaflet-pelias-layer-icon-polygon {
background-image: url(<%= asset_data_uri 'polygon_icon@2x.png' %>);
background-image: url(<%= asset_url 'polygon_icon@2x.png' %>);
}
}

Expand Down Expand Up @@ -174,7 +174,7 @@ only screen and (min-resolution: 1.25dppx) {
.leaflet-pelias-search-icon {
position: absolute;
height: 100%;
background-image: url(<%= asset_data_uri 'search.png' %>);
background-image: url(<%= asset_url 'search.png' %>);
background-repeat: no-repeat;
background-position: center center;
background-size: 16px;
Expand Down Expand Up @@ -213,10 +213,10 @@ only screen and (min-device-pixel-ratio: 1.25),
only screen and (min-resolution: 120dpi),
only screen and (min-resolution: 1.25dppx) {
.leaflet-pelias-search-icon {
background-image: url(<%= asset_data_uri 'search@2x.png' %>);
background-image: url(<%= asset_url 'search@2x.png' %>);
}
.leaflet-pelias-search-icon.leaflet-pelias-loading {
background-image: url(<%= asset_data_uri 'loading@2x.gif' %>);
background-image: url(<%= asset_url 'loading@2x.gif' %>);
}
}

Expand Down
219 changes: 218 additions & 1 deletion vendor/assets/stylesheets/leaflet.extra-markers.css.erb
Original file line number Diff line number Diff line change
@@ -1 +1,218 @@
.extra-marker{background:url(<%= asset_data_uri 'markers_default.png' %>) no-repeat 0 0;width:35px;height:46px;position:absolute;left:0;top:0;display:block;text-align:center}.extra-marker-shadow{background:url(<%= asset_data_uri 'markers_shadow.png' %>) no-repeat 0 0;width:36px;height:16px}@media (min--moz-device-pixel-ratio:1.5),(-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){.extra-marker{background-image:url(<%= asset_data_uri 'markers_default@2x.png' %>);background-size:540px 184px}.extra-marker-shadow{background-image:url(<%= asset_data_uri 'markers_shadow@2x.png' %>);background-size:35px 16px}}.extra-marker i{color:#fff;margin-top:10px;display:inline-block;font-size:14px}.extra-marker i.icon{margin-right:0;opacity:1}.extra-marker-circle-red{background-position:0 0}.extra-marker-circle-orange-dark{background-position:-36px 0}.extra-marker-circle-orange{background-position:-72px 0}.extra-marker-circle-yellow{background-position:-108px 0}.extra-marker-circle-blue-dark{background-position:-144px 0}.extra-marker-circle-blue{background-position:-180px 0}.extra-marker-circle-cyan{background-position:-216px 0}.extra-marker-circle-purple{background-position:-252px 0}.extra-marker-circle-violet{background-position:-288px 0}.extra-marker-circle-pink{background-position:-324px 0}.extra-marker-circle-green-dark{background-position:-360px 0}.extra-marker-circle-green{background-position:-396px 0}.extra-marker-circle-green-light{background-position:-432px 0}.extra-marker-circle-black{background-position:-468px 0}.extra-marker-circle-white{background-position:-504px 0}.extra-marker-square-red{background-position:0 -46px}.extra-marker-square-orange-dark{background-position:-36px -46px}.extra-marker-square-orange{background-position:-72px -46px}.extra-marker-square-yellow{background-position:-108px -46px}.extra-marker-square-blue-dark{background-position:-144px -46px}.extra-marker-square-blue{background-position:-180px -46px}.extra-marker-square-cyan{background-position:-216px -46px}.extra-marker-square-purple{background-position:-252px -46px}.extra-marker-square-violet{background-position:-288px -46px}.extra-marker-square-pink{background-position:-324px -46px}.extra-marker-square-green-dark{background-position:-360px -46px}.extra-marker-square-green{background-position:-396px -46px}.extra-marker-square-green-light{background-position:-432px -46px}.extra-marker-square-black{background-position:-468px -46px}.extra-marker-square-white{background-position:-504px -46px}.extra-marker-star-red{background-position:0 -92px}.extra-marker-star-orange-dark{background-position:-36px -92px}.extra-marker-star-orange{background-position:-72px -92px}.extra-marker-star-yellow{background-position:-108px -92px}.extra-marker-star-blue-dark{background-position:-144px -92px}.extra-marker-star-blue{background-position:-180px -92px}.extra-marker-star-cyan{background-position:-216px -92px}.extra-marker-star-purple{background-position:-252px -92px}.extra-marker-star-violet{background-position:-288px -92px}.extra-marker-star-pink{background-position:-324px -92px}.extra-marker-star-green-dark{background-position:-360px -92px}.extra-marker-star-green{background-position:-396px -92px}.extra-marker-star-green-light{background-position:-432px -92px}.extra-marker-star-black{background-position:-468px -92px}.extra-marker-star-white{background-position:-504px -92px}.extra-marker-penta-red{background-position:0 -138px}.extra-marker-penta-orange-dark{background-position:-36px -138px}.extra-marker-penta-orange{background-position:-72px -138px}.extra-marker-penta-yellow{background-position:-108px -138px}.extra-marker-penta-blue-dark{background-position:-144px -138px}.extra-marker-penta-blue{background-position:-180px -138px}.extra-marker-penta-cyan{background-position:-216px -138px}.extra-marker-penta-purple{background-position:-252px -138px}.extra-marker-penta-violet{background-position:-288px -138px}.extra-marker-penta-pink{background-position:-324px -138px}.extra-marker-penta-green-dark{background-position:-360px -138px}.extra-marker-penta-green{background-position:-396px -138px}.extra-marker-penta-green-light{background-position:-432px -138px}.extra-marker-penta-black{background-position:-468px -138px}.extra-marker-penta-white{background-position:-504px -138px}.extra-marker .fa-number:before{content:attr(number)}
.extra-marker{
background:url('<%= asset_url('markers_default.png') %>') no-repeat 0 0;
width:35px;
height:46px;
position:absolute;
left:0;
top:0;
display:block;
text-align:center
}
.extra-marker-shadow{
background:url('<%= asset_url('markers_shadow.png') %>') no-repeat 0 0;
width:36px;
height:16px
}
@media (min--moz-device-pixel-ratio:1.5),(-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5),(min-resolution:1.5dppx){
.extra-marker{
background-image:url('<%= asset_url('markers_default@2x.png') %>');
background-size:540px 184px
}
.extra-marker-shadow{
background-image:url('<%= asset_url('markers_shadow@2x.png') %>');
background-size:35px 16px
}
}
.extra-marker i{
color:#fff;
margin-top:10px;
display:inline-block;
font-size:14px
}
.extra-marker i.icon{
margin-right:0;
opacity:1
}
.extra-marker-circle-red{
background-position:0 0
}
.extra-marker-circle-orange-dark{
background-position:-36px 0
}
.extra-marker-circle-orange{
background-position:-72px 0
}
.extra-marker-circle-yellow{
background-position:-108px 0
}
.extra-marker-circle-blue-dark{
background-position:-144px 0
}
.extra-marker-circle-blue{
background-position:-180px 0
}
.extra-marker-circle-cyan{
background-position:-216px 0
}
.extra-marker-circle-purple{
background-position:-252px 0
}
.extra-marker-circle-violet{
background-position:-288px 0
}
.extra-marker-circle-pink{
background-position:-324px 0
}
.extra-marker-circle-green-dark{
background-position:-360px 0
}
.extra-marker-circle-green{
background-position:-396px 0
}
.extra-marker-circle-green-light{
background-position:-432px 0
}
.extra-marker-circle-black{
background-position:-468px 0
}
.extra-marker-circle-white{
background-position:-504px 0
}
.extra-marker-square-red{
background-position:0 -46px
}
.extra-marker-square-orange-dark{
background-position:-36px -46px
}
.extra-marker-square-orange{
background-position:-72px -46px
}
.extra-marker-square-yellow{
background-position:-108px -46px
}
.extra-marker-square-blue-dark{
background-position:-144px -46px
}
.extra-marker-square-blue{
background-position:-180px -46px
}
.extra-marker-square-cyan{
background-position:-216px -46px
}
.extra-marker-square-purple{
background-position:-252px -46px
}
.extra-marker-square-violet{
background-position:-288px -46px
}
.extra-marker-square-pink{
background-position:-324px -46px
}
.extra-marker-square-green-dark{
background-position:-360px -46px
}
.extra-marker-square-green{
background-position:-396px -46px
}
.extra-marker-square-green-light{
background-position:-432px -46px
}
.extra-marker-square-black{
background-position:-468px -46px
}
.extra-marker-square-white{
background-position:-504px -46px
}
.extra-marker-star-red{
background-position:0 -92px
}
.extra-marker-star-orange-dark{
background-position:-36px -92px
}
.extra-marker-star-orange{
background-position:-72px -92px
}
.extra-marker-star-yellow{
background-position:-108px -92px
}
.extra-marker-star-blue-dark{
background-position:-144px -92px
}
.extra-marker-star-blue{
background-position:-180px -92px
}
.extra-marker-star-cyan{
background-position:-216px -92px
}
.extra-marker-star-purple{
background-position:-252px -92px
}
.extra-marker-star-violet{
background-position:-288px -92px
}
.extra-marker-star-pink{
background-position:-324px -92px
}
.extra-marker-star-green-dark{
background-position:-360px -92px
}
.extra-marker-star-green{
background-position:-396px -92px
}
.extra-marker-star-green-light{
background-position:-432px -92px
}
.extra-marker-star-black{
background-position:-468px -92px
}
.extra-marker-star-white{
background-position:-504px -92px
}
.extra-marker-penta-red{
background-position:0 -138px
}
.extra-marker-penta-orange-dark{
background-position:-36px -138px
}
.extra-marker-penta-orange{
background-position:-72px -138px
}
.extra-marker-penta-yellow{
background-position:-108px -138px
}
.extra-marker-penta-blue-dark{
background-position:-144px -138px
}
.extra-marker-penta-blue{
background-position:-180px -138px
}
.extra-marker-penta-cyan{
background-position:-216px -138px
}
.extra-marker-penta-purple{
background-position:-252px -138px
}
.extra-marker-penta-violet{
background-position:-288px -138px
}
.extra-marker-penta-pink{
background-position:-324px -138px
}
.extra-marker-penta-green-dark{
background-position:-360px -138px
}
.extra-marker-penta-green{
background-position:-396px -138px
}
.extra-marker-penta-green-light{
background-position:-432px -138px
}
.extra-marker-penta-black{
background-position:-468px -138px
}
.extra-marker-penta-white{
background-position:-504px -138px
}
.extra-marker .fa-number:before{
content:attr(number)
}
4 changes: 2 additions & 2 deletions vendor/assets/stylesheets/leaflet.fullscreen.css.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//= depend_on_asset 'fullscreen-2x.png'

.leaflet-control-fullscreen a {
background:#fff url(<%= asset_data_uri 'fullscreen.png' %>) no-repeat 0 0;
background:#fff url(<%= asset_url 'fullscreen.png' %>) no-repeat 0 0;
background-size:26px 52px;
}
.leaflet-touch .leaflet-control-fullscreen a {
Expand Down Expand Up @@ -38,6 +38,6 @@
(-webkit-min-device-pixel-ratio:2),
(min-resolution:192dpi) {
.leaflet-control-fullscreen a {
background-image:url(<%= asset_data_uri 'fullscreen@2x.png' %>);
background-image:url(<%= asset_url 'fullscreen@2x.png' %>);
}
}

0 comments on commit 9e55171

Please sign in to comment.