nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Dennis Schubert 2017-01-15 00:11:18 +01:00
commit 00193a8866
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -20,6 +20,7 @@
* Prevent scroll to top when clicking 'mark all as read' in the notification dropdown [#7253](https://github.com/diaspora/diaspora/pull/7253) * Prevent scroll to top when clicking 'mark all as read' in the notification dropdown [#7253](https://github.com/diaspora/diaspora/pull/7253)
* Update existing notifications in dropdown on fetch [#7270](https://github.com/diaspora/diaspora/pull/7270) * Update existing notifications in dropdown on fetch [#7270](https://github.com/diaspora/diaspora/pull/7270)
* Fix link to post on mobile photo page [#7274](https://github.com/diaspora/diaspora/pull/7274) * Fix link to post on mobile photo page [#7274](https://github.com/diaspora/diaspora/pull/7274)
* Fix some background issues on dark mobile themes [#7278](https://github.com/diaspora/diaspora/pull/7278)
## Features ## Features
* Add links to the aspects and followed tags pages on mobile [#7265](https://github.com/diaspora/diaspora/pull/7265) * Add links to the aspects and followed tags pages on mobile [#7265](https://github.com/diaspora/diaspora/pull/7265)

2
app/assets/stylesheets/color_themes/dark/mobile.scss
View file

@ -43,6 +43,8 @@ body {
.stream-element.unread { background-color: $gray; } .stream-element.unread { background-color: $gray; }
.stream-element.read { background-color: $gray-darker; } .stream-element.read { background-color: $gray-darker; }
#show_content .photo { border-color: $border-grey; }
.header-full-width { border-bottom: 1px solid $border-grey; } .header-full-width { border-bottom: 1px solid $border-grey; }
.user_aspects { .user_aspects {

6
app/assets/stylesheets/mobile/mobile.scss
View file

@ -281,7 +281,7 @@ footer {
.photo { .photo {
text-align: center; text-align: center;
background-color: #FFFFFF; background-color: $framed-background;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
@ -733,7 +733,7 @@ select#aspect_ids_ {
#publisher_textarea_wrapper { #publisher_textarea_wrapper {
border-radius: 2px; border-radius: 2px;
margin: 12px 0px; margin: 12px 0px;
background: #fff; background: $framed-background;
position: relative; position: relative;
padding-right: 10px; padding-right: 10px;
@ -766,7 +766,7 @@ select#aspect_ids_ {
&.with_attachments { &.with_attachments {
padding-bottom: 55px; padding-bottom: 55px;
border: 1px solid #CCCCCC; border: 1px solid $border-medium-grey;
} }
#photodropzone { #photodropzone {