From c8f69dba1990093944c39324b7db425bcf18c84c Mon Sep 17 00:00:00 2001 From: Brian Chance Date: Wed, 25 Jan 2017 14:52:58 -0600 Subject: [PATCH 1/2] fix(spinner-class): add glyphicon to default spinner class, update css. Fixes #1893. --- src/common.css | 9 +-------- src/common.js | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/common.css b/src/common.css index 0b18b2572..aa2eb136d 100644 --- a/src/common.css +++ b/src/common.css @@ -317,17 +317,10 @@ body > .ui-select-bootstrap.open { } /* Spinner */ -.ui-select-refreshing { +.ui-select-refreshing.glyphicon { position: absolute; right: 0; padding: 8px 27px; - top: 1px; - display: inline-block; - font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; - line-height: 1; - -webkit-font-smoothing:antialiased; } @-webkit-keyframes ui-select-spin { diff --git a/src/common.js b/src/common.js index ba7023424..454c426bc 100644 --- a/src/common.js +++ b/src/common.js @@ -108,7 +108,7 @@ var uis = angular.module('ui.select', []) }, appendToBody: false, spinnerEnabled: false, - spinnerClass: 'glyphicon-refresh ui-select-spin', + spinnerClass: 'glyphicon glyphicon-refresh ui-select-spin', backspaceReset: true }) From 2d62e0b2b9e5a33ba4a9fb2b4f7e3c2e342ce99a Mon Sep 17 00:00:00 2001 From: Brian Chance Date: Thu, 26 Jan 2017 07:31:59 -0600 Subject: [PATCH 2/2] fix(select-spinner): fix spec test --- test/select.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/select.spec.js b/test/select.spec.js index 8c1cf44c7..1c5a50334 100644 --- a/test/select.spec.js +++ b/test/select.spec.js @@ -3189,7 +3189,7 @@ describe('ui-select tests', function() { it('should have a default value of glyphicon-refresh ui-select-spin', function () { var control = createUiSelect(); - expect(control.scope().$select.spinnerClass).toEqual('glyphicon-refresh ui-select-spin'); + expect(control.scope().$select.spinnerClass).toEqual('glyphicon glyphicon-refresh ui-select-spin'); }); it('should have set a custom class value of randomclass', function () {