Merge branch 'master' of https://github.com/nemobis/jquery.uls into nemobis-master

Change-Id: I27589e099cf9841194c92228b8d91cee33937390
This commit is contained in:
Santhosh Thottingal committed 2014-06-02 10:03:31 +05:30
commit fef552d97b
3 files changed
+1 -16

No files matched your search

+1 -15
View File
@@ -69,16 +69,6 @@
border-bottom: none;
}
.uls-worldmap {
/* @embed */
background: transparent url('../images/world_map.png') no-repeat scroll right top;
/* @embed */
background-image: -webkit-linear-gradient(transparent, transparent), url('../images/world_map.svg');
/* @embed */
background-image: linear-gradient(transparent, transparent), url('../images/world_map.svg');
background-size: 100%;
}
div.uls-region {
cursor: pointer;
padding: 0;
@@ -89,11 +79,6 @@ div.uls-region {
border-bottom-width: 2px;
}
.uls-worldmap .uls-region { /* The map doesn't flip */
/* @noflip */
float: left;
}
.uls-region a {
bottom: 2px;
left: 2px;
@@ -115,6 +100,7 @@ div.uls-region {
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#253366bb, endColorstr=#253366bb)";
}
<<<<<<< HEAD
.uls-map-block .active {
border-bottom-color: #3366bb;
border-bottom-style: solid;
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

-1
View File
@@ -1 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="226" height="110.282"><path d="M193.821 62.707c-.176 2.179-.181 2.492 3.773 4.165 1.587 5.831 4.488-.838 7.46 3.732 1.292-1.026-3.685-7.38-7.881-6.767-2.898 3.404-1.126-1.013-3.352-1.131zm-134.265 41.902l-.075-.387c1.085.625 2.299 1.005 3.281 1.797-.348.039-.698.116-1.049.061-.804-.127-1.587-.331-2.403-.39.241-.301.351-.704.246-1.08zm153.278-9.772c.103-.026.179.043.243.113.064 1.203-.951 2.149-2.031 2.475-1.303.203-2.356 1.098-3.567 1.566-.21.144-.834.377-.716-.095 1.789-1.652 3.913-2.948 6.072-4.058zm3.045-3.339l.142-.425c.236.693.813 1.135 1.395 1.521.405.194.198.716-.153.834-1.102.554-2.014 1.434-3.149 1.947l1.765-3.876zm-81.252-19.203l.176-.355c.654 1.479.422 3.174.134 4.718-.415 1.889-.876 3.929-2.272 5.355-.536.671-1.604.462-2.057-.194-.39-.839-.255-1.856-.142-2.756.485-2.71 2.861-4.464 4.16-6.768zm65.746-.67l.17-.451c.323.459.205 1.016.17 1.534-.134.518.076 1.34.754 1.257.081 2.404 1.59 4.381 2.682 6.426.887 1.501 1.43 3.359.836 5.072-.499 1.35-1.516 2.447-2.386 3.577-1.608 1.81-3.53 3.559-5.922 4.195-1.343.48-2.956-.171-3.53-1.485-.527-.565-.843-1.384-.581-2.152-.154-.311-.583.046-.82.052.236.199.126.718-.298.667-2.908-.187-5.747-1.189-8.686-1.031-1.053-.012-2.035.321-2.987.739-.558.313-1.359.133-1.612-.494-.516-1.884.15-3.832.381-5.714.202-.878-.182-1.816.222-2.66.76-1.614 2.551-2.346 4.11-2.983 1.161-.565 2.57-.883 3.415-1.918.386-.811.994-1.555 1.776-2.039.831-.638 2.016-.463 2.811.142.076-.095.011-.501.101-.702.418-1.423 2.067-2.107 3.458-1.993.575-.018 1.35.272 1.317.959-.266.695-.117 1.488.097 2.18.156.759.867 1.437 1.682 1.234 1.754-.645 2.672-2.626 2.837-4.411zm-25.318-4.252l-.066-.243c.481-.023.943.119 1.369.329l4.278 1.141c-.856.542-1.91.513-2.886.431-1.059-.107-2.396-.491-2.695-1.659zm10.436-5.176c.697-.1 1.125.536 1.236 1.141.102.751.236 1.766-.465 2.276-.422-.186-.636-.619-.774-1.031-.159.695-.392 1.375-.835 1.947-.324-.942-.233-1.96.017-2.903.196-.487.169-1.321.82-1.43zm1.713-1.447c.314-.014.629.046.924.147.506.049.457.74.153 1.005-.874.544-1.907-.147-2.851.069.267-.72 1.017-1.208 1.774-1.222zm-19.391-2.366c-.387-.692-.35-.573.251-.248 2.323 1.32 4.654 2.983 5.901 5.419.36.882.765 1.874.539 2.848-.244.239-.722-.046-.958-.274-2.303-2.239-4.111-4.971-5.734-7.744zm14.633-1.45c.084-.2.15-.09.286-.02.439.382 1.137.618 1.288 1.233-.18.592-.759 1.1-.826 1.768.687.848.54 2.054.188 3.013-.407 1.111-1.278 2.382-2.597 2.36-.806-.149-1.555-.576-2.273-.956-.755-.361-1.282-1.269-.939-2.094 1.152-2.16 3.423-3.386 4.873-5.303zm-138.425-1.739zm144.329-.523l.133-.133c.338.345.688.702.872 1.155.309.76-.712 1.193-.61 1.947-.676-.444-1.488-.701-2.028-1.326.398-.687 1.125-1.059 1.632-1.644zm-4.038-7.089l.004-.005c.394-.136 1.03-.01 1.302.389.366 1.039-.81 2.145-.055 3.108-.339.09-.624-.112-.844-.336-.976-.713-1.174-2.22-.406-3.156zm-140.187-3.7c.114-.012.228.005.338.035 1.463.705 3.104 1.187 4.304 2.346-.402.34-.948.287-1.436.266-.385.116-.614-.271-.644-.601-.737-1.066-2.201-1.167-3.371-1.323-.203.03-.806-.127-.477-.373.382-.21.87-.202 1.285-.349zm143.876-8.406l.124-.286c.454.594 1.007 1.194 1.057 1.979-.756-.099-1.544-.912-1.181-1.693zm-72.953-3.591c.046-.348.294-.025.439.043.272.181.701.685.693.075.273-.036.737.323.508.627-.347.113-.48-.399-.802-.2-.362.208-1.068-.064-.839-.545zm76.962-2.256c-.147-.602-.032-.366.332-.156 1.14.732 1.089 2.253 1.361 3.432.224.356.326.887-.11 1.144-1.34 1.231-3.307.854-4.971.985.29-.235.579-.47.914-.638 1.712-.862 2.909-2.837 2.474-4.766zm-1.358-2.998c.034-.033-.212-.641-.013-.401.926.855 2.494.518 3.231 1.643-.828.274-1.572.911-2.49.861-.642-.49-.477-1.414-.728-2.103zm-65.772-1.632c-.898.275-1.461 1.093-2.126 1.727-.362-.628-.901-1.226-1.646-1.361-1.062-.171-1.729.978-1.956 1.866-.023.546.34 1.101.228 1.681 2.198.135 4.529.51 6.788.355.411-.033 1.157-.035 1.219-.578-.483-1.02-1.661-1.445-2.565-2.025-.466-.114-.244-.662-.017-.898.064-.211.353-.629.075-.768zm8.105-.205c-.827.179-1.901.563-2.112 1.502-.138 1.391 1.013 2.453 1.898 3.359-.455.805.028 1.765.638 2.334.58.496 1.406 1.159 2.218.835.569-.451.192-1.281-.026-1.827-.897-.976-1.733-2.159-1.768-3.552.067-.932.056-2.107-.849-2.652zm-86.304-1.476l-.11.162c-.596.461-1.433.492-2.1.83-.186.097-.669.229-.551.513 1.295.498 2.771.179 4.087.659-.665.41-1.398.665-2.143.867-.599-.007-.8.565-1.014 1.023-.092.418-.554.868-.381 1.294 1.202-.645 1.894-2.023 3.175-2.588.213.416.069.881-.084 1.288.118.121.548.005.797-.009.581-.061 1.474-.298 1.407-1.049-.544-1.388-1.938-2.142-3.082-2.99zm20.038-1.667l.503-.3c-.133.446-.387.813-.734 1.106.116.29.522.535.734.815.333.426.858.828.927 1.392-.156.439-.779.075-1.124.116-.728-.138-1.68-.365-1.938-1.158-.062-.963.947-1.499 1.632-1.97zm119.909-1.32l-.162-.48c1.034.574 1.723 1.598 2.631 2.328.146.297.387.073.552.289-.016.243.061.389.237.595.359.727.817 1.477.734 2.322-1.625-1.427-2.821-3.244-3.992-5.055zm-89.58-1.837c.382-.033.845.182.893.601-.128 1.258-1.3 2.309-2.556 2.386.24-1.106.529-2.481 1.664-2.987zm1.982-2.Line truncated

Before

Width:  |  Height:  |  Size: 19 KiB