Merge branch 'dev' into 'dev'

fix shared_header img expanding to 100% width when sharing a share

See merge request hubzilla/core!1387
This commit is contained in:
Mario 2018-11-11 13:47:03 +01:00
commit daad607c7c

View File

@ -879,26 +879,25 @@ div.jGrowl div.jGrowl-notification {
.shared_header img { .shared_header img {
border-radius: $radius; border-radius: $radius;
margin-right: 10px; margin-right: 10px;
width: auto;
} }
.tag1 { .tag1 {
font-size : 0.9em !important; font-size : 0.9em !important;
} }
.tag2 { .tag2 {
font-size : 1.0em !important; font-size : 1.0em !important;
} }
.tag3 { .tag3 {
font-size : 1.1em !important; font-size : 1.1em !important;
} }
.tag4 { .tag4 {
font-size : 1.2em !important; font-size : 1.2em !important;
} }
.tag5 { .tag5 {
font-size : 1.3em !important; font-size : 1.3em !important;
} }
@ -918,12 +917,10 @@ div.jGrowl div.jGrowl-notification {
font-size : 1.6em !important; font-size : 1.6em !important;
} }
.tag9 { .tag9 {
font-size : 1.7em !important; font-size : 1.7em !important;
} }
.tag10 { .tag10 {
font-size : 1.8em !important; font-size : 1.8em !important;
} }