bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid grid overrides in jquery.uls"

Browse Source
This commit is contained in:
jenkins-bot
2013-11-06 07:11:49 +00:00
committed by Gerrit Code Review
parent a049e25962 01acd4cc94
commit caa2852aa9
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/jquery.uls/css/jquery.uls.lcd.css
View File

@@ -61,9 +61,6 @@
line-height: 1.6em; line-height: 1.6em;
} }
.uls-menu .uls-language-block .columns {
width: 22%;
}
.uls-language-block { .uls-language-block {
width: 100%; width: 100%;
} }

9
lib/jquery.uls/src/jquery.uls.lcd.js
View File

@@ -145,7 +145,6 @@
if ( $rowDiv.length === 0 || $rowDiv.find( 'ul' ).length >= 4 ) { if ( $rowDiv.length === 0 || $rowDiv.find( 'ul' ).length >= 4 ) {
$rowDiv = $( '<div>' ).addClass( 'row uls-language-block' ); $rowDiv = $( '<div>' ).addClass( 'row uls-language-block' );
$divRegionCode.append( $rowDiv ); $divRegionCode.append( $rowDiv );
$ul.addClass( 'offset-by-one' );
} }
$rowDiv.append( $ul ); $rowDiv.append( $ul );
@@ -175,11 +174,11 @@
}; };
$.each( $.uls.data.regiongroups, function ( regionCode ) { $.each( $.uls.data.regiongroups, function ( regionCode ) {
$section = $( '<div>' ).addClass( 'twelve columns uls-lcd-region-section' ).attr( 'id', regionCode ); $section = $( '<div>' ).addClass( 'eleven columns offset-by-one uls-lcd-region-section' ).attr( 'id', regionCode );
$sectionTitle = $( '<h3>' ) $sectionTitle = $( '<h3>' )
.attr( 'data-i18n', 'uls-region-' + regionCode ) .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] ); .text( regions[regionCode] );
$section.append( $sectionTitle ); $section.append( $sectionTitle );
@@ -213,10 +212,10 @@
quickList = quickList.slice( 0, 16 ); quickList = quickList.slice( 0, 16 );
quickList.sort( $.uls.data.sortByAutonym ); quickList.sort( $.uls.data.sortByAutonym );
$quickListSection = $( '<div>' ).addClass( 'twelve columns uls-lcd-region-section' ).attr( 'id', 'uls-lcd-quicklist' ); $quickListSection = $( '<div>' ).addClass( 'eleven columns offset-by-one uls-lcd-region-section' ).attr( 'id', 'uls-lcd-quicklist' );
$quickListSectionTitle = $( '<h3>' ) $quickListSectionTitle = $( '<h3>' )
.attr( 'data-i18n', 'uls-common-languages' ) .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 .text( 'Common languages' ); // This is placeholder text if jquery.i18n not present
$quickListSection.append( $quickListSectionTitle ); $quickListSection.append( $quickListSectionTitle );
this.$element.prepend( $quickListSection ); this.$element.prepend( $quickListSection );