Skip to content

Commit 9027ac3

Browse files
author
Becky Sroufe
committed
Revised spinner styling
1 parent 402f137 commit 9027ac3

File tree

4 files changed

+73
-55
lines changed

4 files changed

+73
-55
lines changed

app/app-js/modules/loading/loading.view.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ define(function (require) {
1717
corners: 1,
1818
rotate: 0,
1919
direction: 1,
20-
color: '#fff',
21-
speed: 1, // Rounds per second
22-
trail: 60, // Afterglow percentage
23-
className: 'spinner',
24-
top: '25%'
20+
color: '#007bb6',
21+
speed: 1,
22+
trail: 60,
23+
className: 'spinner'
2524
};
2625

2726
var spinner = new Spinner(opts).spin();

app/less/buttons.less

+46
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,52 @@
22
// Buttons
33
// --------------------------------------------------
44

5+
.btn-gray,
6+
.btn-gray-block,
7+
.btn-action,
8+
.btn-action-block,
9+
.btn-green,
10+
.btn-green-block,
11+
.btn-red,
12+
.btn-red-block,
13+
.btn-yellow,
14+
.btn-yellow-block {
15+
&:extend(.btn all, .btn-md all);
16+
}
17+
18+
.btn-gray-block,
19+
.btn-green-block,
20+
.btn-action-block,
21+
.btn-red-block,
22+
.btn-yellow-block {
23+
&:extend(.btn-block all);
24+
}
25+
26+
.btn-gray,
27+
.btn-gray-block {
28+
&:extend(.btn-default all);
29+
}
30+
31+
.btn-action,
32+
.btn-action-block {
33+
&:extend(.btn-primary all);
34+
}
35+
36+
.btn-green,
37+
.btn-green-block {
38+
&:extend(.btn-success all);
39+
}
40+
41+
.btn-red,
42+
.btn-red-block {
43+
&:extend(.btn-danger all);
44+
}
45+
46+
.btn-yellow,
47+
.btn-yellow-block {
48+
&:extend(.btn-warning all);
49+
}
50+
551
// NOTE: This needs to be revised in accordance with engine-ui
652
.btn-green {
753
// Using bootstrap mixin to bring in other styles, like "disabled"

app/less/loading.less

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
// Loading
22
// --------------------------------------------------
33

4-
.loading-modal {
4+
#loading-region {
55
position: absolute;
66
top: 0;
77
width: 100%;
8-
padding-top: 10%;
98
height: 100%;
10-
background-color: rgba(0,0,0,0.65);
9+
10+
.loading-modal {
11+
position: relative;
12+
margin: 0 auto;
13+
top: 20%;
14+
width: 100px;
15+
height: 100px;
16+
background: rgba(235, 235, 235, 0.5);
17+
18+
.border-radius (@radius: 10px);
19+
}
1120
}

app/less/mixins.less

+11-47
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,6 @@
1-
// Buttons
1+
// Mixins
22
// --------------------------------------------------
33

4-
.btn-gray,
5-
.btn-gray-block,
6-
.btn-action,
7-
.btn-action-block,
8-
.btn-green,
9-
.btn-green-block,
10-
.btn-red,
11-
.btn-red-block,
12-
.btn-yellow,
13-
.btn-yellow-block {
14-
&:extend(.btn all, .btn-md all);
15-
}
16-
17-
.btn-gray-block,
18-
.btn-green-block,
19-
.btn-action-block,
20-
.btn-red-block,
21-
.btn-yellow-block {
22-
&:extend(.btn-block all);
23-
}
24-
25-
.btn-gray,
26-
.btn-gray-block {
27-
&:extend(.btn-default all);
28-
}
29-
30-
.btn-action,
31-
.btn-action-block {
32-
&:extend(.btn-primary all);
33-
}
34-
35-
.btn-green,
36-
.btn-green-block {
37-
&:extend(.btn-success all);
38-
}
39-
40-
.btn-red,
41-
.btn-red-block {
42-
&:extend(.btn-danger all);
43-
}
44-
45-
.btn-yellow,
46-
.btn-yellow-block {
47-
&:extend(.btn-warning all);
48-
}
49-
504
.border-left-radius(@radius) {
515
border-top-left-radius: @radius;
526
border-bottom-left-radius: @radius;
@@ -64,3 +18,13 @@
6418
-webkit-border-top-right-radius: @radius;
6519
-webkit-border-bottom-right-radius: @radius;
6620
}
21+
22+
.border-radius (@radius: 0px) {
23+
-webkit-border-radius: @radius;
24+
-moz-border-radius: @radius;
25+
border-radius: @radius;
26+
27+
-moz-background-clip: padding;
28+
-webkit-background-clip: padding-box;
29+
background-clip: padding-box;
30+
}

0 commit comments

Comments
 (0)