Commit 7bcf464c authored by Steffen van Bergerem's avatar Steffen van Bergerem
Browse files

Merge pull request #6435 from Flaburgan/publisher-xsmall-cancel 

Hide publisher cancel button on xsmall screens
parents 2569c480 97a5a5cb

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure. 
* Override Bootstrap list group design [#6345](https://github.com/diaspora/diaspora/6345)

* Clean up publisher code [#6336](https://github.com/diaspora/diaspora/6336)

* Port conversations to new design [#6431](https://github.com/diaspora/diaspora/pull/6431)

* Hide cancel button in publisher on small screens [#6435](https://github.com/diaspora/diaspora/pull/6435)



## Bug fixes

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

app/assets/stylesheets/publisher.scss

+0 −9
Original line number Diff line number Diff line
@@ -48,15 +48,6 @@ 
        }

      }



      $sm-xs-average: ($screen-sm + $screen-xs) / 2;

      @media(max-width: $sm-xs-average) {

        #hide_publisher {

          display: block;

          width: 100%;

          margin-bottom: 5px;

        }

      }



      @media(max-width: $screen-xs) {

        .btn-toolbar {

          width: 100%;

app/views/publisher/_publisher.html.haml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
          .spinner

      .options_and_submit.col-sm-12

        .public_toggle.clearfix

          .btn.btn-default.pull-left#hide_publisher{title: t("shared.publisher.discard_post")}

          .btn.btn-default.pull-left.hidden-xs#hide_publisher{title: t("shared.publisher.discard_post")}

            %span.text= t("cancel")



          .btn-toolbar.pull-right