Skip to content

Commit a44590f

Browse files
committed
fixed #content
1 parent 4bc30cc commit a44590f

5 files changed

Lines changed: 36 additions & 23 deletions

File tree

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ module.exports = function (grunt) {
7777
assemble: {
7878
// Task-level options
7979
options: {
80-
flattern: true,
80+
flatten: true,
8181
postprocess: require('pretty'),
8282
assets: 'dist/assets',
8383
data: 'src/data/*.{json,yml}',

dist/assets/css/main.css

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ body.padTop53 {
7878
position: relative;
7979
float: left;
8080
}
81+
.side-right #left {
82+
float: right;
83+
}
8184
#left #menu.affix {
8285
position: fixed;
8386
top: 0;
@@ -89,16 +92,19 @@ body.padTop53 {
8992
#left #menu.affix:hover {
9093
overflow-y: scroll;
9194
}
95+
#left #menu.affix li > ul {
96+
position: relative;
97+
width: auto;
98+
left: auto;
99+
top: auto;
100+
}
92101
#left #menu.affix > li:last-child > a:last-child {
93102
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.05), 0 1px 0 rgba(255, 255, 255, 0.05) inset;
94103
border-bottom: 1px solid rgba(0, 0, 0, 0.3);
95104
}
96105
body.padTop53 #left #menu.affix {
97106
top: 53px;
98107
}
99-
.side-right #left {
100-
float: right;
101-
}
102108
#content {
103109
margin-left: 100px;
104110
}
@@ -648,8 +654,8 @@ body.padTop53 {
648654
}
649655
/* BEGIN CONTENT STYLES */
650656
#content {
651-
-webkit-transition: margin 0.4s;
652-
transition: margin 0.4s;
657+
-webkit-transition: width 0.4s;
658+
transition: width 0.4s;
653659
}
654660
.outer {
655661
padding: 10px;

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/general/content.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* BEGIN CONTENT STYLES */
22

33
#content {
4-
.transition(margin .4s);
4+
.transition(width .4s);
55
}
66

77

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

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,37 @@ body.padTop53 {
2525

2626

2727
@media (min-width: @screen-tablet) {
28-
#left {
29-
width: @miniSidebarWidth;
30-
position: relative;
31-
#menu.affix{
28+
#left {
29+
30+
width: @miniSidebarWidth;
31+
position: relative;
32+
float: left;
33+
.side-right & {float:right;}
34+
35+
#menu.affix{
3236
position: fixed;
3337
top:0;
3438
width: @miniSidebarWidth;
3539
overflow-x:hidden;
3640
overflow-y:hidden;
3741
-webkit-overflow-scrolling: touch;
3842
&:hover {overflow-y:scroll;}
43+
44+
li > ul {
45+
position: relative;
46+
width: auto;
47+
left:auto;
48+
top:auto;
49+
}
50+
3951
> li:last-child > a:last-child {
40-
box-shadow: 0 1px 0 rgba(255,255,255,.05), 0 1px 0 rgba(255,255,255,.05) inset;
41-
border-bottom: 1px solid rgba(0,0,0,.3);
42-
}
43-
body.padTop53 & {
44-
top:53px;
52+
box-shadow: 0 1px 0 rgba(255,255,255,.05), 0 1px 0
53+
rgba(255,255,255,.05) inset;
54+
border-bottom: 1px solid rgba(0,0,0,.3);
4555
}
46-
}
47-
float: left;
48-
.side-right & {
49-
float:right;
50-
}
51-
}
56+
body.padTop53 & {top:53px;}
57+
}
58+
}
5259
#content {
5360
margin-left: @miniSidebarWidth;
5461
.side-right & {

0 commit comments

Comments
 (0)