Skip to content

Commit 0d4c618

Browse files
committed
fixed #content
1 parent a44590f commit 0d4c618

3 files changed

Lines changed: 3 additions & 42 deletions

File tree

dist/assets/css/main.css

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,7 @@ body.padTop53 {
106106
top: 53px;
107107
}
108108
#content {
109-
margin-left: 100px;
110-
}
111-
.side-right #content {
112-
margin-left: 0;
113-
margin-right: 100px;
109+
overflow: hidden;
114110
}
115111
#left {
116112
margin-bottom: -10px;
@@ -129,29 +125,12 @@ body.padTop53 {
129125
.mini-sidebar #left #menu.affix {
130126
width: 100px;
131127
}
132-
#content {
133-
margin-left: 220px;
134-
}
135-
.side-right #content {
136-
margin-right: 220px;
137-
}
138-
.mini-sidebar #content {
139-
margin-left: 100px;
140-
}
141-
.mini-sidebar.side-right #content {
142-
margin-left: 0;
143-
margin-right: 100px;
144-
}
145128
}
146129
@media (min-width: 768px) {
147130
.hide-sidebar #left,
148131
.hide-sidebar #right {
149132
display: none;
150133
}
151-
.hide-sidebar #content {
152-
margin: 0 !important;
153-
width: 100% !important;
154-
}
155134
}
156135
@media (min-width: 1200px) {
157136
body.fixed #wrap,

dist/assets/css/main.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.

src/assets/less/main/layout/layout.less

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ rgba(255,255,255,.05) inset;
5757
}
5858
}
5959
#content {
60-
margin-left: @miniSidebarWidth;
61-
.side-right & {
62-
margin-left: 0;
63-
margin-right: @miniSidebarWidth;
64-
}
60+
overflow: hidden;
6561
}
6662
#left {
6763
margin-bottom: -10px;
@@ -76,25 +72,11 @@ rgba(255,255,255,.05) inset;
7672
#menu.affix{width: @miniSidebarWidth;}
7773
}
7874
}
79-
#content {
80-
margin-left: @SidebarWidth;
81-
.side-right & {
82-
margin-right: @SidebarWidth;
83-
}
84-
.mini-sidebar &{
85-
margin-left: @miniSidebarWidth;
86-
}
87-
.mini-sidebar.side-right & {
88-
margin-left: 0;
89-
margin-right: @miniSidebarWidth;
90-
}
91-
}
9275
}
9376

9477
@media (min-width: @screen-tablet) {
9578
.hide-sidebar {
9679
#left, #right {display: none;}
97-
#content {margin:0 !important; width: 100% !important;}
9880
}
9981
}
10082

0 commit comments

Comments
 (0)