Merge pull request #54 from amire80/master

Whitespace cleanup
This commit is contained in:
Amir E. Aharoni
2012-12-13 23:50:38 -08:00
4 changed files with 35 additions and 35 deletions

View File

@@ -39,22 +39,22 @@
margin-right: 0;
}
.uls-mobile .column,
.uls-mobile .column,
.uls-mobile .columns {
width: auto !important;
float: none;
}
.uls-mobile .column:last-child,
.uls-mobile .column:last-child,
.uls-mobile .columns:last-child {
float: none;
}
.uls-mobile [class*="column"] + [class*="column"]:last-child {
.uls-mobile [class*="column"] + [class*="column"]:last-child {
float: none;
}
.uls-mobile .column:before,
.uls-mobile .column:before,
.uls-mobile .uls-mobile .columns:before,
.uls-mobile .column:after,
.columns:after {
@@ -80,7 +80,7 @@
margin-left: 0 !important;
}
.uls-mobile .push-two,
.uls-mobile .push-two,
.uls-mobile .push-three,
.uls-mobile .push-four,
.uls-mobile .push-five,
@@ -92,7 +92,7 @@
left: auto;
}
.uls-mobile .pull-two,
.uls-mobile .pull-two,
.uls-mobile .pull-three,
.uls-mobile .pull-four,
.uls-mobile .pull-five,
@@ -105,7 +105,7 @@
}
/* Mobile 4-column Grid */
.uls-mobile .row .mobile-one {
.uls-mobile .row .mobile-one {
width: 25% !important;
float: left;
padding: 0 4px;
@@ -119,7 +119,7 @@
padding: 0;
}
.uls-mobile .row .mobile-two {
.uls-mobile .row .mobile-two {
width: 50% !important;
float: left;
padding: 0 4px;
@@ -129,7 +129,7 @@
float: right;
}
.uls-mobile .row.collapse .mobile-two {
.uls-mobile .row.collapse .mobile-two {
padding: 0;
}
@@ -157,31 +157,31 @@
float: right;
}
.uls-mobile .row.collapse .mobile-four {
.uls-mobile .row.collapse .mobile-four {
padding: 0;
}
.uls-mobile .push-one-mobile {
.uls-mobile .push-one-mobile {
left: 25%;
}
.uls-mobile .pull-one-mobile {
.uls-mobile .pull-one-mobile {
right: 25%;
}
.uls-mobile .push-two-mobile {
.uls-mobile .push-two-mobile {
left: 50%;
}
.uls-mobile .pull-two-mobile {
.uls-mobile .pull-two-mobile {
right: 50%;
}
.uls-mobile .push-three-mobile {
.uls-mobile .push-three-mobile {
left: 75%;
}
.uls-mobile .pull-three-mobile {
.uls-mobile .pull-three-mobile {
right: 75%;
}
}
@@ -237,7 +237,7 @@
.uls-mobile .hide-for-xlarge {
display: block !important;
}
.uls-mobile .show-for-small,
.uls-mobile .hide-for-medium,
.uls-mobile .hide-for-medium-down,
@@ -316,4 +316,4 @@
.uls-mobile .touch .hide-for-touch {
display: none !important;
}
}

View File

@@ -23,13 +23,13 @@
$( document ).ready( function() {
var i18n = $.i18n( );
// Use default locale "en"
i18n.locale = "en";
i18n.locale = 'en';
i18n.load( '../i18n/en.json', 'en' );
$( '.uls-trigger' ).uls( {
onReady: function ( ) {
this.i18n();
},
onSelect : function( language ) {
onSelect: function( language ) {
var languageName = $.uls.data.getAutonym( language );
$( '.uls-trigger' ).text( languageName );
i18n.locale = language;
@@ -41,7 +41,7 @@
this.i18n();
$( '.navbar' ).i18n();
},
quickList: [ 'en', 'hi', 'he', 'ml', 'ta', 'fr' ]
quickList: ['en', 'hi', 'he', 'ml', 'ta', 'fr']
} );
} );
</script>
@@ -52,7 +52,7 @@
<span class="active uls-trigger">Select Language</span>
<h1 data-i18n="uls-example-title">Universal Language Selector</h1>
<p>
Demonstration of jquery plugin
Demonstration of jQuery plugin
</p>
</div>
<div class="container"></div>

View File

@@ -13,7 +13,7 @@
<!-- <link rel="shortcut icon" href="/favicon.ico"/> -->
<!-- <link rel="apple-touch-icon" href="/apple-touch-icon.png"/> -->
<!-- <meta name="description" content=""/> -->
<meta name="author" content="Santhosh Thottingal"/>
<meta name="author" content="Santhosh Thottingal, Pau Giner"/>
<link href="../css/jquery.uls.css" rel="stylesheet"/>
<link href="../css/jquery.uls.grid.css" rel="stylesheet"/>
<link href="../css/jquery.uls.lcd.css" rel="stylesheet"/>
@@ -30,19 +30,19 @@
<script src="../src/jquery.uls.regionfilter.js"></script>
<script src="../src/jquery.uls.core.js"></script>
<script>
$( document ).ready( function() {
$( document ).ready( function () {
$( '.uls-trigger' ).uls( {
onSelect : function( language ) {
onSelect: function( language ) {
var languageName = $.uls.data.getAutonym( language );
$( '.uls-trigger' ).text( languageName );
},
quickList: ['en', 'hi', 'he', 'ml', 'ta','fr'] //FIXME
quickList: ['en', 'hi', 'he', 'ml', 'ta', 'fr'] //FIXME
} );
$('.uls-trigger').click(function() {
$( '.uls-trigger' ).click( function () {
//Hacks I need to make afterwards. ULS API should be probably modified to allow optional classes and not force position:
$('.uls-menu').removeClass('uls-wide');
$('.uls-menu').addClass('uls-mobile');
$('.uls-menu').css('left',"2.5%")
$( '.uls-menu' ).removeClass( 'uls-wide' );
$( '.uls-menu' ).addClass( 'uls-mobile' );
$( '.uls-menu' ).css( 'left', '2.5%' )
});
} );
</script>
@@ -53,7 +53,7 @@
<span class="active uls-trigger">Select Language</span>
<h1>Universal Language Selector</h1>
<p>
Demonstration of jquery plugin
Demonstration of jQuery plugin
</p>
</div>
<div class="container"></div>

View File

@@ -35,7 +35,7 @@
var languageName = $.uls.data.getAutonym( language );
$( '.uls-trigger' ).text( languageName );
},
quickList: ['en', 'hi', 'he', 'ml', 'ta','fr'] //FIXME
quickList: ['en', 'hi', 'he', 'ml', 'ta', 'fr'] //FIXME
} );
} );
</script>
@@ -46,7 +46,7 @@
<span class="active uls-trigger">Select Language</span>
<h1>Universal Language Selector</h1>
<p>
Demonstration of jquery plugin
Demonstration of jQuery plugin
</p>
</div>
<div class="container"></div>