Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/134622
Change subject: Update jquery.uls to afb99eb0 ...................................................................... Update jquery.uls to afb99eb0 * Multiple css selector renaming * Hide misplaced borders in the compact design * Fix the jQuery migration warnings for jQuery 1.11.1 Change-Id: I4a2542b3b745b8b749845a7e8dbb926dd5c4f0e4 --- M lib/jquery.uls/css/jquery.uls.compact.css M lib/jquery.uls/css/jquery.uls.css M lib/jquery.uls/css/jquery.uls.mobile.css M lib/jquery.uls/src/jquery.uls.core.js M lib/jquery.uls/src/jquery.uls.lcd.js 5 files changed, 25 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/22/134622/1 diff --git a/lib/jquery.uls/css/jquery.uls.compact.css b/lib/jquery.uls/css/jquery.uls.compact.css index a958c80..04961ce 100644 --- a/lib/jquery.uls/css/jquery.uls.compact.css +++ b/lib/jquery.uls/css/jquery.uls.compact.css @@ -1,6 +1,7 @@ .uls-compact .icon-close, -.uls-compact .uls-title, -.uls-compact .map-block { +.uls-compact .uls-title-region, +.uls-compact .map-block, +.uls-compact #settings-block { display: none !important; } diff --git a/lib/jquery.uls/css/jquery.uls.css b/lib/jquery.uls/css/jquery.uls.css index c54dba8..4e80c6b 100644 --- a/lib/jquery.uls/css/jquery.uls.css +++ b/lib/jquery.uls/css/jquery.uls.css @@ -115,12 +115,12 @@ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#253366bb, endColorstr=#253366bb)"; } -.map-block .active { +.uls-map-block .active { border-bottom-color: #3366bb; border-bottom-style: solid; } -.uls-menu .row .map-block { +.uls-menu .row .uls-map-block { top: 1px; margin-right: 0; padding-right: 0; @@ -133,7 +133,7 @@ transition: opacity 0.2s linear; } -.map-block a { +.uls-map-block a { color: #333; opacity: 0; -moz-transition: opacity 0.15s linear; @@ -142,25 +142,25 @@ transition: opacity 0.15s linear; } -.uls-menu .map-block:hover, -.uls-menu .map-block:hover a { +.uls-menu .uls-map-block:hover, +.uls-menu .uls-map-block:hover a { opacity: 1; color: #333; } -.map-block .uls-region-1 { +.uls-map-block .uls-region-1 { border-color: transparent; } -.map-block:hover .active { +.uls-map-block:hover .active { border-color: #3366bb; } -.map-block .active a { +.uls-map-block .active a { font-weight: bold; } -.icon-close { +.uls-icon-close { /* @embed */ background: transparent url('../images/close.png') no-repeat scroll center center; /* @embed */ @@ -172,7 +172,7 @@ cursor: pointer; } -.uls-menu .languagefilter { +.uls-menu .uls-languagefilter { background-color: transparent; border: 1px solid #c9c9c9; border-radius: 2px 2px 2px 2px; @@ -186,11 +186,11 @@ transition: border 0.15s linear 0s; } -.uls-menu .languagefilter:focus { +.uls-menu .uls-languagefilter:focus { border: 1px solid #3366bb; } -.uls-menu .search { +.uls-menu .uls-search { position: relative; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#F0F0F0', endColorstr='#FBFBFB'); background: #f8f8f8; @@ -208,7 +208,7 @@ border-bottom-color: #DDD; } -.uls-menu .search-label { +.uls-menu .uls-search-label { /* @embed */ background: transparent url('../images/search.png') no-repeat scroll right center; /* @embed */ @@ -221,7 +221,7 @@ float: right; } -.uls-menu .languagefilter-clear { +.uls-menu .uls-languagefilter-clear { /* @embed */ background: transparent url('../images/clear.png') no-repeat scroll left center; /* @embed */ @@ -235,7 +235,7 @@ margin-left: -32px; } -.uls-menu .filterinput { +.uls-menu .uls-filterinput { position: absolute; top: 0; left: 0; @@ -245,7 +245,7 @@ text-align: left; } -.uls-menu .filtersuggestion { +.uls-menu .uls-filtersuggestion { padding: 6px; background-color: white; color: #888; @@ -255,6 +255,6 @@ left: 1px; } -.uls-menu .search-input-block { +.uls-menu .uls-search-input-block { position: relative; } diff --git a/lib/jquery.uls/css/jquery.uls.mobile.css b/lib/jquery.uls/css/jquery.uls.mobile.css index 6db4962..5d3e06e 100644 --- a/lib/jquery.uls/css/jquery.uls.mobile.css +++ b/lib/jquery.uls/css/jquery.uls.mobile.css @@ -27,8 +27,8 @@ float: left !important; } - .uls-mobile div.map-block a, - .uls-mobile div.map-block { + .uls-mobile .uls-map-block a, + .uls-mobile .uls-map-block { opacity: 1 !important; } diff --git a/lib/jquery.uls/src/jquery.uls.core.js b/lib/jquery.uls/src/jquery.uls.core.js index 5f9d837..2b7e458 100644 --- a/lib/jquery.uls/src/jquery.uls.core.js +++ b/lib/jquery.uls/src/jquery.uls.core.js @@ -25,8 +25,7 @@ // Region numbers in id attributes also appear in the langdb. /*jshint multistr:true */ - template = '\ - <div class="grid uls-menu uls-wide"> \ + template = '<div class="grid uls-menu uls-wide"> \ <div class="row"> \ <span id="uls-close" class="icon-close"></span> \ </div> \ @@ -76,7 +75,7 @@ </div>\ <div class="row uls-language-list"></div>\ <div class="row" id="settings-block"></div>\ - </div> '; + </div>'; /*jshint multistr:false */ /** diff --git a/lib/jquery.uls/src/jquery.uls.lcd.js b/lib/jquery.uls/src/jquery.uls.lcd.js index 3c9b176..7d207bd 100644 --- a/lib/jquery.uls/src/jquery.uls.lcd.js +++ b/lib/jquery.uls/src/jquery.uls.lcd.js @@ -25,8 +25,7 @@ var noResultsTemplate, LanguageCategoryDisplay; /*jshint multistr:true */ - noResultsTemplate = '\ - <div class="twelve columns uls-no-results-view hide">\ + noResultsTemplate = '<div class="twelve columns uls-no-results-view hide">\ <h2 data-i18n="uls-no-results-found" class="eleven columns offset-by-one uls-no-results-found-title">\ No results found\ </h2>\ -- To view, visit https://gerrit.wikimedia.org/r/134622 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a2542b3b745b8b749845a7e8dbb926dd5c4f0e4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits