gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3233 from vector-im/luke/css-status-bar-icon-positioning 

Reposition certain icons in the status bar
This commit is contained in:
Luke Barnard 2017-02-15 15:56:41 +00:00 committed by GitHub
parent b9dd419d04 bfad7612c6
commit 827692b9b0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/skins/vector/css/matrix-react-sdk/structures/_RoomStatusBar.scss
View File

@ -16,7 +16,7 @@ limitations under the License.
.mx_RoomStatusBar { .mx_RoomStatusBar {
margin-left: 65px; margin-left: 65px;
min-height: 34px; min-height: 50px;
} }
/* position the indicator in the same place horizontally as .mx_EventTile_avatar. */ /* position the indicator in the same place horizontally as .mx_EventTile_avatar. */
@ -24,7 +24,7 @@ limitations under the License.
padding-left: 17px; padding-left: 17px;
padding-right: 12px; padding-right: 12px;
margin-left: -73px; margin-left: -73px;
margin-top: 8px; margin-top: 15px;
float: left; float: left;
width: 24px; width: 24px;
text-align: center; text-align: center;
@ -72,6 +72,7 @@ limitations under the License.
.mx_RoomStatusBar_typingIndicatorAvatars { .mx_RoomStatusBar_typingIndicatorAvatars {
width: 52px; width: 52px;
margin-top: -1px;
text-align: left; text-align: left;
} }
@ -102,6 +103,7 @@ limitations under the License.
.mx_RoomStatusBar_scrollDownIndicator { .mx_RoomStatusBar_scrollDownIndicator {
cursor: pointer; cursor: pointer;
padding-left: 1px;
} }
.mx_RoomStatusBar_unreadMessagesBar { .mx_RoomStatusBar_unreadMessagesBar {
@ -144,7 +146,9 @@ limitations under the License.
} }
.mx_RoomStatusBar_typingBar { .mx_RoomStatusBar_typingBar {
padding-top: 10px; height: 50px;
line-height: 50px;
color: $primary-fg-color; color: $primary-fg-color;
opacity: 0.5; opacity: 0.5;
overflow-y: hidden; overflow-y: hidden;

2
src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
View File

@ -207,10 +207,12 @@ hr.mx_RoomView_myReadMarker {
.mx_RoomView_inCall .mx_RoomView_statusAreaBox_line { .mx_RoomView_inCall .mx_RoomView_statusAreaBox_line {
border-top: 1px hidden; border-top: 1px hidden;
padding-top: 1px;
} }
.mx_RoomView_inCall .mx_MessageComposer_wrapper { .mx_RoomView_inCall .mx_MessageComposer_wrapper {
border-top: 2px hidden; border-top: 2px hidden;
padding-top: 1px;
} }
.mx_RoomView_inCall .mx_RoomView_statusAreaBox { .mx_RoomView_inCall .mx_RoomView_statusAreaBox {