Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Commit 3e25a48

Browse files
authored
Merge pull request #1894 from brianchance/master
fix(spinner-class): add glyphicon to default spinner class, update css
2 parents af42092 + 2d62e0b commit 3e25a48

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

src/common.css

+1-8
Original file line numberDiff line numberDiff line change
@@ -317,17 +317,10 @@ body > .ui-select-bootstrap.open {
317317
}
318318

319319
/* Spinner */
320-
.ui-select-refreshing {
320+
.ui-select-refreshing.glyphicon {
321321
position: absolute;
322322
right: 0;
323323
padding: 8px 27px;
324-
top: 1px;
325-
display: inline-block;
326-
font-family: 'Glyphicons Halflings';
327-
font-style: normal;
328-
font-weight: normal;
329-
line-height: 1;
330-
-webkit-font-smoothing:antialiased;
331324
}
332325

333326
@-webkit-keyframes ui-select-spin {

src/common.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ var uis = angular.module('ui.select', [])
108108
},
109109
appendToBody: false,
110110
spinnerEnabled: false,
111-
spinnerClass: 'glyphicon-refresh ui-select-spin',
111+
spinnerClass: 'glyphicon glyphicon-refresh ui-select-spin',
112112
backspaceReset: true
113113
})
114114

test/select.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3141,7 +3141,7 @@ describe('ui-select tests', function() {
31413141

31423142
it('should have a default value of glyphicon-refresh ui-select-spin', function () {
31433143
var control = createUiSelect();
3144-
expect(control.scope().$select.spinnerClass).toEqual('glyphicon-refresh ui-select-spin');
3144+
expect(control.scope().$select.spinnerClass).toEqual('glyphicon glyphicon-refresh ui-select-spin');
31453145
});
31463146

31473147
it('should have set a custom class value of randomclass', function () {

0 commit comments

Comments
 (0)