Skip to content

Commit a2fcc39

Browse files
committed
Merge branch 'release/1.0.0'
2 parents 83d006f + e5b9f3c commit a2fcc39

File tree

19 files changed

+562
-571
lines changed

19 files changed

+562
-571
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ django admin theme base on adminlte
1313

1414
adminlte version: 2.3.6
1515

16+
# helper
17+
18+
- if you have good ideas, just contact me.
19+
- if you find some bug, just add an issue.
20+
- if you think this project is good, just star and fork, make it better 🍉.
21+
1622
# install
1723

1824
```

adminlteui/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = '1.0.0b2'
1+
version = '1.0.0'

adminlteui/static/admin/dist/css/app.css

Lines changed: 36 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ ul.timelist, .timelist li {
289289
background-color: #fff;
290290
border: 1px solid #ccc;
291291
margin-left: 0 !important;
292-
293292
}
294293

295294
.selector .selector-filter label,
@@ -408,80 +407,41 @@ a.active.selector-clearall:focus, a.active.selector-clearall:hover {
408407
background-position: 0 -144px;
409408
}
410409

411-
/* STACKED SELECTORS */
412-
413-
/*.stacked {*/
414-
/*float: left;*/
415-
/*width: 490px;*/
416-
/*}*/
417-
418-
/*.stacked select {*/
419-
/*width: 480px;*/
420-
/*height: 10.1em;*/
421-
/*}*/
422-
423-
/*.stacked .selector-available, .stacked .selector-chosen {*/
424-
/*width: 480px;*/
425-
/*}*/
426-
427-
/*.stacked .selector-available {*/
428-
/*margin-bottom: 0;*/
429-
/*}*/
430-
431-
/*.stacked .selector-available input {*/
432-
/*width: 422px;*/
433-
/*}*/
434-
435-
/*.stacked ul.selector-chooser {*/
436-
/*height: 22px;*/
437-
/*width: 50px;*/
438-
/*margin: 0 0 10px 40%;*/
439-
/*background-color: #eee;*/
440-
/*border-radius: 10px;*/
441-
/*}*/
442-
443-
/*.stacked .selector-chooser li {*/
444-
/*float: left;*/
445-
/*padding: 3px 3px 3px 5px;*/
446-
/*}*/
447-
448-
/*.stacked .selector-chooseall, .stacked .selector-clearall {*/
449-
/*display: none;*/
450-
/*}*/
451-
452-
/*.stacked .selector-add {*/
453-
/*background: url(../img/selector-icons.svg) 0 -32px no-repeat;*/
454-
/*cursor: default;*/
455-
/*}*/
456-
457-
/*.stacked .active.selector-add {*/
458-
/*background-position: 0 -48px;*/
459-
/*cursor: pointer;*/
460-
/*}*/
461-
462-
/*.stacked .selector-remove {*/
463-
/*background: url(../img/selector-icons.svg) 0 0 no-repeat;*/
464-
/*cursor: default;*/
465-
/*}*/
466-
467-
/*.stacked .active.selector-remove {*/
468-
/*background-position: 0 -16px;*/
469-
/*cursor: pointer;*/
470-
/*}*/
471-
472-
/*.selector .help-icon {*/
473-
/*background: url(../img/icon-unknown.svg) 0 0 no-repeat;*/
474-
/*display: inline-block;*/
475-
/*vertical-align: middle;*/
476-
/*margin: -2px 0 0 2px;*/
477-
/*width: 13px;*/
478-
/*height: 13px;*/
479-
/*}*/
480-
481-
/*.selector .selector-chosen .help-icon {*/
482-
/*background: url(../img/icon-unknown-alt.svg) 0 0 no-repeat;*/
483-
/*}*/
484-
485410
.selector .search-label-icon {
486411
height: 0;
487-
}
412+
}
413+
414+
.empty-form {
415+
display: none;
416+
}
417+
418+
input[type="number"], input[type="password"] {
419+
width: auto;
420+
height: 34px;
421+
padding: 6px 12px;
422+
font-size: 14px;
423+
line-height: 1.42857143;
424+
color: #555;
425+
background-color: #fff;
426+
border: 1px solid #ccc;
427+
}
428+
429+
input[type="password"] {
430+
width: 100%;
431+
}
432+
433+
434+
input[type="checkbox"] {
435+
width: auto;
436+
height: 26px;
437+
padding: 6px 12px;
438+
font-size: 14px;
439+
line-height: 1.42857143;
440+
color: #555;
441+
background-color: #fff;
442+
border: 1px solid #ccc;
443+
}
444+
445+
.control-label {
446+
margin-top: 7px;
447+
}

adminlteui/static/admin/dist/img/default-log.svg

Lines changed: 23 additions & 0 deletions
Loading

adminlteui/static/admin/dist/img/search.svg

Lines changed: 0 additions & 3 deletions
This file was deleted.

adminlteui/static/admin/dist/js/pages/dashboard.js

Lines changed: 0 additions & 210 deletions
This file was deleted.

0 commit comments

Comments
 (0)