nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6057 from AugierLe42e/drawer-fix

Browse source 
Fixed variable drawer width
This commit is contained in:
Steffen van Bergerem 2015-06-05 00:19:52 +02:00
commit 0a0c3f48f2
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -23,6 +23,7 @@ Ruby 2.0 is no longer officially supported.
* Improve bookmarklet [#5904](https://github.com/diaspora/diaspora/pull/5904) * Improve bookmarklet [#5904](https://github.com/diaspora/diaspora/pull/5904)
* Update listen configuration to listen on unix sockets by default [#5974](https://github.com/diaspora/diaspora/pull/5974) * Update listen configuration to listen on unix sockets by default [#5974](https://github.com/diaspora/diaspora/pull/5974)
* Port to Bootstrap 3 [#6015](https://github.com/diaspora/diaspora/pull/6015) * Port to Bootstrap 3 [#6015](https://github.com/diaspora/diaspora/pull/6015)
* Use a fixed width for the mobile drawer [#6057](https://github.com/diaspora/diaspora/pull/6057)
## Bug fixes ## Bug fixes
* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852) * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

16
app/assets/stylesheets/mobile/header.scss
View file

@ -1,5 +1,8 @@
/* This file contains the CSS code corresponding to the header and the drawer (including the menu) of the mobile version */ /* This file contains the CSS code corresponding to the header and the drawer (including the menu) of the mobile version */
$drawer-width: 400px;
$drawer-width-offset: $drawer-width + 50px;
header { header {
position: fixed; position: fixed;
height: 45px; height: 45px;
@ -60,7 +63,11 @@ header {
position: fixed; position: fixed;
top: 0; top: 0;
bottom: 0; bottom: 0;
width: 100%; width: $drawer-width;
@media (max-width: $drawer-width-offset) {
width: 100%;
.avatar{ display: none; }
}
left: 100%; left: 100%;
background-color: #444; background-color: #444;
box-shadow: none; box-shadow: none;
@ -72,13 +79,15 @@ header {
#global_search { #global_search {
position: relative; position: relative;
@media (max-width: $drawer-width-offset) { width: 80%; }
form { form {
position: absolute; position: absolute;
left: 0; left: 0;
right: 22%; right: 22%;
padding: 0 15px; padding: 0 15px;
width: 450px; width: 100%;
input { input {
box-shadow: 0 1px 1px #444; box-shadow: 0 1px 1px #444;
@ -167,5 +176,6 @@ header {
/* This class is added when the user open the drawer */ /* This class is added when the user open the drawer */
#app.draw > * { #app.draw > * {
transform: translateX(-80%); transform: translateX(-$drawer-width);
@media (max-width: $drawer-width-offset) { transform: translateX(-80%); }
} }