mirror of
https://github.com/twisterarmy/theme_nin.git
synced 2025-02-06 03:54:29 +00:00
main fixes for group chat
This commit is contained in:
parent
b1a9c6d8ed
commit
04ca83e790
@ -114,7 +114,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
|
|||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
}
|
}
|
||||||
.ion:before, .userMenu li.userMenu-config > a:before, .modal-header span:before, .prompt-wrapper .modal-header span:before, .mini-profile .post-area .modal-header span:before, .prompt-wrapper .switch-mode:before, .mini-profile .post-area.display .switch-mode:before, .bitmessage-ctc:before, .tox-ctc:before, .profile-modal .profile-tox:before, .profile-modal .profile-bitmessage:before, .post-retransmited-icon:before, .post-interactions span:before, .post-stats li.stat-count:before, ul.userMenu-search-profiles button:before, ul.userMenu-search-profiles .show-more-followers:before, .mini-profile-indicators .userMenu-connections a:before, .mini-profile-indicators .userMenu-messages a:before, .mini-profile-indicators .userMenu-user a:before, .twister-user-remove:before, .refresh-toptrends:before, .twistday-reminder .refresh:before, .refresh-users:before, .view-all-users:before, .ion-after:after, .isFollowing:after, .direct-messages-list .post:after {
|
.ion:before, .userMenu li.userMenu-config > a:before, .modal-header span:before, .prompt-wrapper .modal-header span:before, .mini-profile .post-area .modal-header span:before, .prompt-wrapper .switch-mode:before, .mini-profile .post-area.display .switch-mode:before, .bitmessage-ctc:before, .tox-ctc:before, .profile-modal .profile-tox:before, .profile-modal .profile-bitmessage:before, .post-retransmited-icon:before, .post-interactions span:before, .post-stats li.stat-count:before, ul.userMenu-search-profiles button:before, ul.userMenu-search-profiles .show-more-followers:before, .mini-profile-indicators .userMenu-connections a:before, .mini-profile-indicators .userMenu-messages a:before, .mini-profile-indicators .userMenu-user a:before, .mini-profile-indicators .userMenu-groupmessages a:before, .twister-user-remove:before, .refresh-toptrends:before, .twistday-reminder .refresh:before, .refresh-users:before, .view-all-users:before, .ion-after:after, .isFollowing:after, .direct-messages-list .post:after {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
font-family: "Ionicons";
|
font-family: "Ionicons";
|
||||||
speak: none;
|
speak: none;
|
||||||
@ -128,11 +128,11 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
|
|||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ion:before, .userMenu li.userMenu-config > a:before, .modal-header span:before, .prompt-wrapper .modal-header span:before, .mini-profile .post-area .modal-header span:before, .prompt-wrapper .switch-mode:before, .mini-profile .post-area.display .switch-mode:before, .bitmessage-ctc:before, .tox-ctc:before, .profile-modal .profile-tox:before, .profile-modal .profile-bitmessage:before, .post-retransmited-icon:before, .post-interactions span:before, .post-stats li.stat-count:before, ul.userMenu-search-profiles button:before, ul.userMenu-search-profiles .show-more-followers:before, .mini-profile-indicators .userMenu-connections a:before, .mini-profile-indicators .userMenu-messages a:before, .mini-profile-indicators .userMenu-user a:before, .twister-user-remove:before, .refresh-toptrends:before, .twistday-reminder .refresh:before, .refresh-users:before, .view-all-users:before {
|
.ion:before, .userMenu li.userMenu-config > a:before, .modal-header span:before, .prompt-wrapper .modal-header span:before, .mini-profile .post-area .modal-header span:before, .prompt-wrapper .switch-mode:before, .mini-profile .post-area.display .switch-mode:before, .bitmessage-ctc:before, .tox-ctc:before, .profile-modal .profile-tox:before, .profile-modal .profile-bitmessage:before, .post-retransmited-icon:before, .post-interactions span:before, .post-stats li.stat-count:before, ul.userMenu-search-profiles button:before, ul.userMenu-search-profiles .show-more-followers:before, .mini-profile-indicators .userMenu-connections a:before, .mini-profile-indicators .userMenu-messages a:before, .mini-profile-indicators .userMenu-user a:before, .mini-profile-indicators .userMenu-groupmessages a:before, .twister-user-remove:before, .refresh-toptrends:before, .twistday-reminder .refresh:before, .refresh-users:before, .view-all-users:before {
|
||||||
padding: 0 3px;
|
padding: 0 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ion:after, .userMenu li.userMenu-config > a:after, .modal-header span:after, .prompt-wrapper .modal-header span:after, .mini-profile .post-area .modal-header span:after, .prompt-wrapper .switch-mode:after, .mini-profile .post-area.display .switch-mode:after, .bitmessage-ctc:after, .tox-ctc:after, .profile-modal .profile-tox:after, .profile-modal .profile-bitmessage:after, .post-retransmited-icon:after, .post-interactions span:after, .post-stats li.stat-count:after, ul.userMenu-search-profiles button:after, ul.userMenu-search-profiles .show-more-followers:after, .mini-profile-indicators .userMenu-connections a:after, .mini-profile-indicators .userMenu-messages a:after, .mini-profile-indicators .userMenu-user a:after, .twister-user-remove:after, .refresh-toptrends:after, .twistday-reminder .refresh:after, .refresh-users:after, .view-all-users:after, .ion-after:before, .isFollowing:before, .direct-messages-list .post:before {
|
.ion:after, .userMenu li.userMenu-config > a:after, .modal-header span:after, .prompt-wrapper .modal-header span:after, .mini-profile .post-area .modal-header span:after, .prompt-wrapper .switch-mode:after, .mini-profile .post-area.display .switch-mode:after, .bitmessage-ctc:after, .tox-ctc:after, .profile-modal .profile-tox:after, .profile-modal .profile-bitmessage:after, .post-retransmited-icon:after, .post-interactions span:after, .post-stats li.stat-count:after, ul.userMenu-search-profiles button:after, ul.userMenu-search-profiles .show-more-followers:after, .mini-profile-indicators .userMenu-connections a:after, .mini-profile-indicators .userMenu-messages a:after, .mini-profile-indicators .userMenu-user a:after, .mini-profile-indicators .userMenu-groupmessages a:after, .twister-user-remove:after, .refresh-toptrends:after, .twistday-reminder .refresh:after, .refresh-users:after, .view-all-users:after, .ion-after:before, .isFollowing:before, .direct-messages-list .post:before {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -216,6 +216,10 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
|
|||||||
content: "";
|
content: "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ion-android-contacts:before, .mini-profile-indicators .userMenu-groupmessages a:before {
|
||||||
|
content: "";
|
||||||
|
}
|
||||||
|
|
||||||
/* FONTS */
|
/* FONTS */
|
||||||
* {
|
* {
|
||||||
outline: none !important;
|
outline: none !important;
|
||||||
@ -235,7 +239,7 @@ html, body {
|
|||||||
html {
|
html {
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
background-color: #ddd;
|
background-color: #ddd;
|
||||||
background-image: url('../img/bg.png?1440120416');
|
background-image: url('../img/bg.png?1442060298');
|
||||||
background-attachment: fixed;
|
background-attachment: fixed;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -438,7 +442,7 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
|
|||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
width: 1200px;
|
width: 1200px;
|
||||||
margin: auto;
|
margin: auto;
|
||||||
background: url('../img/logo.png?1440120416') no-repeat 50% 50%;
|
background: url('../img/logo.png?1442060298') no-repeat 50% 50%;
|
||||||
background-size: 20px;
|
background-size: 20px;
|
||||||
}
|
}
|
||||||
.userMenu > ul li {
|
.userMenu > ul li {
|
||||||
@ -1633,6 +1637,77 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
|
|||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.group-messages-join-group .modal-content {
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
.group-messages-join-group button, .group-messages-join-group .show-more-followers {
|
||||||
|
margin: 5px 0;
|
||||||
|
}
|
||||||
|
.group-messages-join-group .label {
|
||||||
|
font-weight: 700;
|
||||||
|
padding: 5px 0;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
.group-messages-join-group input {
|
||||||
|
padding: 3px;
|
||||||
|
width: 100%;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.groupMessages button, .groupMessages .show-more-followers {
|
||||||
|
margin: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-messages-new-group {
|
||||||
|
text-align: center !important;
|
||||||
|
}
|
||||||
|
.group-messages-new-group .label {
|
||||||
|
font-weight: 700;
|
||||||
|
padding: 5px 1%;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
.group-messages-new-group textarea.description, .group-messages-new-group textarea.invite {
|
||||||
|
width: 98%;
|
||||||
|
margin: 5px auto;
|
||||||
|
padding: 5px;
|
||||||
|
text-align: left;
|
||||||
|
border: 1px solid #ebebeb;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-messages-control {
|
||||||
|
text-align: left !important;
|
||||||
|
}
|
||||||
|
.group-messages-control button, .group-messages-control .show-more-followers {
|
||||||
|
margin: 3px 0 3px 3px;
|
||||||
|
}
|
||||||
|
.group-messages-control textarea {
|
||||||
|
width: 98%;
|
||||||
|
margin: 5px auto;
|
||||||
|
padding: 5px;
|
||||||
|
text-align: left;
|
||||||
|
border: 1px solid #ebebeb;
|
||||||
|
}
|
||||||
|
.group-messages-control .invite-form {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.group-messages-control div.profile-bio {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
|
.group-messages-control .secret-key {
|
||||||
|
display: none;
|
||||||
|
font-size: 10px;
|
||||||
|
padding: 5px;
|
||||||
|
margin: 3px;
|
||||||
|
cursor: pointer;
|
||||||
|
border: 1px solid #ebebeb;
|
||||||
|
color: #3E3C42;
|
||||||
|
background: #F8F8F8;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
.group-messages-control .secret-key:hover {
|
||||||
|
background: white;
|
||||||
|
}
|
||||||
|
|
||||||
.forEdition.profile-card {
|
.forEdition.profile-card {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
background: none;
|
background: none;
|
||||||
|
@ -90,6 +90,11 @@ function reOrganizeTemplates() { // for nin's templating
|
|||||||
$('.userMenu-search-profiles button').html('+').attr('title',polyglot.t('Follow'));
|
$('.userMenu-search-profiles button').html('+').attr('title',polyglot.t('Follow'));
|
||||||
$('.mini-profile-actions span').html('');
|
$('.mini-profile-actions span').html('');
|
||||||
|
|
||||||
|
//group chat
|
||||||
|
$('button.invite').html('invite');
|
||||||
|
$('button.leave').html('leave');
|
||||||
|
$('.secret-key').attr('title', 'copy secret key');
|
||||||
|
|
||||||
//re-organizes
|
//re-organizes
|
||||||
$('.promoted-posts-only').detach().appendTo($('.left .mini-profile'));
|
$('.promoted-posts-only').detach().appendTo($('.left .mini-profile'));
|
||||||
$('.mini-profile .open-following-page').parent('li').detach().appendTo($('.mini-profile-indicators'));
|
$('.mini-profile .open-following-page').parent('li').detach().appendTo($('.mini-profile-indicators'));
|
||||||
|
@ -146,4 +146,7 @@
|
|||||||
content: "\f21f"
|
content: "\f21f"
|
||||||
|
|
||||||
.ion-right:after
|
.ion-right:after
|
||||||
content: "\f125"
|
content: "\f125"
|
||||||
|
|
||||||
|
.ion-android-contacts:before
|
||||||
|
content: "\f2d9"
|
67
sass/layout/_groupchat.sass
Normal file
67
sass/layout/_groupchat.sass
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
// group messages
|
||||||
|
|
||||||
|
|
||||||
|
.group-messages-join-group
|
||||||
|
.modal-content
|
||||||
|
padding: 20px
|
||||||
|
button
|
||||||
|
margin: 5px 0
|
||||||
|
.label
|
||||||
|
font-weight: 700
|
||||||
|
padding: 5px 0
|
||||||
|
text-align: left
|
||||||
|
input
|
||||||
|
padding: 3px
|
||||||
|
width: 100%
|
||||||
|
margin-bottom: 10px
|
||||||
|
|
||||||
|
.groupMessages
|
||||||
|
button
|
||||||
|
margin: 5px
|
||||||
|
|
||||||
|
// new group
|
||||||
|
.group-messages-new-group
|
||||||
|
text-align: center!important
|
||||||
|
.label
|
||||||
|
font-weight: 700
|
||||||
|
padding: 5px 1%
|
||||||
|
text-align: left
|
||||||
|
textarea
|
||||||
|
&.description, &.invite
|
||||||
|
width: 98%
|
||||||
|
margin: 5px auto
|
||||||
|
padding: 5px
|
||||||
|
text-align: left
|
||||||
|
border: 1px solid darken( #F8F8F8 , 5%)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// messages control
|
||||||
|
.group-messages-control
|
||||||
|
text-align: left!important
|
||||||
|
button
|
||||||
|
margin: 3px 0 3px 3px
|
||||||
|
textarea
|
||||||
|
width: 98%
|
||||||
|
margin: 5px auto
|
||||||
|
padding: 5px
|
||||||
|
text-align: left
|
||||||
|
border: 1px solid darken( #F8F8F8 , 5%)
|
||||||
|
.invite-form
|
||||||
|
display: none
|
||||||
|
div.profile-bio
|
||||||
|
margin-left: 0
|
||||||
|
|
||||||
|
.secret-key
|
||||||
|
display: none
|
||||||
|
font-size: 10px
|
||||||
|
padding: 5px
|
||||||
|
margin: 3px
|
||||||
|
cursor: pointer
|
||||||
|
border: 1px solid darken( #F8F8F8 , 5%)
|
||||||
|
color: $dark-grey
|
||||||
|
background: #F8F8F8
|
||||||
|
overflow: hidden
|
||||||
|
&:hover
|
||||||
|
background: white
|
@ -16,6 +16,7 @@
|
|||||||
@import 'layout/_modal'
|
@import 'layout/_modal'
|
||||||
@import 'layout/_profile'
|
@import 'layout/_profile'
|
||||||
@import 'layout/_postboard'
|
@import 'layout/_postboard'
|
||||||
|
@import 'layout/_groupchat'
|
||||||
|
|
||||||
// pages
|
// pages
|
||||||
|
|
||||||
@ -223,7 +224,9 @@ ul.userMenu-search-profiles
|
|||||||
.userMenu-user a
|
.userMenu-user a
|
||||||
@extend .ion-profile
|
@extend .ion-profile
|
||||||
@extend .ion
|
@extend .ion
|
||||||
|
.userMenu-groupmessages a
|
||||||
|
@extend .ion-android-contacts
|
||||||
|
@extend .ion
|
||||||
.messages-qtd
|
.messages-qtd
|
||||||
position: absolute
|
position: absolute
|
||||||
top: 5px
|
top: 5px
|
||||||
|
Loading…
x
Reference in New Issue
Block a user