Skip to content

Commit 2b834fb

Browse files
byfarzinbyfarzin
committed
Dashboard improved, sidebar issues fixed.
1 parent 0e223b6 commit 2b834fb

File tree

9 files changed

+149
-248
lines changed

9 files changed

+149
-248
lines changed

‎BlogEngine/BlogEngine.NET/Content/toastr.css‎

Lines changed: 38 additions & 185 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BlogEngine/BlogEngine.NET/admin/app/controllers/dashboard.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,11 @@
159159
}
160160

161161
$scope.load();
162+
163+
164+
$(document).ready(function () {
165+
bindCommon();
166+
});
162167
}]);
163168

164169
var newDraft = {

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/01.main.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ img { max-width: 100%; }
66
label { font-weight: normal; }
77
input[type=checkbox] { position: relative; top: 2px; }
88
.checkbox input[type=checkbox] { position: relative; top: 1px; }
9-
.text-ellipsis { display: block; overflow: hidden; white-space: nowrap; max-width: 350px; -ms-text-overflow: ellipsis; -o-text-overflow: ellipsis; text-overflow: ellipsis; }
9+
.text-ellipsis { display: block; overflow: hidden; white-space: nowrap; -ms-text-overflow: ellipsis; -o-text-overflow: ellipsis; text-overflow: ellipsis; }
1010
.text-ellipsis-sm { max-width: 100px !important; text-align: center !important; margin: 0 auto; }
1111
.loading { display: inline-block; }
1212
.loaded { display: none; }
@@ -34,7 +34,7 @@ h1, h2, h3, h4, h5, h6 { font-weight: 500; }
3434
.sidebar-active .overlay-wrapper { content: ""; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.30); position: absolute; top: 0; left: 0; z-index: 101; }
3535
.sidebar-active .nav-toggle { left: 240px; }
3636

37-
.sidebar-logo { height: 41px; position: absolute; bottom: 30px; left: 0; width: 100%; text-align: center; overflow: hidden; -moz-transition: all ease 0.5s; -o-transition: all ease 0.5s; -webkit-transition: all ease 0.5s; transition: all ease 0.5s; }
37+
.sidebar-logo { height: 41px; position: absolute; bottom: 30px; left: 0; width: 100%; text-align: center; overflow: hidden; }
3838
.sidebar-logo a { display: inline-block; height: 100%; outline: none !important; }
3939
.sidebar-active .sidebar-logo { width: 100%; }
4040

