mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-20 08:11:27 +02:00
Code Issues Releases Wiki Activity

Don't allow index pane to be pinned on small screens

Browse Source
This commit is contained in:
Toby Zerner
2015-03-04 12:30:18 +10:30
parent b0802214ee
commit e45449ae37
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/ember/app/styles/flarum/buttons.less
View File

@@ -84,7 +84,6 @@
border-radius: 18px; border-radius: 18px;
} }
.back-button { .back-button {
& .back { & .back {
z-index: 3 !important; // z-index of an active .btn-group .btn is 2 z-index: 3 !important; // z-index of an active .btn-group .btn is 2
@@ -100,6 +99,7 @@
.rotate(45deg); .rotate(45deg);
} }
} }
@media @desktop-hd {
&.active { &.active {
& .back { & .back {
border-radius: @border-radius-base 0 0 @border-radius-base !important; border-radius: @border-radius-base 0 0 @border-radius-base !important;
@@ -109,4 +109,5 @@
margin-left: 1px !important; margin-left: 1px !important;
} }
} }
}
} }

15
framework/core/ember/app/styles/flarum/index.less
View File

@@ -160,13 +160,9 @@
.box-shadow(2px 2px 6px -2px @fl-shadow-color); .box-shadow(2px 2px 6px -2px @fl-shadow-color);
.transition(left 0.2s); .transition(left 0.2s);
&.showing, .with-pane & { &.showing {
left: 0; left: 0;
} }
.with-pane & {
z-index: @zindex-composer - 1;
.transition(none);
}
& .container { & .container {
width: auto; width: auto;
margin: 0; margin: 0;
@@ -196,7 +192,16 @@
} }
} }
} }
}
@media @desktop-hd {
.index-area.paned {
.with-pane & {
left: 0;
z-index: @zindex-composer - 1;
.transition(none);
}
}
// When the pane is pinned, move the other page content inwards // When the pane is pinned, move the other page content inwards
.global-content, .global-footer { .global-content, .global-footer {
.with-pane & { .with-pane & {