Skip to content

Commit b94b40d

Browse files
committed
bugfix
1 parent 2b64a26 commit b94b40d

File tree

6 files changed

+499
-242
lines changed

6 files changed

+499
-242
lines changed

app/Areas/Admin/Content/css/my-skins/_all-my-skins.css

Lines changed: 241 additions & 119 deletions
Large diffs are not rendered by default.

app/Areas/Admin/Content/css/my-skins/_all-my-skins.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/Areas/Admin/Content/css/my-skins/with-sidebar-horizontal.css

Lines changed: 237 additions & 115 deletions
Large diffs are not rendered by default.

app/Areas/Admin/Content/css/my-skins/with-sidebar-horizontal.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/Areas/Admin/Content/css/my-skins/with-sidebar-horizontal.scss

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
.with-sidebar-horizontal {
1+
.with-sidebar-horizontal,
2+
.with-sidebar-horizontal.fixed {
23
.main-header {
34
& > .logo {
45
border-right: none;
@@ -16,7 +17,7 @@
1617
min-height: 44px;
1718
height: 44px;
1819

19-
& > .sidebar {
20+
.sidebar {
2021
& > .user-panel {
2122
display: none;
2223
}
@@ -119,20 +120,30 @@
119120
}
120121
}
121122

123+
.with-sidebar-horizontal.fixed {
124+
.main-sidebar {
125+
position: fixed;
126+
margin-top: 50px;
127+
}
128+
129+
.content-wrapper {
130+
padding-top: 94px;
131+
}
132+
}
133+
122134
@mixin setSkinForSidebarHorizontal($skinName, $skinColor) {
123135
$hoverColor: darken($skinColor, 5%);
124136
$hoverColorDarken: darken($hoverColor, 5%);
125137

126-
.with-sidebar-horizontal {
138+
.with-sidebar-horizontal,
139+
.with-sidebar-horizontal.fixed {
127140
&.#{$skinName} {
128141
.logo {
129142
background-color: $skinColor;
130143
}
131144
}
132145

133146
&.#{$skinName}-light {
134-
135-
136147
.logo,
137148
.logo:hover {
138149
background-color: #fff;
@@ -163,6 +174,8 @@
163174
}
164175

165176
.sidebar-menu {
177+
background-color: $skinColor;
178+
166179
& > li {
167180

168181
&.header {

app/Areas/Admin/Views/Shared/_Common.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
with-sidebar-horizontal
4949
with-header-light
5050
-->
51-
<body class="fixed hold-transition sidebar-mini skin-red-light with-header-light">
51+
<body class="fixed hold-transition sidebar-mini skin-red-light with-sidebar-horizontal">
5252
@RenderBody()
5353

5454
<script src="~/plugins/jQuery/jquery-2.2.3.min.js"></script>

0 commit comments

Comments
 (0)