Skip to content

Commit f357117

Browse files
committed
Merge pull request hakanersu#13 from shehi/master
Some cleanup for better IDE readability and inspection.
2 parents cda8594 + c008d47 commit f357117

File tree

5 files changed

+67
-74
lines changed

5 files changed

+67
-74
lines changed

src/sass/awesome.theme.sass

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
background: #f3f3f3
55
color: #222
66
margin: 15px
7-
padding-left: 70px
8-
padding-right: 5px
9-
padding-top: 5px
10-
padding-bottom: 5px
11-
font-family: 'Open Sans',Helvetica,Arial
7+
padding: 5px 5px 5px 70px
8+
font-family: 'Open Sans', Helvetica, Arial, sans-serif
129
font-size: 16px
1310
font-weight: 600
1411
box-shadow: 1px 1px 1px #000
15-
12+
1613
.icon
1714
width: 50px
1815
height: 50px
@@ -25,70 +22,70 @@
2522
text-align: center
2623
line-height: 50px
2724
font-size: 22px
28-
25+
2926
p
3027
padding: 0
3128
margin: 0
32-
29+
3330
span
3431
font-weight: 300
35-
32+
3633
&.light
3734
font-size: 13px
3835
display: block
3936
color: #777
4037
&.ok
4138
p.bold
4239
color: #178B13
43-
40+
4441
.icon
4542
background-color: #178B13
4643
color: #fff
47-
44+
4845
&.error
4946
p.bold
5047
color: #D82222
51-
48+
5249
.icon
5350
background-color: #D82222
5451
color: #fff
55-
52+
5653
&.warning
5754
p.bold
5855
color: #9F6000
59-
56+
6057
.icon
6158
background-color: #9F6000
6259
color: #fff
63-
60+
6461
&.yellow
6562
p.bold
6663
color: #CFA846
67-
64+
6865
.icon
6966
background-color: #CFA846
7067
color: #fff
71-
68+
7269
&.blue
7370
p.bold
7471
color: #2980b9
75-
72+
7673
.icon
7774
background-color: #2980b9
7875
color: #fff
79-
76+
8077
&.green
8178
p.bold
8279
color: #27ae60
83-
80+
8481
.icon
8582
background-color: #27ae60
8683
color: #fff
87-
84+
8885
&.purple
8986
p.bold
9087
color: #5B54AA
91-
88+
9289
.icon
9390
background-color: #5B54AA
94-
color: #fff
91+
color: #fff

src/sass/colorful.theme.sass

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,29 @@
11
.amaran.colorful
2-
width: 300px
3-
min-height: 45px
4-
overflow: hidden
5-
background-color: transparent
6-
z-index: 1
7-
8-
.colorful-inner
9-
width: 100%
10-
min-height: 45px
11-
display: block
12-
position: relative
13-
background-color: #484860
14-
padding: 15px 25px 15px 15px
15-
color: #fff
16-
font-size: 14px
17-
border-bottom: 1px solid rgba(0,0,0,0.2)
18-
border-radius: 4px
19-
20-
.amaran-close
21-
color: #fff
22-
z-index: 2
23-
top: 8px
24-
right: 8px
25-
text-align: center
26-
line-height: 18px
27-
2+
width: 300px
3+
min-height: 45px
4+
overflow: hidden
5+
background-color: transparent
6+
z-index: 1
7+
8+
.colorful-inner
9+
width: 100%
10+
min-height: 45px
11+
display: block
12+
position: relative
13+
background-color: #484860
14+
padding: 15px 25px 15px 15px
15+
color: #fff
16+
font-size: 14px
17+
border-bottom: 1px solid rgba(0, 0, 0, 0.2)
18+
border-radius: 4px
19+
20+
.amaran-close
21+
color: #fff
22+
z-index: 2
23+
top: 8px
24+
right: 8px
25+
text-align: center
26+
line-height: 18px
2827

2928
.amaran-wrapper.center .amaran.colorful
30-
margin: 0 auto
31-
32-
33-
34-
35-
36-
37-
38-
29+
margin: 0 auto

src/sass/default.theme.sass

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
background: -ms-linear-gradient(left, #111213, #111213 15%, #1b1e24 15%, #1b1e24)
99
background: linear-gradient(left, #111213, #111213 15%, #1b1e24 15%, #1b1e24)
1010
color: #fff
11-
font-family: 'Open Sans',Helvetica,Arial
11+
font-family: 'Open Sans', Helvetica, Arial, sans-serif
1212
font-size: 13px
1313
font-weight: 300
1414
margin: 5px
15-
border-radius: 0
1615
overflow: hidden
1716
border-bottom: 1px solid #111213
1817
border-radius: 6px
19-
18+
2019
.default-spinner
2120
width: 45px
2221
min-height: 45px
2322
display: block
2423
float: left
2524
position: relative
25+
2626
span
2727
width: 18px
2828
height: 18px
@@ -34,10 +34,13 @@
3434
left: 50%
3535
margin-left: -11px
3636
margin-top: -9px
37+
3738
.default-message
3839
float: left
40+
3941
span
4042
padding: 3px
4143
line-height: 43px
44+
4245
&:after
43-
clear: both
46+
clear: both

src/sass/jquery.amaran.sass

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
@charset "UTF-8"
2+
23
.amaran-wrapper *
34
box-sizing: border-box
4-
5+
56
.amaran-wrapper
67
position: fixed
78
z-index: 9999
89
&.top
910
top: 0
1011
bottom: auto
11-
12+
1213
&.bottom
1314
bottom: 0
1415
top: auto
15-
16+
1617
&.left
1718
left: 0
18-
19+
1920
&.right
2021
right: 0
2122
left: auto
22-
23+
2324
&.center
2425
width: 50%
2526
height: 50%
@@ -32,12 +33,10 @@
3233

3334
.amaran
3435
width: 200px
35-
display: block
3636
background: rgba(0, 0, 0, 0.7)
3737
padding: 3px
3838
color: #fff
3939
border-radius: 4px
40-
margin-top: 5px
4140
display: none
4241
font-size: 13px
4342
cursor: pointer
@@ -46,7 +45,6 @@
4645
min-height: 50px
4746
margin: 10px
4847

49-
5048
.amaran-close
5149
position: absolute
5250
top: 2px
@@ -60,4 +58,4 @@
6058
color: #fff
6159
font-weight: bold
6260
font-family: Arial, sans-serif
63-
font-size: 18px
61+
font-size: 18px

src/sass/user.theme.sass

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
background: #f3f3f3
55
color: #222
66
margin: 15px
7-
font-family: 'Open Sans',Helvetica,Arial
7+
font-family: 'Open Sans', Helvetica, Arial, sans-serif
88
font-size: 13px
99
font-weight: 300
1010
box-shadow: 1px 1px 1px #000
@@ -19,19 +19,23 @@
1919
float: left
2020
img
2121
max-width: 100%
22-
22+
2323
.info
2424
padding-left: 110px
2525
padding-top: 10px
26+
2627
b
2728
display: block
2829
font-size: 16px
30+
2931
&.blue
3032
background: #2773ed
3133
color: #fff
34+
3235
&.yellow
3336
background: #f4b300
3437
color: #fff
38+
3539
&.green
3640
background: #78ba00
37-
color: #fff
41+
color: #fff

0 commit comments

Comments
 (0)