CSS tweaks for narrow ULS

This commit is contained in:
Amir E. Aharoni
2014-12-04 00:39:57 +02:00
parent b55bc61dc7
commit dd59d4d0c8
2 changed files with 14 additions and 2 deletions

View File

@@ -241,6 +241,10 @@ div.uls-region {
float: right; float: right;
} }
.uls-menu.uls-narrow .uls-search-label {
background-size: 20px;
}
.uls-menu .uls-languagefilter-clear { .uls-menu .uls-languagefilter-clear {
/* @embed */ /* @embed */
background: transparent url('../images/clear.png') no-repeat scroll left center; background: transparent url('../images/clear.png') no-repeat scroll left center;

View File

@@ -193,12 +193,20 @@
* @param {number} columnsPerRow How many columns fit in a row. * @param {number} columnsPerRow How many columns fit in a row.
*/ */
renderRegion: function( $region, languages, itemsPerColumn, columnsPerRow ) { renderRegion: function( $region, languages, itemsPerColumn, columnsPerRow ) {
var i, lastItem, currentScript, nextScript, force, var columnsClasses, i, lastItem, currentScript, nextScript, force,
len = languages.length, len = languages.length,
items = [], items = [],
columns = [], columns = [],
rows = []; rows = [];
if ( columnsPerRow === 1 ) {
columnsClasses = 'twelve columns';
} else if ( columnsPerRow < 4 ) {
columnsClasses = 'six columns';
} else {
columnsClasses = 'three columns';
}
for ( i = 0; i < len; i++ ) { for ( i = 0; i < len; i++ ) {
force = false; force = false;
nextScript = $.uls.data.getScriptGroupOfLanguage( languages[i+1] ); nextScript = $.uls.data.getScriptGroupOfLanguage( languages[i+1] );
@@ -215,7 +223,7 @@
items.push( this.renderItem( languages[i] ) ); items.push( this.renderItem( languages[i] ) );
if ( items.length >= itemsPerColumn || lastItem || force ) { if ( items.length >= itemsPerColumn || lastItem || force ) {
columns.push( $( '<ul>' ).addClass( 'three columns' ).append( items ) ); columns.push( $( '<ul>' ).addClass( columnsClasses ).append( items ) );
items = []; items = [];
if ( columns.length >= columnsPerRow || lastItem ) { if ( columns.length >= columnsPerRow || lastItem ) {
rows.push( $( '<div>' ).addClass( 'row uls-language-block' ).append( columns ) ); rows.push( $( '<div>' ).addClass( 'row uls-language-block' ).append( columns ) );