Merge "Update jquery.uls from upstream"

This commit is contained in:
Santhosh Thottingal
2012-12-07 04:36:56 +00:00
committed by Gerrit Code Review
7 changed files with 118 additions and 97 deletions

View File

@@ -117,7 +117,7 @@ div.uls-region {
border-bottom-style: solid; border-bottom-style: solid;
} }
.map-block { .uls-menu .row .map-block {
top: 1px; top: 1px;
margin-right: 0; margin-right: 0;
padding-right: 0; padding-right: 0;
@@ -139,8 +139,8 @@ div.uls-region {
transition: opacity 0.15s linear; transition: opacity 0.15s linear;
} }
.map-block:hover, .uls-menu .map-block:hover,
.map-block:hover a { .uls-menu .map-block:hover a {
opacity: 1; opacity: 1;
color: #333; color: #333;
} }
@@ -250,260 +250,255 @@ div.uls-region {
/* Generated using Foundation http://foundation.zurb.com/docs/grid.php */ /* Generated using Foundation http://foundation.zurb.com/docs/grid.php */
/* Global Reset & Standards ---------------------- */ /* Global Reset & Standards ---------------------- */
.uls-menu * { .grid * {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
/* Misc ---------------------- */ /* Misc ---------------------- */
.left { .grid .left {
float: left; float: left;
} }
.right { .grid .right {
float: right; float: right;
} }
.text-left { .grid .text-left {
text-align: left; text-align: left;
} }
.text-right { .grid .text-right {
text-align: right; text-align: right;
} }
.text-center { .grid .text-center {
text-align: center; text-align: center;
} }
.hide { .grid .hide {
display: none; display: none;
} }
.highlight { .grid .highlight {
background: #ffff99; background: #ffff99;
} }
/* The Grid ---------------------- */ /* The Grid ---------------------- */
.row { .grid .row {
width: 100%; width: 100%;
max-width: none; max-width: none;
min-width: 600px; min-width: 600px;
margin: 0 auto; margin: 0 auto;
} }
.row .row {
.grid .row .row {
width: auto; width: auto;
max-width: none; max-width: none;
min-width: 0; min-width: 0;
margin: 0 -5px; margin: 0 -5px;
} }
.row.collapse .column, .row.collapse .columns {
.grid .row.collapse .column,
.grid .row.collapse .columns {
padding: 0; padding: 0;
} }
.row .row {
.grid .row .row {
width: auto; width: auto;
max-width: none; max-width: none;
min-width: 0; min-width: 0;
margin: 0 -5px; margin: 0 -5px;
} }
.row .row.collapse {
.grid .row .row.collapse {
margin: 0; margin: 0;
} }
.column, .columns { .grid .column, .grid .columns {
float: left; float: left;
min-height: 1px; min-height: 1px;
padding: 0 5px; padding: 0 5px;
position: relative; position: relative;
} }
.column.centered, .columns.centered {
.grid .column.centered, .grid .columns.centered {
float: none; float: none;
margin: 0 auto; margin: 0 auto;
} }
.row .one { .grid .row .one {
width: 8.333%; width: 8.333%;
} }
.row .two { .grid .row .two {
width: 16.667%; width: 16.667%;
} }
.row .three { .grid .row .three {
width: 25%; width: 25%;
} }
.row .four { .grid .row .four {
width: 33.333%; width: 33.333%;
} }
.row .five { .grid .row .five {
width: 41.667%; width: 41.667%;
} }
.row .six { .grid .row .six {
width: 50%; width: 50%;
} }
.row .seven { .grid .row .seven {
width: 58.333%; width: 58.333%;
} }
.row .eight { .grid .row .eight {
width: 66.667%; width: 66.667%;
} }
.row .nine { .grid .row .nine {
width: 75%; width: 75%;
} }
.row .ten { .grid .row .ten {
width: 83.333%; width: 83.333%;
} }
.row .eleven { .grid .row .eleven {
width: 91.667%; width: 91.667%;
} }
.row .twelve { .grid .row .twelve {
width: 100%; width: 100%;
} }
.row .offset-by-one { .grid .row .offset-by-one {
margin-left: 8.333%; margin-left: 8.333%;
} }
.row .offset-by-two { .grid .row .offset-by-two {
margin-left: 16.667%; margin-left: 16.667%;
} }
.row .offset-by-three { .grid .row .offset-by-three {
margin-left: 25%; margin-left: 25%;
} }
.row .offset-by-four { .grid .row .offset-by-four {
margin-left: 33.333%; margin-left: 33.333%;
} }
.row .offset-by-five { .grid .row .offset-by-five {
margin-left: 41.667%; margin-left: 41.667%;
} }
.row .offset-by-six { .grid .row .offset-by-six {
margin-left: 50%; margin-left: 50%;
} }
.row .offset-by-seven { .grid .row .offset-by-seven {
margin-left: 58.333%; margin-left: 58.333%;
} }
.row .offset-by-eight { .grid .row .offset-by-eight {
margin-left: 66.667%; margin-left: 66.667%;
} }
.row .offset-by-nine { .grid .row .offset-by-nine {
margin-left: 75%; margin-left: 75%;
} }
.row .offset-by-ten { .grid .row .offset-by-ten {
margin-left: 83.333%; margin-left: 83.333%;
} }
.push-two { .grid .push-two {
left: 16.667%; left: 16.667%;
} }
.pull-two { .grid .pull-two {
right: 16.667%; right: 16.667%;
} }
.push-three { .grid .push-three {
left: 25%; left: 25%;
} }
.pull-three { .grid .pull-three {
right: 25%; right: 25%;
} }
.push-four { .grid .push-four {
left: 33.333%; left: 33.333%;
} }
.pull-four { .grid .pull-four {
right: 33.333%; right: 33.333%;
} }
.push-five { .grid .push-five {
left: 41.667%; left: 41.667%;
} }
.pull-five { .grid .pull-five {
right: 41.667%; right: 41.667%;
} }
.push-six { .grid .push-six {
left: 50%; left: 50%;
} }
.pull-six { .grid .pull-six {
right: 50%; right: 50%;
} }
.push-seven { .grid .push-seven {
left: 58.333%; left: 58.333%;
} }
.pull-seven { .grid .pull-seven {
right: 58.333%; right: 58.333%;
} }
.push-eight { .grid .push-eight {
left: 66.667%; left: 66.667%;
} }
.pull-eight { .grid .pull-eight {
right: 66.667%; right: 66.667%;
} }
.push-nine { .grid .push-nine {
left: 75%; left: 75%;
} }
.pull-nine { .grid .pull-nine {
right: 75%; right: 75%;
} }
.push-ten { .grid .push-ten {
left: 83.333%; left: 83.333%;
} }
.pull-ten { .grid .pull-ten {
right: 83.333%; right: 83.333%;
} }
img, object, embed {
max-width: 100%;
height: auto;
}
img {
-ms-interpolation-mode: bicubic;
}
#map_canvas img, .map_canvas img {
max-width: none !important;
}
/* Nicolas Gallagher's micro clearfix */ /* Nicolas Gallagher's micro clearfix */
.row { .grid .row {
*zoom: 1; *zoom: 1;
} }
.row:before, .row:after {
.grid .row:before, .grid .row:after {
content: ""; content: "";
display: table; display: table;
} }
.row:after {
.grid .row:after {
clear: both; clear: both;
} }
@@ -518,57 +513,57 @@ img {
lines below to support arbitrary height, but know lines below to support arbitrary height, but know
that IE7/8 do not support :nth-child. that IE7/8 do not support :nth-child.
-------------------------------------------------- */ -------------------------------------------------- */
.block-grid { .grid .block-grid {
display: block; display: block;
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
} }
.block-grid > li {
.grid .block-grid > li {
display: block; display: block;
height: auto; height: auto;
float: left; float: left;
} }
.block-grid.two-up { .grid .block-grid.two-up {
margin: 0 -15px; margin: 0 -15px;
} }
.block-grid.two-up > li { .grid .block-grid.two-up > li {
width: 50%; width: 50%;
padding: 0 15px 15px; padding: 0 15px 15px;
} }
/* .block-grid.two-up>li:nth-child(2n+1) {clear: left;} */ /* .block-grid.two-up>li:nth-child(2n+1) {clear: left;} */
.block-grid.three-up { .grid .block-grid.three-up {
margin: 0 -12px; margin: 0 -12px;
} }
.block-grid.three-up > li { .grid .block-grid.three-up > li {
width: 33.33%; width: 33.33%;
padding: 0 12px 12px; padding: 0 12px 12px;
} }
/* .block-grid.three-up>li:nth-child(3n+1) {clear: left;} */ /* .block-grid.three-up>li:nth-child(3n+1) {clear: left;} */
.block-grid.four-up { .grid .block-grid.four-up {
margin: 0 -10px; margin: 0 -10px;
} }
.block-grid.four-up > li { .grid .block-grid.four-up > li {
width: 25%; width: 25%;
padding: 0 10px 10px; padding: 0 10px 10px;
} }
/* .block-grid.four-up>li:nth-child(4n+1) {clear: left;} */ /* .block-grid.four-up>li:nth-child(4n+1) {clear: left;} */
.block-grid.five-up { .grid .block-grid.five-up {
margin: 0 -8px; margin: 0 -8px;
} }
.block-grid.five-up > li { .grid .block-grid.five-up > li {
width: 20%; width: 20%;
padding: 0 8px 8px; padding: 0 8px 8px;
} }
.uls-lcd-region-section ul li:hover { .uls-lcd-region-section ul li:hover {
background-color: #eaeff7; background-color: #eaeff7;
} }
@@ -632,7 +627,7 @@ img {
line-height: 1.6em; line-height: 1.6em;
} }
.uls-language-block .columns { .uls-menu .uls-language-block .columns {
width: 22%; width: 22%;
} }
.uls-language-block { .uls-language-block {

View File

@@ -1,17 +1,18 @@
{ {
"@metadata": { "@metadata": {
"authors": [ "authors": [
"Namik" "Namik",
"Soul Train"
] ]
}, },
"uls-select-language": "Ch'al xkaghun", "uls-select-language": "Ch'al xkaghun",
"uls-region-WW": "Virialemdin", "uls-region-WW": "Virialemdin",
"uls-region-AM": "Amerika", "uls-region-AM": "\u0410\u043c\u0435\u0440\u0438\u043a\u0430",
"uls-region-AF": "Afrika", "uls-region-AF": "\u0410\u0444\u0440\u0438\u043a\u0430",
"uls-region-EU": "Europa", "uls-region-EU": "\u0415\u0432\u0440\u043e\u043f\u0430",
"uls-region-AS": "Azia", "uls-region-AS": "\u0410\u0437\u0438\u044f",
"uls-region-ME": "Muq'o erch'i pad", "uls-region-ME": "Muq'o erch'i pad",
"uls-region-PA": "Okeani", "uls-region-PA": "\u041e\u043a\u0435\u0430\u043d\u0438\u044f",
"uls-no-results-found": "Jaghanach", "uls-no-results-found": "Jaghanach",
"uls-common-languages": "Bulvilin ch'alar", "uls-common-languages": "Bulvilin ch'alar",
"uls-no-results-suggestion-title": "Kwez mumkin i ch'alar muqaya xun:", "uls-no-results-suggestion-title": "Kwez mumkin i ch'alar muqaya xun:",

View File

@@ -1,6 +1,7 @@
{ {
"@metadata": { "@metadata": {
"authors": [ "authors": [
"JVRKPRASAD",
"Veeven" "Veeven"
] ]
}, },
@@ -14,5 +15,7 @@
"uls-region-PA": "\u0c2a\u0c38\u0c3f\u0c2b\u0c3f\u0c15\u0c4d", "uls-region-PA": "\u0c2a\u0c38\u0c3f\u0c2b\u0c3f\u0c15\u0c4d",
"uls-no-results-found": "\u0c2b\u0c32\u0c3f\u0c24\u0c3e\u0c32\u0c47\u0c2e\u0c40 \u0c26\u0c4a\u0c30\u0c15\u0c32\u0c47\u0c26\u0c41", "uls-no-results-found": "\u0c2b\u0c32\u0c3f\u0c24\u0c3e\u0c32\u0c47\u0c2e\u0c40 \u0c26\u0c4a\u0c30\u0c15\u0c32\u0c47\u0c26\u0c41",
"uls-common-languages": "\u0c38\u0c3e\u0c2e\u0c3e\u0c28\u0c4d\u0c2f \u0c2d\u0c3e\u0c37\u0c32\u0c41", "uls-common-languages": "\u0c38\u0c3e\u0c2e\u0c3e\u0c28\u0c4d\u0c2f \u0c2d\u0c3e\u0c37\u0c32\u0c41",
"uls-no-results-suggestion-title": "\u0c2e\u0c40\u0c15\u0c41 \u0c26\u0c40\u0c28\u0c3f\u0c32\u0c4b \u0c06\u0c38\u0c15\u0c4d\u0c24\u0c3f \u0c09\u0c02\u0c21\u0c35\u0c1a\u0c4d\u0c1a\u0c41:",
"uls-search-help": "\u0c2e\u0c40\u0c30\u0c41 \u0c2d\u0c3e\u0c37 \u0c2a\u0c47\u0c30\u0c41, \u0c38\u0c4d\u0c15\u0c4d\u0c30\u0c3f\u0c2a\u0c4d\u0c1f\u0c4d \u0c2a\u0c47\u0c30\u0c41, \u0c2d\u0c3e\u0c37 \u0c2f\u0c4a\u0c15\u0c4d\u0c15 ISO \u0c15\u0c4b\u0c21\u0c4d \u0c26\u0c4d\u0c35\u0c3e\u0c30\u0c3e \u0c36\u0c4b\u0c27\u0c3f\u0c02\u0c1a\u0c35\u0c1a\u0c4d\u0c1a\u0c41 \u0c32\u0c47\u0c26\u0c3e \u0c2e\u0c40\u0c30\u0c41 \u0c2a\u0c4d\u0c30\u0c3e\u0c02\u0c24\u0c2e\u0c41 \u0c26\u0c4d\u0c35\u0c3e\u0c30\u0c3e \u0c2c\u0c4d\u0c30\u0c4c\u0c1c\u0c4d \u0c1a\u0c46\u0c2f\u0c4d\u0c2f\u0c35\u0c1a\u0c4d\u0c1a\u0c41(\u0c28\u0c41):",
"uls-search-placeholder": "\u0c2d\u0c3e\u0c37 \u0c15\u0c4a\u0c30\u0c15\u0c41 \u0c35\u0c46\u0c24\u0c15\u0c02\u0c21\u0c3f" "uls-search-placeholder": "\u0c2d\u0c3e\u0c37 \u0c15\u0c4a\u0c30\u0c15\u0c41 \u0c35\u0c46\u0c24\u0c15\u0c02\u0c21\u0c3f"
} }

View File

@@ -1,7 +1,8 @@
{ {
"@metadata": { "@metadata": {
"authors": [ "authors": [
"Harvzsf" "Harvzsf",
"Wiki indio"
] ]
}, },
"uls-select-language": "Pili-a an Pinulongan", "uls-select-language": "Pili-a an Pinulongan",
@@ -15,5 +16,6 @@
"uls-no-results-found": "Waray mga resulta nga nabilngan", "uls-no-results-found": "Waray mga resulta nga nabilngan",
"uls-common-languages": "Mga komun o ginsasaroan nga mga pinulongan", "uls-common-languages": "Mga komun o ginsasaroan nga mga pinulongan",
"uls-no-results-suggestion-title": "Bangin ka ma-intersado hin:", "uls-no-results-suggestion-title": "Bangin ka ma-intersado hin:",
"uls-search-help": "Puyde ka magbiling ha kanan ngaran han pinulongan, ngaran han paagi hin pagsurat, ISO nga kodigo han pinulongan o puyde ka magdalikyat ha kanan rehiyon" "uls-search-help": "Puyde ka magbiling ha kanan ngaran han pinulongan, ngaran han paagi hin pagsurat, ISO nga kodigo han pinulongan o puyde ka magdalikyat ha kanan rehiyon",
"uls-search-placeholder": "Paghanap han yinaknan"
} }

View File

@@ -0,0 +1,20 @@
{
"uls-select-language": "\u9078\u64c7\u8a9e\u8a00",
"uls-region-WW": "\u5168\u4e16\u754c",
"uls-region-AM": "\u7f8e\u6d32",
"uls-region-AF": "\u975e\u6d32",
"uls-region-EU": "\u6b50\u6d32",
"uls-region-AS": "\u4e9e\u6d32",
"uls-region-ME": "\u4e2d\u6771",
"uls-region-PA": "\u592a\u5e73\u6d0b",
"uls-no-results-found": "\u627e\u4e0d\u5230\u4efb\u4f55\u7d50\u679c",
"uls-common-languages": "\u5e38\u7528\u8a9e\u8a00",
"uls-no-results-suggestion-title": "\u60a8\u53ef\u80fd\u611f\u8208\u8da3\uff1a",
"uls-search-help": "\u60a8\u53ef\u4ee5\u6309\u8a9e\u8a00\u540d\u7a31\u3001\u7a0b\u5f0f\u78bc\u540d\u7a31\u3001\u8a9e\u8a00ISO\u4ee3\u78bc\u641c\u7d22\uff0c\u6216\u60a8\u4ea6\u53ef\u6309\u5340\u57df\u700f\u89bd\uff1a",
"uls-search-placeholder": "\u641c\u5c0b\u8a9e\u8a00",
"@metadata": {
"authors": [
"Justincheng12345"
]
}
}

View File

@@ -1,4 +1,4 @@
/*! jquery.uls - v0.1.0 - 2012-11-21 /*! jquery.uls - v0.1.0 - 2012-11-28
* https://github.com/wikimedia/jquery.uls * https://github.com/wikimedia/jquery.uls
* Copyright (c) 2012 Santhosh Thottingal; Licensed GPL, MIT */ * Copyright (c) 2012 Santhosh Thottingal; Licensed GPL, MIT */
@@ -1347,7 +1347,7 @@
// Region numbers in id attributes also appear in the langdb. // Region numbers in id attributes also appear in the langdb.
var template = '\ var template = '\
<div class="uls-menu uls-wide"> \ <div class="grid uls-menu uls-wide"> \
<div class="row"> \ <div class="row"> \
<span id="uls-close" class="icon-close"></span> \ <span id="uls-close" class="icon-close"></span> \
</div> \ </div> \

View File

@@ -36,7 +36,7 @@
settingsMenu + settingsMenu +
settingsPanel + settingsPanel +
'</div>'; '</div>';
windowTemplate = '<div style="display: block;" id="language-settings-dialog" class="uls-menu uls-wide">' windowTemplate = '<div style="display: block;" id="language-settings-dialog" class="grid uls-menu uls-wide">'
+ closeRow + closeRow
+ panelsRow + panelsRow
+ '</div>'; + '</div>';