Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.

Commit 5183574

Browse files
author
swilliams
committed
dist bump
1 parent bb8dee7 commit 5183574

File tree

6 files changed

+25
-15
lines changed

6 files changed

+25
-15
lines changed

dist/css/fuelux.css

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/fuelux.min.css

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/fuelux.zip

349 Bytes
Binary file not shown.

dist/js/fuelux.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*!
2-
* Fuel UX v3.15.2
2+
* Fuel UX EDGE - Built 2016/05/04, 2:39:47 PM
3+
* Previous release: v3.15.2
34
* Copyright 2012-2016 ExactTarget
45
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
56
*/
@@ -2263,7 +2264,7 @@
22632264

22642265
this.$button = this.$element.find( 'button' );
22652266
this.$input = this.$element.find( 'input' );
2266-
this.$icon = this.$element.find( '.glyphicon' );
2267+
this.$icon = this.$element.find( '.glyphicon, .fuelux-icon' );
22672268

22682269
this.$button.on( 'click.fu.search', $.proxy( this.buttonclicked, this ) );
22692270
this.$input.on( 'keyup.fu.search', $.proxy( this.keypress, this ) );
@@ -2296,6 +2297,9 @@
22962297
if ( this.$icon.hasClass( 'glyphicon' ) ) {
22972298
this.$icon.removeClass( 'glyphicon-search' ).addClass( 'glyphicon-remove' );
22982299
}
2300+
if ( this.$icon.hasClass( 'fuelux-icon' ) ) {
2301+
this.$icon.removeClass( 'fuelux-icon-search' ).addClass( 'fuelux-icon-remove' );
2302+
}
22992303

23002304
this.activeSearch = searchText;
23012305
this.$element.addClass( 'searched pending' );
@@ -2306,6 +2310,9 @@
23062310
if ( this.$icon.hasClass( 'glyphicon' ) ) {
23072311
this.$icon.removeClass( 'glyphicon-remove' ).addClass( 'glyphicon-search' );
23082312
}
2313+
if ( this.$icon.hasClass( 'fuelux-icon' ) ) {
2314+
this.$icon.removeClass( 'fuelux-icon-remove' ).addClass( 'fuelux-icon-search' );
2315+
}
23092316

23102317
if ( this.$element.hasClass( 'pending' ) ) {
23112318
this.$element.trigger( 'canceled.fu.search' );

dist/js/fuelux.min.js

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/templates/handlebars/fuelux/repeater.hbs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<input type="search" class="form-control" placeholder="Search"/>
88
<span class="input-group-btn">
99
<button class="btn btn-default" type="button">
10-
<span class="glyphicon glyphicon-search"></span>
10+
<span class="{{#unless mctheme}}glyphicon glyphicon-search{{else}}fuelux-icon fuelux-icon-search{{/unless}}"></span>
1111
<span class="sr-only">Search</span>
1212
</button>
1313
</span>
@@ -30,10 +30,10 @@
3030
</div>
3131
<div class="btn-group repeater-views" data-toggle="buttons">
3232
<label class="btn btn-default active">
33-
<input name="repeaterViews" type="radio" value="list"><span class="glyphicon glyphicon-list"></span>
33+
<input name="repeaterViews" type="radio" value="list"><span class="{{#unless mctheme}}glyphicon glyphicon-list{{else}}fuelux-icon fuelux-icon-gridview-list{{/unless}}"></span>
3434
</label>
3535
<label class="btn btn-default">
36-
<input name="repeaterViews" type="radio" value="thumbnail"><span class="glyphicon glyphicon-th"></span>
36+
<input name="repeaterViews" type="radio" value="thumbnail"><span class="{{#unless mctheme}}glyphicon glyphicon-th{{else}}fuelux-icon fuelux-icon-gridview-thumbnail{{/unless}}"></span>
3737
</label>
3838
</div>
3939
</div>
@@ -65,7 +65,7 @@
6565
<div class="repeater-footer-right">
6666
<div class="repeater-pagination">
6767
<button type="button" class="btn btn-default btn-sm repeater-prev">
68-
<span class="glyphicon glyphicon-chevron-left"></span>
68+
<span class="{{#unless mctheme}}glyphicon glyphicon-chevron-left{{else}}fuelux-icon fuelux-icon-chevron-left{{/unless}}"></span>
6969
<span class="sr-only">Previous Page</span>
7070
</button>
7171
<label id="{{pageLabelID}}" class="page-label">{{pageLabel}}</label>
@@ -84,10 +84,10 @@
8484
<input type="text" class="form-control repeater-secondaryPaging" aria-labelledby="{{pageLabelID}}">
8585
<span>of <span class="repeater-pages"></span></span>
8686
<button type="button" class="btn btn-default btn-sm repeater-next">
87-
<span class="glyphicon glyphicon-chevron-right"></span>
87+
<span class="{{#unless mctheme}}glyphicon glyphicon-chevron-right{{else}}fuelux-icon fuelux-icon-chevron-right{{/unless}}"></span>
8888
<span class="sr-only">Next Page</span>
8989
</button>
9090
</div>
9191
</div>
9292
</div>
93-
</div>
93+
</div>

0 commit comments

Comments
 (0)