Commit 868a45e3 authored by Dennis Schubert's avatar Dennis Schubert
Browse files

Merge branch 'svbergerem-unify-ui' into develop

parents 936460e8 0f33a7e9

.scss-lint.yml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ linters: 
    enabled: true



  DisableLinterReason:

    enabled: false

    enabled: true



  DuplicateProperty:

    enabled: true

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ Contributions are very welcome, the hard work is done! 
* Replace sidetiq with sidekiq-cron [#6616](https://github.com/diaspora/diaspora/pull/6616)

* Refactor mobile comment section [#6509](https://github.com/diaspora/diaspora/pull/6509)

* Set vertical resize as default for all textareas [#6654](https://github.com/diaspora/diaspora/pull/6654)

* Unifiy max-widths and page layouts [#6675](https://github.com/diaspora/diaspora/pull/6675)



## Bug fixes

* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

app/assets/stylesheets/base.scss

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,13 @@ body { 
  padding: none;

}



.container-fluid { max-width: $screen-lg-min; }



.page-streams,

.page-tags.action-show {

  > .container-fluid { max-width: 100%; }

}



// Overflow

h1,

h2,

app/assets/stylesheets/conversations.scss

+5 −4
Original line number Diff line number Diff line
@@ -191,11 +191,12 @@ 
  }

}



@media (max-width: 1354px) {

  #left_pane #conversation_inbox .pagination ul > li > a {

// We need this to override the Bootstrap pagination style only for the conversations view

// scss-lint:disable SelectorDepth

.conversation-inbox .pagination > li > a {

  padding: 4px 7px;

}

}

// scss-lint:enable SelectorDepth



#new_conversation_pane {

  ul.as-selections { width: 100% !important; }

app/assets/stylesheets/header.scss

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
  }



  @media (max-width: $grid-float-breakpoint-max) {

    .col-lg-10 { padding: 0; }

    .navbar-header > .nav li { display: inline-block !important; }

    .nav-badge {

      color: $navbar-inverse-link-color;