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

Merge pull request #5672 from svbergerem/bootstrap-stream-improvements

Browse source 
Bootstrap stream: add spinner and improve comment box
This commit is contained in:
Jonne Haß 2015-02-16 12:59:41 +01:00
commit 3149ab7125
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/comments.css.scss
View file

@ -36,7 +36,13 @@
} }
padding-left: 12px; padding-left: 12px;
width: 95%; width: 95%;
display: none;
}
.comment_box {
width: 95%;
height: 30px;
}
.comment_box:focus, .comment_box:valid {
& + .submit_button { display: block; }
} }
.comment_box { width: 95%; }
.comment_box:focus, .comment_box:valid { min-height: 100px; }
} }

3
app/assets/stylesheets/new-templates.css.scss
View file

@ -14,6 +14,7 @@
@import 'new_styles/base'; @import 'new_styles/base';
@import 'new_styles/buttons'; @import 'new_styles/buttons';
@import 'new_styles/interactions'; @import 'new_styles/interactions';
@import 'new_styles/spinner';
/* font overrides */ /* font overrides */
@import 'new_styles/typography'; @import 'new_styles/typography';
@ -79,4 +80,4 @@
@import 'new_styles/code'; @import 'new_styles/code';
/* statistics */ /* statistics */
@import 'new_styles/statistics' @import 'new_styles/statistics'

9
app/assets/stylesheets/new_styles/_interactions.scss
View file

@ -2,13 +2,20 @@
.controls { .controls {
z-index: 6; z-index: 6;
float: right; float: right;
.comment_report { .post_report, .comment_report {
display: inline-block; display: inline-block;
.icons-report { .icons-report {
height: 14px; height: 14px;
width: 14px; width: 14px;
} }
} }
.block_user {
display: inline-block;
.icons-ignoreuser {
height: 14px;
width: 14px;
}
}
.delete { .delete {
display: inline-block; display: inline-block;
.icons-deletelabel { .icons-deletelabel {