@@ -47,3 +47,7 @@ h1, h2, h3, h4, h5, h6 { font-weight: 500; }
4747
.row { margin-right: -10px; margin-left: -10px; }
4848
.col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-sm-1, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-xs-1, .col-xs-10, .col-xs-11, .col-xs-12, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9 { padding-right: 10px; padding-left: 10px; }
4949
}
50+
51+
@media screen and (max-height:620px) {
52+
.sidebar-logo {display:none;}
53+
}

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/02.nav.css‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*[user-nav]*/
2-
.user-nav { height: 60px; position: relative; padding: 15px; padding-left: 60px; border-bottom: 1px solid #272c35; }
2+
.user-nav { width:230px; height: 60px; position: relative; padding: 15px; padding-left: 60px; border-bottom: 1px solid #272c35; }
33
.user-nav img { width: 30px; height: 30px; position: absolute; left: 15px; top: 15px; }
44
.user-nav .user-nav-info { text-transform: uppercase; }
55
.user-nav .user-nav-info .user-nav-name { height: 15px; line-height: 12px; font-size: 12px; }
@@ -9,9 +9,8 @@
99
.user-nav .user-nav-info ul li a { font-size: 10px; }
1010
.user-nav .user-nav-info ul li a i { display: none; }
1111

12-
1312
/*[primary-nav]*/
14-
.nav-primary { list-style: none; padding: 0; margin: 0; }
13+
.nav-primary { width:230px; list-style: none; padding: 0; margin: 0; }
1514
.nav-primary > li { position: relative; }
1615
.nav-primary > li > .fa-icon { position: absolute; z-index: 5; font-size: 14px; left: 15px; top: 15px; width: 30px; height: 20px; line-height: 20px; color: #909bae; text-align: center; }
1716
.nav-primary > li > a { outline: none !important; text-transform: uppercase; cursor: pointer; z-index: 6; position: relative; line-height: 48px; height: 50px; padding-left: 60px; display: block; }

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/03.header.css‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,30 @@
88
.page-header .dropdown { margin-left: 15px; }
99
.page-header .btn-group { margin-right: 15px; }
1010
.page-header .btn-group .btn { padding: 0; width: 50px; margin: 0px 1px 0 0; font-size: 14px; }
11+
.page-header .btn-group .btn i {font-size:14px;}
12+
1113

1214
.page-header .dropdown-menu { background: #546683; width: 180px; }
1315
.page-header .dropdown-menu li a { color: #fff; cursor: pointer; }
1416
.page-header .dropdown-menu li:hover a { color: #fff; background: #687994; }
1517
.page-header .btn-default.active,
1618
.page-header .btn-default:active,
17-
.page-header .open > .dropdown-toggle.btn-default { background: #546683 !important; box-shadow:none; color: #fff; }
19+
.page-header .open > .dropdown-toggle.btn-default { background: #546683 !important; box-shadow: none; color: #fff; }
20+
21+
.page-header .icon-header-trash {margin-left:10px; cursor:pointer; width: 30px; height: 30px;display:block; text-align:center; position:relative;}
22+
.page-header .icon-header-trash i { width:100%; height:100%; display:block; line-height:30px; font-size:23px; color:#687994;}
23+
.page-header .icon-header-trash:hover i {color:#da4453}
24+
.page-header .icon-header-trash span {display:block; position:absolute; top:-1px; right:-1px; width:16px; height:16px; line-height:14px; background:#da4453; color:#fff; font-size:10px; border-radius:100%; }
25+
.page-header .icon-header-trash:hover span {display:none;}
26+
27+
28+
.page-header .icon-header-logs {cursor:pointer; width: 30px; height: 30px; display:block; text-align:center; position:relative;}
29+
.page-header .icon-header-logs i { width:100%; height:100%; display:block; line-height:30px; font-size:23px; color:#687994;}
30+
.page-header .icon-header-logs:hover i {color:#f8ac0e}
31+
.page-header .icon-header-logs span {display:block; position:absolute; top:-1px; right:-1px; width:16px; height:16px; line-height:14px; background:#f8ac0e; color:#fff; font-size:10px; border-radius:100%; }
32+
.page-header .icon-header-logs:hover span {display:none;}
33+
34+
1835

1936
/*[SEARCH]*/
2037
.search { width: 30px; height: 30px; position: relative; margin-top: 0; margin-left: 15px; }

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/04.forms.css‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.content-inner .form-control { border-radius: 0px; }
99
.form-group { margin-bottom: 18px; }
1010
.form-group > label { font-size: 12px; font-weight: 500; color: #666; }
11-
.form-control { box-shadow: none; font-weight: 400; font-size: 13px; height: 40px; padding-left: 10px; border-width: 2px; border-color: #ddd; }
11+
.form-control {-webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; font-weight: 400; font-size: 13px; height: 40px; padding-left: 10px; border-width: 2px; border-color: #ddd; }
1212
.form-control:focus { border-color: #a9b5c8; outline: 0px none; box-shadow: none; }
1313
.panel .form-control { border-width: 1px; }
1414
.input-group .input-group-addon { border-radius: 0; }
@@ -72,7 +72,13 @@
7272
.dropdown-toggle { padding-right: 45px; }
7373
.dropdown-toggle i { position: absolute; font-size: 14px; top: 0; right: 0; width: 30px; line-height: 30px; border-left: 1px solid rgba(0, 0, 0, 0.10); }
7474

75-
75+
/*[]*/
76+
#toast-container > div {opacity:1;}
77+
.toast {border-radius:0 !important; opacity:1;}
78+
.toast-success { background-color: #37bc9b; }
79+
.toast-error { background-color: #da4453; }
80+
.toast-info { background-color: #3bafda; }
81+
.toast-warning { background-color: #f6bb42; }
7682

7783

7884

0 commit comments

Comments
 (0)