Skip to content

Commit b872fa8

Browse files
committed
Synchronized with master branch
Conflicts: .gitignore css/morris/morris.css index.html
2 parents 2ef7d1e + 7de4faa commit b872fa8

File tree

105 files changed

+525
-355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+525
-355
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
bower_components/
2+
*.DS_Store

LICENSE

100644100755
File mode changed.

README.md

100644100755
Lines changed: 3 additions & 2 deletions

ajax/dashboard-boxrefresh-demo.php

100644100755
File mode changed.

css/AdminLTE.css

100644100755
Lines changed: 141 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,300italic,400italic,600italic);
2-
1+
@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);
32
@import url(//fonts.googleapis.com/css?family=Kaushan+Script);
43
/*!
54
* AdminLTE v1.2
@@ -143,7 +142,7 @@ h6,
143142
}
144143
/* All images should be responsive */
145144
img {
146-
max-width: 100%important;
145+
max-width: 100% !important;
147146
}
148147
.sort-highlight {
149148
background: #f4f4f4;
@@ -241,6 +240,9 @@ img {
241240
.text-blue {
242241
color: #0073b7 !important;
243242
}
243+
.text-black {
244+
color: #222222 !important;
245+
}
244246
.text-light-blue {
245247
color: #3c8dbc !important;
246248
}
@@ -316,17 +318,141 @@ img {
316318
.table-striped > tbody > tr:nth-child(odd) > th {
317319
background-color: #f3f4f5;
318320
}
321+
.table.no-border,
322+
.table.no-border td,
323+
.table.no-border th {
324+
border: 0;
325+
}
319326
/* .text-center in tables */
327+
table.text-center,
320328
table.text-center td,
321329
table.text-center th {
322330
text-align: center;
323331
}
332+
.table.align th {
333+
text-align: left;
334+
}
335+
.table.align td {
336+
text-align: right;
337+
}
338+
.text-bold,
339+
.text-bold.table td,
340+
.text-bold.table th {
341+
font-weight: 700;
342+
}
343+
.border-radius-none {
344+
-webkit-border-radius: 0 !important;
345+
-moz-border-radius: 0 !important;
346+
border-radius: 0 !important;
347+
}
324348
/* _fix for sparkline tooltip */
325349
.jqstooltip {
326350
padding: 5px!important;
327351
width: auto!important;
328352
height: auto!important;
329353
}
354+
/*
355+
Gradient Background colors
356+
*/
357+
.bg-teal-gradient {
358+
background: #39cccc !important;
359+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #39cccc), color-stop(1, #7adddd)) !important;
360+
background: -ms-linear-gradient(bottom, #39cccc, #7adddd) !important;
361+
background: -moz-linear-gradient(center bottom, #39cccc 0%, #7adddd 100%) !important;
362+
background: -o-linear-gradient(#7adddd, #39cccc) !important;
363+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7adddd', endColorstr='#39cccc', GradientType=0) !important;
364+
color: #fff;
365+
}
366+
.bg-light-blue-gradient {
367+
background: #3c8dbc !important;
368+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #3c8dbc), color-stop(1, #67a8ce)) !important;
369+
background: -ms-linear-gradient(bottom, #3c8dbc, #67a8ce) !important;
370+
background: -moz-linear-gradient(center bottom, #3c8dbc 0%, #67a8ce 100%) !important;
371+
background: -o-linear-gradient(#67a8ce, #3c8dbc) !important;
372+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#67a8ce', endColorstr='#3c8dbc', GradientType=0) !important;
373+
color: #fff;
374+
}
375+
.bg-blue-gradient {
376+
background: #0073b7 !important;
377+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #0073b7), color-stop(1, #0089db)) !important;
378+
background: -ms-linear-gradient(bottom, #0073b7, #0089db) !important;
379+
background: -moz-linear-gradient(center bottom, #0073b7 0%, #0089db 100%) !important;
380+
background: -o-linear-gradient(#0089db, #0073b7) !important;
381+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0089db', endColorstr='#0073b7', GradientType=0) !important;
382+
color: #fff;
383+
}
384+
.bg-aqua-gradient {
385+
background: #00c0ef !important;
386+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #00c0ef), color-stop(1, #14d1ff)) !important;
387+
background: -ms-linear-gradient(bottom, #00c0ef, #14d1ff) !important;
388+
background: -moz-linear-gradient(center bottom, #00c0ef 0%, #14d1ff 100%) !important;
389+
background: -o-linear-gradient(#14d1ff, #00c0ef) !important;
390+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#14d1ff', endColorstr='#00c0ef', GradientType=0) !important;
391+
color: #fff;
392+
}
393+
.bg-yellow-gradient {
394+
background: #f39c12 !important;
395+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #f39c12), color-stop(1, #f7bc60)) !important;
396+
background: -ms-linear-gradient(bottom, #f39c12, #f7bc60) !important;
397+
background: -moz-linear-gradient(center bottom, #f39c12 0%, #f7bc60 100%) !important;
398+
background: -o-linear-gradient(#f7bc60, #f39c12) !important;
399+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7bc60', endColorstr='#f39c12', GradientType=0) !important;
400+
color: #fff;
401+
}
402+
.bg-purple-gradient {
403+
background: #932ab6 !important;
404+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #932ab6), color-stop(1, #b959d9)) !important;
405+
background: -ms-linear-gradient(bottom, #932ab6, #b959d9) !important;
406+
background: -moz-linear-gradient(center bottom, #932ab6 0%, #b959d9 100%) !important;
407+
background: -o-linear-gradient(#b959d9, #932ab6) !important;
408+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b959d9', endColorstr='#932ab6', GradientType=0) !important;
409+
color: #fff;
410+
}
411+
.bg-green-gradient {
412+
background: #00a65a !important;
413+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #00a65a), color-stop(1, #00ca6d)) !important;
414+
background: -ms-linear-gradient(bottom, #00a65a, #00ca6d) !important;
415+
background: -moz-linear-gradient(center bottom, #00a65a 0%, #00ca6d 100%) !important;
416+
background: -o-linear-gradient(#00ca6d, #00a65a) !important;
417+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ca6d', endColorstr='#00a65a', GradientType=0) !important;
418+
color: #fff;
419+
}
420+
.bg-red-gradient {
421+
background: #f56954 !important;
422+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #f56954), color-stop(1, #f89384)) !important;
423+
background: -ms-linear-gradient(bottom, #f56954, #f89384) !important;
424+
background: -moz-linear-gradient(center bottom, #f56954 0%, #f89384 100%) !important;
425+
background: -o-linear-gradient(#f89384, #f56954) !important;
426+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f89384', endColorstr='#f56954', GradientType=0) !important;
427+
color: #fff;
428+
}
429+
.bg-black-gradient {
430+
background: #222222 !important;
431+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #222222), color-stop(1, #3c3c3c)) !important;
432+
background: -ms-linear-gradient(bottom, #222222, #3c3c3c) !important;
433+
background: -moz-linear-gradient(center bottom, #222222 0%, #3c3c3c 100%) !important;
434+
background: -o-linear-gradient(#3c3c3c, #222222) !important;
435+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3c3c3c', endColorstr='#222222', GradientType=0) !important;
436+
color: #fff;
437+
}
438+
.bg-maroon-gradient {
439+
background: #85144b !important;
440+
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #85144b), color-stop(1, #b11b64)) !important;
441+
background: -ms-linear-gradient(bottom, #85144b, #b11b64) !important;
442+
background: -moz-linear-gradient(center bottom, #85144b 0%, #b11b64 100%) !important;
443+
background: -o-linear-gradient(#b11b64, #85144b) !important;
444+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b11b64', endColorstr='#85144b', GradientType=0) !important;
445+
color: #fff;
446+
}
447+
.connectedSortable {
448+
min-height: 100px;
449+
}
450+
/*---------------------------------------------------
451+
LESS Elements 0.9
452+
---------------------------------------------------
453+
A set of useful LESS mixins
454+
More info at: http://lesselements.com
455+
---------------------------------------------------*/
330456
/*
331457
Components: navbar, logo and content header
332458
-------------------------------------------------
@@ -741,7 +867,6 @@ body > .header .logo .icon {
741867
display: block;
742868
white-space: nowrap;
743869
/* Prevent text from breaking */
744-
745870
border-bottom: 1px solid #f4f4f4;
746871
}
747872
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu > li > a:hover,
@@ -763,11 +888,9 @@ body > .header .logo .icon {
763888
padding: 15px 0px;
764889
margin-right: 5px;
765890
/* Default background and font colors */
766-
767891
background: #00c0ef;
768892
color: #f9f9f9;
769893
/* Fallback for browsers that doesn't support rgba */
770-
771894
color: rgba(255, 255, 255, 0.7);
772895
}
773896
.navbar-nav > .notifications-menu > .dropdown-menu > li .menu > li > a > .glyphicon.danger,
@@ -1297,7 +1420,6 @@ body > .header .logo .icon {
12971420
border-bottom-left-radius: 0;
12981421
border-bottom: 0px solid #f4f4f4;
12991422
color: #444;
1300-
padding-bottom: 10px;
13011423
}
13021424
.box .box-header:before,
13031425
.box .box-header:after {
@@ -1312,14 +1434,14 @@ body > .header .logo .icon {
13121434
.box .box-header > .ion,
13131435
.box .box-header .box-title {
13141436
display: inline-block;
1315-
padding: 10px 0px 10px 10px;
1437+
padding: 10px 10px 10px 10px;
13161438
margin: 0;
13171439
font-size: 20px;
13181440
font-weight: 400;
13191441
float: left;
13201442
cursor: default;
13211443
}
1322-
.box .box-header a:not(.btn) {
1444+
.box .box-header a {
13231445
color: #444;
13241446
}
13251447
.box .box-header > .box-tools {
@@ -1464,7 +1586,7 @@ body > .header .logo .icon {
14641586
.box.box-solid.box-success > .box-header a {
14651587
color: #444;
14661588
}
1467-
.box.box-solid > .box-header > .box-tools > .btn {
1589+
.box.box-solid > .box-header > .box-tools .btn {
14681590
border: 0;
14691591
box-shadow: none;
14701592
}
@@ -1649,6 +1771,7 @@ Component: timeline
16491771
--------------------
16501772
*/
16511773
.timeline {
1774+
position: relative;
16521775
margin: 0 0 30px 0;
16531776
padding: 0;
16541777
list-style: none;
@@ -1660,7 +1783,7 @@ Component: timeline
16601783
bottom: 0;
16611784
width: 5px;
16621785
background: #ddd;
1663-
left: 45px;
1786+
left: 30px;
16641787
border: 1px solid #eee;
16651788
margin: 0;
16661789
-webkit-border-radius: 2px;
@@ -2104,6 +2227,13 @@ Component: timeline
21042227
background: #fff;
21052228
padding: 10px;
21062229
}
2230+
/* Nav tabs bottom */
2231+
.tabs-bottom.nav-3 li a {
2232+
width: 3333.33333333% !important;
2233+
}
2234+
.tabs-bottom li a {
2235+
border: 0;
2236+
}
21072237
/* PAGINATION */
21082238
.pagination > li > a {
21092239
background: #fafafa;

empty.html

100644100755
File mode changed.

fonts/FontAwesome.otf

100644100755
File mode changed.

fonts/fontawesome-webfont.eot

100644100755
File mode changed.

fonts/fontawesome-webfont.svg

100644100755
File mode changed.

fonts/fontawesome-webfont.ttf

100644100755
File mode changed.

0 commit comments

Comments
 (0)