From 01acd4cc94a05a2dbd984ed5284bcb80d2b8651a Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Tue, 5 Nov 2013 14:22:59 +0530 Subject: [PATCH] Avoid grid overrides in jquery.uls Updates jquery.uls from upstream Change-Id: I0009039aa9a71bb61f5f62ed4de10d83838d9abf --- lib/jquery.uls/css/jquery.uls.lcd.css | 3 --- lib/jquery.uls/src/jquery.uls.lcd.js | 9 ++++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/jquery.uls/css/jquery.uls.lcd.css b/lib/jquery.uls/css/jquery.uls.lcd.css index 0b928bb1..becfb6d6 100644 --- a/lib/jquery.uls/css/jquery.uls.lcd.css +++ b/lib/jquery.uls/css/jquery.uls.lcd.css @@ -61,9 +61,6 @@ line-height: 1.6em; } -.uls-menu .uls-language-block .columns { - width: 22%; -} .uls-language-block { width: 100%; } diff --git a/lib/jquery.uls/src/jquery.uls.lcd.js b/lib/jquery.uls/src/jquery.uls.lcd.js index 049b50d8..3142be1a 100644 --- a/lib/jquery.uls/src/jquery.uls.lcd.js +++ b/lib/jquery.uls/src/jquery.uls.lcd.js @@ -145,7 +145,6 @@ if ( $rowDiv.length === 0 || $rowDiv.find( 'ul' ).length >= 4 ) { $rowDiv = $( '
' ).addClass( 'row uls-language-block' ); $divRegionCode.append( $rowDiv ); - $ul.addClass( 'offset-by-one' ); } $rowDiv.append( $ul ); @@ -175,11 +174,11 @@ }; $.each( $.uls.data.regiongroups, function ( regionCode ) { - $section = $( '
' ).addClass( 'twelve columns uls-lcd-region-section' ).attr( 'id', regionCode ); + $section = $( '
' ).addClass( 'eleven columns offset-by-one uls-lcd-region-section' ).attr( 'id', regionCode ); $sectionTitle = $( '

' ) .attr( 'data-i18n', 'uls-region-' + regionCode ) - .addClass( 'eleven columns uls-lcd-region-section uls-lcd-region-title offset-by-one' ) + .addClass( 'eleven columns uls-lcd-region-section uls-lcd-region-title' ) .text( regions[regionCode] ); $section.append( $sectionTitle ); @@ -213,10 +212,10 @@ quickList = quickList.slice( 0, 16 ); quickList.sort( $.uls.data.sortByAutonym ); - $quickListSection = $( '
' ).addClass( 'twelve columns uls-lcd-region-section' ).attr( 'id', 'uls-lcd-quicklist' ); + $quickListSection = $( '
' ).addClass( 'eleven columns offset-by-one uls-lcd-region-section' ).attr( 'id', 'uls-lcd-quicklist' ); $quickListSectionTitle = $( '

' ) .attr( 'data-i18n', 'uls-common-languages' ) - .addClass( 'eleven columns uls-lcd-region-section uls-lcd-region-title offset-by-one' ) + .addClass( 'eleven columns uls-lcd-region-section uls-lcd-region-title' ) .text( 'Common languages' ); // This is placeholder text if jquery.i18n not present $quickListSection.append( $quickListSectionTitle ); this.$element.prepend( $quickListSection );