diff options
| author | friendica <info@friendica.com> | 2014-10-30 19:29:28 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-30 19:29:28 -0700 |
| commit | 4e454656fea569d5302cbe6d846bd648cb46a1b1 (patch) | |
| tree | da80d6dc28f24e43743bb74dd9632ff523b52c70 /view/css | |
| parent | 28a35261dbc8c21e27ca4a449ff5cd6cb0501c8a (diff) | |
| parent | fbd027709aba1fc3de3bbeede32c65fb26a00b21 (diff) | |
| download | volse-hubzilla-4e454656fea569d5302cbe6d846bd648cb46a1b1.tar.gz volse-hubzilla-4e454656fea569d5302cbe6d846bd648cb46a1b1.tar.bz2 volse-hubzilla-4e454656fea569d5302cbe6d846bd648cb46a1b1.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/css')
| -rw-r--r-- | view/css/conversation.css | 4 | ||||
| -rw-r--r-- | view/css/mod_photos.css | 23 |
2 files changed, 6 insertions, 21 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index 6c9d757b1..1e9930443 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -128,7 +128,7 @@ a.wall-item-name-link { } .wall-item-content img { - max-width: 95%; + max-width: 100%; } .wall-item-title h3 { @@ -262,4 +262,4 @@ a.wall-item-name-link { .item-forged { color: #FF0000; font-size: 1.5em !important; -}
\ No newline at end of file +} diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index ed3e2ac26..3832ea1a6 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -9,8 +9,8 @@ } #photo-photo { - display: table; - margin: 0 auto; + display: table; + margin: 0 auto; } #photo-photo-end { @@ -22,27 +22,12 @@ margin-bottom: 25px; } -#photos-upload-newalbum-div { - float: left; - width: 175px; -} - #photos-upload-noshare { margin-bottom: 10px; } -#photos-upload-existing-album-text { - float: left; - width: 175px; -} -#photos-upload-newalbum { - float: left; -} -#photos-upload-album-select { - float: left; -} - -#photos-upload-spacer { +#photos-upload-spacer, +#photos-upload-new-end { margin-top: 25px; } #photos-upload-new-end, #photos-upload-exist-end { |