Skip to content

Commit e5805ea

Browse files
thierrycthierryc
committed
Double colon in badge color fix, issue pikock#46 
1 parent c66a801 commit e5805ea

2 files changed

Lines changed: 124 additions & 124 deletions

File tree

‎3.0/app/less/variables.json‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[
2-
{
2+
{
33
"name" : "Grays",
44
"data": [
55
{ "key":"@gray-darker", "value":"#222222", "type": "color"},
@@ -9,8 +9,8 @@
99
{ "key":"@gray-lighter", "value":"#eeeeee", "type": "color"}
1010
]
1111
},
12-
13-
{
12+
13+
{
1414
"name" : "Brand Colors",
1515
"data": [
1616
{ "key":"@brand-primary", "value":"#428bca", "type": "color"},
@@ -21,7 +21,7 @@
2121
]
2222
},
2323

24-
{
24+
{
2525
"name" : "Scaffolding",
2626
"data": [
2727
{ "key":"@body-bg", "value":"#fff", "type": "color"},
@@ -48,8 +48,8 @@
4848
{"key":"@component-active-bg", "value":"@brand-primary", "type": "text"}
4949
]
5050
},
51-
52-
{
51+
52+
{
5353
"name" : "Typography",
5454
"data": [
5555

@@ -62,19 +62,19 @@
6262
{"key":"@font-size-base", "value":"14px", "type": "text"},
6363
{"key":"@font-size-large", "value":"ceil(@font-size-base * 1.25)", "type": "text"},
6464
{"key":"@font-size-small", "value":"ceil(@font-size-base * 0.85)", "type": "text"},
65-
66-
{"key":"@line-height-base", "value":"1.428571429", "type": "text"},
65+
66+
{"key":"@line-height-base", "value":"1.428571429", "type": "text"},
6767
{"key":"@line-height-computed", "value":"floor(@font-size-base * @line-height-base)", "type": "text"},
6868

69-
{"key":"@headings-font-family", "value":"@font-family-base", "type": "text"},
70-
{"key":"@headings-font-weight", "value":"500", "type": "text"},
69+
{"key":"@headings-font-family", "value":"@font-family-base", "type": "text"},
70+
{"key":"@headings-font-weight", "value":"500", "type": "text"},
7171
{"key":"@headings-line-height", "value":"1.1", "type": "text"}
72-
73-
]
74-
72+
73+
]
74+
7575
},
76-
77-
{
76+
77+
{
7878
"name" : "Buttons",
7979
"data":[
8080

@@ -108,16 +108,16 @@
108108
{"key":"@btn-link-disabled-color", "value":"@gray-light", "type":"color"}
109109

110110
]
111-
111+
112112
},
113-
114-
{
113+
114+
{
115115
"name" : "Dropdowns",
116116
"data": [
117117
{"key":"@dropdown-bg", "value":"#fff", "type": "color"},
118118
{"key":"@dropdown-border", "value":"rgba(0,0,0,.15)", "type": "text"},
119119
{"key":"@dropdown-divider-bg", "value":"#e5e5e5", "type": "color"},
120-
120+
121121
{"key":"@dropdown-link-active-color", "value":"#fff", "type": "color"},
122122
{"key":"@dropdown-link-active-bg", "value":"@component-active-bg", "type": "color"},
123123

@@ -129,11 +129,11 @@
129129
{"key":"@dropdown-header-color", "value":"@gray-light", "type": "color"},
130130
{"key":"@dropdown-caret-color", "value":"#000", "type": "color"}
131131

132-
]
132+
]
133133

134134
},
135135

136-
{
136+
{
137137
"name" : "Forms",
138138
"data": [
139139
{"key":"@input-bg", "value":"#fff", "type": "color"},
@@ -144,7 +144,7 @@
144144
{"key":"@input-border-radius", "value":"@border-radius-base", "type": "text"},
145145

146146
{"key":"@input-color-placeholder", "value":"@gray-light", "type": "color"},
147-
147+
148148
{"key":"@input-height-base", "value":"(@line-height-computed + (@padding-base-vertical * 2) + 2)", "type": "text"},
149149
{"key":"@input-height-large", "value":"(floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2)", "type": "text"},
150150
{"key":"@input-height-small", "value":"(floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2)", "type": "text"},
@@ -156,10 +156,10 @@
156156
{"key":"@input-group-addon-border-color", "value":"@input-border", "type": "color"}
157157

158158
]
159-
159+
160160
},
161-
162-
{
161+
162+
{
163163
"name" : "Table",
164164
"data": [
165165
{"key":"@table-cell-padding", "value":"8px", "type": "text"},
@@ -169,20 +169,20 @@
169169
{"key":"@table-condensed-cell-padding", "value":"5px", "type": "text"},
170170

171171
{"key":"@table-bg","value":"transparent", "type": "color"},
172-
{"key":"@table-bg-accent","value":"#f9f9f9", "type": "color"},
172+
{"key":"@table-bg-accent","value":"#f9f9f9", "type": "color"},
173173
{"key":"@table-bg-hover","value":"#f5f5f5", "type": "color"},
174174
{"key":"@table-bg-active","value":"@table-bg-hover", "type": "color"},
175175

176176
{"key":"@table-border-color","value":"#ddd", "type": "color"}
177-
177+
178178
]
179-
179+
180180
},
181-
182-
{
181+
182+
{
183183
"name" : "Navbar",
184184
"data": [
185-
185+
186186
{"key":"@navbar-height","value": "50px", "type":"text"},
187187
{"key":"@navbar-margin-bottom", "value" :"@line-height-computed", "type":"color"},
188188
{"key":"@navbar-default-color", "value" :"#777", "type":"color"},
@@ -192,7 +192,7 @@
192192
{"key":"@navbar-padding-horizontal", "value" :"floor(@grid-gutter-width / 2)", "type":"text"},
193193
{"key":"@navbar-padding-vertical","value":"((@navbar-height - @line-height-computed) / 2)", "type":"text"},
194194

195-
195+
196196
{"key":"@navbar-default-link-color", "value":"#777", "type":"color"},
197197
{"key":"@navbar-default-link-hover-color", "value":"#333", "type":"color"},
198198
{"key":"@navbar-default-link-hover-bg", "value":"transparent", "type":"color"},
@@ -201,21 +201,21 @@
201201
{"key":"@navbar-default-link-disabled-color", "value":" #ccc", "type":"color"},
202202
{"key":"@navbar-default-link-disabled-bg", "value":"transparent", "type":"color"},
203203

204-
204+
205205
{"key":"@navbar-default-brand-color", "value":"@navbar-default-link-color", "type":"color"},
206206
{"key":"@navbar-default-brand-hover-color", "value":"darken(@navbar-default-link-color, 10%)", "type":"color"},
207207
{"key":"@navbar-default-brand-hover-bg", "value":"transparent", "type":"color"},
208208

209-
209+
210210
{"key":"@navbar-default-toggle-hover-bg", "value":"#ddd", "type":"color"},
211211
{"key":"@navbar-default-toggle-icon-bar-bg", "value":"#ccc", "type":"color"},
212212
{"key":"@navbar-default-toggle-border-color", "value":"#ddd", "type":"color"}
213-
213+
214214
]
215-
215+
216216
},
217-
218-
{
217+
218+
{
219219
"name" : "Navs Tabs",
220220
"data": [
221221

@@ -243,16 +243,16 @@
243243

244244
},
245245

246-
{
246+
{
247247
"name" : "Jumbotron",
248248
"data": [
249249
{"key":"@jumbotron-padding", "value":"30px", "type": "text"},
250250
{"key":"@jumbotron-color", "value":"inherit", "type": "color"},
251251
{"key":"@jumbotron-bg", "value":"@gray-lighter", "type": "color"} ]
252252

253253
},
254-
255-
{
254+
255+
{
256256
"name" : "Pagination",
257257
"data": [
258258
{"key":"@pagination-bg", "value":"#fff", "type": "color"},
@@ -271,29 +271,29 @@
271271

272272
},
273273

274-
{
274+
{
275275
"name" : "Form States",
276276
"data": [
277277
{"key":"@state-warning-text", "value":"#c09853", "type": "color"},
278278
{"key":"@state-warning-bg", "value":"#fcf8e3", "type": "color"},
279279
{"key":"@state-warning-border", "value":"darken(spin(@state-warning-bg, -10), 3%)", "type": "color"},
280-
280+
281281
{"key":"@state-danger-text", "value":"#b94a48", "type": "color"},
282282
{"key":"@state-danger-bg", "value":"#f2dede", "type": "color"},
283283
{"key":"@state-danger-border", "value":"darken(spin(@state-danger-bg, -10), 3%)", "type": "color"},
284-
284+
285285
{"key":"@state-success-text", "value":"#468847", "type": "color"},
286286
{"key":"@state-success-bg", "value":"#dff0d8", "type": "color"},
287287
{"key":"@state-success-border", "value":"darken(spin(@state-success-bg, -10), 5%)", "type": "color"},
288-
288+
289289
{"key":"@state-info-text", "value":"#3a87ad", "type": "color"},
290290
{"key":"@state-info-bg", "value":"#d9edf7", "type": "color"},
291291
{"key":"@state-info-border", "value":"darken(spin(@state-info-bg, -10), 7%)", "type": "color"}
292292

293293
]
294294
},
295-
296-
{
295+
296+
{
297297
"name" : "ToolTip",
298298
"data": [
299299
{"key":"@tooltip-max-width", "value":"200px", "type": "text"},
@@ -302,18 +302,18 @@
302302

303303
{"key":"@tooltip-arrow-width", "value":"5px", "type": "text"},
304304
{"key":"@tooltip-arrow-color", "value":"@tooltip-bg", "type": "color"}
305-
]
306-
305+
]
306+
307307
},
308-
309-
{
308+
309+
{
310310
"name" : "Popover",
311311
"data":[
312312
{"key":"@popover-bg", "value":"#fff", "type": "color"},
313313
{"key":"@popover-max-width", "value":"276px", "type": "text"},
314314
{"key":"@popover-border-color", "value":"rgba(0,0,0,.2)", "type": "color"},
315315
{"key":"@popover-fallback-border-color", "value":"#ccc", "type": "color"},
316-
316+
317317
{"key":"@popover-title-bg", "value":"darken(@popover-bg, 3%)", "type": "color"},
318318

319319
{"key":"@popover-arrow-width", "value":"10px", "type": "text"},
@@ -323,35 +323,35 @@
323323
{"key":"@popover-arrow-outer-color", "value":"rgba(0,0,0,.25)", "type": "color"},
324324
{"key":"@popover-arrow-outer-fallback-color", "value":"#999", "type": "color"}
325325
]
326-
},
326+
},
327327

328-
{
328+
{
329329
"name" : "List Group",
330330
"data":[
331331
{"key":"@list-group-bg", "value":"#fff", "type": "color"},
332332
{"key":"@list-group-border", "value":"#ddd", "type": "color"},
333333
{"key":"@list-group-border-radius", "value":"@border-radius-base", "type": "text"},
334-
334+
335335
{"key":"@list-group-hover-bg", "value":"#f5f5f5", "type": "color"},
336336
{"key":"@list-group-active-color", "value":"#fff", "type": "color"},
337337
{"key":"@list-group-active-bg", "value":"@component-active-bg", "type": "color"},
338338
{"key":"@list-group-active-border", "value":"@list-group-active-bg", "type": "color"},
339-
339+
340340
{"key":"@list-group-link-color", "value":"#555", "type": "color"},
341341
{"key":"@list-group-link-heading-color", "value":"#333", "type": "color"}
342342
]
343343
},
344344

345-
{
345+
{
346346
"name" : "Sprites",
347347
"data":[
348348

349349
{"key":"@icon-font-path", "value":"'../app/fonts/'", "type": "text"},
350350
{"key":"@icon-font-name", "value":"glyphicons-halflings-regular", "type": "text"}
351351
]
352352
},
353-
354-
{
353+
354+
{
355355
"name" : "Private",
356356
"data": [
357357

@@ -493,7 +493,7 @@
493493

494494
{"key":"@well-bg", "value":"#f5f5f5", "type": "color"},
495495

496-
{"key":"@badge-color:", "value":"#fff", "type": "color"},
496+
{"key":"@badge-color", "value":"#fff", "type": "color"},
497497
{"key":"@badge-link-hover-color", "value":"#fff", "type": "color"},
498498
{"key":"@badge-bg", "value":"@gray-light", "type": "color"},
499499

@@ -550,4 +550,4 @@
550550
]
551551
}
552552

553-
]
553+
]

0 commit comments

Comments
 (0)