logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 08393b8580385d2627da2ebd9e3a09455d101a3a
parent: c8d25eab61450340039374f0ffc4b2388825714b
Author: Roger Braun <roger@rogerbraun.net>
Date:   Fri, 25 Nov 2016 13:42:33 +0100

Fix word wrapping on Firefox.

Also, move some css around.

See https://bugzilla.mozilla.org/show_bug.cgi?id=1136818 for the word
wrapping stuff.

Diffstat:

Msrc/App.scss28++--------------------------
Msrc/components/status/status.vue24++++++++++++++++++++++++
2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/App.scss b/src/App.scss @@ -145,10 +145,6 @@ status.ng-enter.ng-enter-active { } -.media-body { - flex: 1 -} - #content { margin: auto; max-width: 920px; @@ -163,34 +159,14 @@ status.ng-enter.ng-enter-active { padding-left: 0.3em; } -.status .avatar { - width: 48px; -} - -.status.compact .avatar { - width: 32px; -} - -.status { - padding: 0.5em; - padding-right: 1em; - border-bottom: 1px solid silver; -} - -.status-el:last-child .status { - border: none +.container > * { + min-width: 0px; } [ng-click] { cursor: pointer; } -.status-el p { - margin: 0; - margin-top: 0.2em; - margin-bottom: 0.5em; -} - .user-info { padding: 1em; img { diff --git a/src/components/status/status.vue b/src/components/status/status.vue @@ -71,6 +71,12 @@ margin-top: 3px; margin-bottom: 3px; } + + p { + margin: 0; + margin-top: 0.2em; + margin-bottom: 0.5em; + } } .status-actions { @@ -80,4 +86,22 @@ .icon-reply:hover { color: $blue; } + + .status .avatar { + width: 48px; + } + + .status.compact .avatar { + width: 32px; + } + + .status { + padding: 0.5em; + padding-right: 1em; + border-bottom: 1px solid silver; + } + + .status-el:last-child .status { + border: none + } </style>