Commit 0a0c3f48 authored by Steffen van Bergerem's avatar Steffen van Bergerem
Browse files

Merge pull request #6057 from AugierLe42e/drawer-fix

Fixed variable drawer width
parents 39fe6bff 7d1bba4e
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Ruby 2.0 is no longer officially supported.
* 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)
* 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
* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
+13 −3
Original line number Diff line number Diff line
/* 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 {
  position: fixed;
  height: 45px;
@@ -60,7 +63,11 @@ header {
  position: fixed;
  top: 0;
  bottom: 0;
  width: $drawer-width;
  @media (max-width: $drawer-width-offset) {
    width: 100%;
    .avatar{ display: none; }
  }
  left: 100%;
  background-color: #444;
  box-shadow: none;
@@ -72,13 +79,15 @@ header {

    #global_search {
      position: relative;
      @media (max-width: $drawer-width-offset) { width: 80%; }

      form {
        position: absolute;
        left: 0;
        right: 22%;
        padding: 0 15px;
        width: 450px;
        width: 100%;


        input {
          box-shadow: 0 1px 1px #444;
@@ -167,5 +176,6 @@ header {

/* This class is added when the user open the drawer */
#app.draw > * {
  transform: translateX(-80%);
  transform: translateX(-$drawer-width);
  @media (max-width: $drawer-width-offset) { transform: translateX(-80%); }
}