Merge pull request #24 from slr/nin-v2

sync with latest commits in 'blaster' of miguelfreitas/twister-html

css/style.css

@@ -114,7 +114,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
   font-weight: normal;
   font-style: normal;
 }
-.ion:before, .userMenu li.userMenu-config > a:before, .modal-header span:before, .prompt-wrapper .modal-header span:before, .direct-messages-thread + .group-messages-control .invite-form .modal-header span:before, .mini-profile .post-area .modal-header span:before, .prompt-wrapper .switch-mode:before, .direct-messages-thread + .group-messages-control .invite-form .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, .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, .mini-profile-indicators .userMenu-collapsePosts 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, .direct-messages-thread + .group-messages-control .invite-form .modal-header span:before, .mini-profile .post-area .modal-header span:before, .prompt-wrapper .switch-mode:before, .direct-messages-thread + .group-messages-control .invite-form .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-rt-icon:before, .post-interactions span:before, .post-stats li.stat-count: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, .mini-profile-indicators .userMenu-collapsePosts 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;
   font-family: "Ionicons";
   speak: none;
@@ -128,11 +128,11 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
   -moz-osx-font-smoothing: grayscale;
 }
 
-.ion:before, .userMenu li.userMenu-config > a:before, .modal-header span:before, .prompt-wrapper .modal-header span:before, .direct-messages-thread + .group-messages-control .invite-form .modal-header span:before, .mini-profile .post-area .modal-header span:before, .prompt-wrapper .switch-mode:before, .direct-messages-thread + .group-messages-control .invite-form .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, .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, .mini-profile-indicators .userMenu-collapsePosts 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, .direct-messages-thread + .group-messages-control .invite-form .modal-header span:before, .mini-profile .post-area .modal-header span:before, .prompt-wrapper .switch-mode:before, .direct-messages-thread + .group-messages-control .invite-form .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-rt-icon:before, .post-interactions span:before, .post-stats li.stat-count: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, .mini-profile-indicators .userMenu-collapsePosts a:before, .twister-user-remove:before, .refresh-toptrends:before, .twistday-reminder .refresh:before, .refresh-users:before, .view-all-users:before {
   padding: 0 3px;
 }
 
-.ion:after, .userMenu li.userMenu-config > a:after, .modal-header span:after, .prompt-wrapper .modal-header span:after, .direct-messages-thread + .group-messages-control .invite-form .modal-header span:after, .mini-profile .post-area .modal-header span:after, .prompt-wrapper .switch-mode:after, .direct-messages-thread + .group-messages-control .invite-form .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, .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, .mini-profile-indicators .userMenu-collapsePosts 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, .direct-messages-thread + .group-messages-control .invite-form .modal-header span:after, .mini-profile .post-area .modal-header span:after, .prompt-wrapper .switch-mode:after, .direct-messages-thread + .group-messages-control .invite-form .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-rt-icon:after, .post-interactions span:after, .post-stats li.stat-count: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, .mini-profile-indicators .userMenu-collapsePosts 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;
 }
 
@@ -148,7 +148,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
   content: "";
 }
 
-.ion-shuffle:before, .prompt-wrapper .switch-mode:before, .direct-messages-thread + .group-messages-control .invite-form .switch-mode:before, .mini-profile .post-area.display .switch-mode:before, .post-retransmited-icon:before, .post-interactions span.post-propagate:before, .post-stats li.stat-count:before, .refresh-toptrends:before, .twistday-reminder .refresh:before, .refresh-users:before {
+.ion-shuffle:before, .prompt-wrapper .switch-mode:before, .direct-messages-thread + .group-messages-control .invite-form .switch-mode:before, .mini-profile .post-area.display .switch-mode:before, .post-rt-icon:before, .post-interactions span.post-propagate:before, .post-stats li.stat-count:before, .refresh-toptrends:before, .twistday-reminder .refresh:before, .refresh-users:before {
   content: "";
 }
 
@@ -863,6 +863,10 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
   line-height: 0.8rem;
 }
 
+.confirm-popup.prompt-wrapper {
+  margin-top: -100px;
+}
+
 /************ FOLLOWING-CONFIG MODAL ********* */
 .prompt-wrapper.following-config-modal, .direct-messages-thread + .group-messages-control .following-config-modal.invite-form, .mini-profile .following-config-modal.post-area.display {
   margin-top: -100px;
@@ -996,6 +1000,13 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
 .direct-messages-list .post:hover {
   background: white;
 }
+
+.direct-messages-list .post .messages-qtd {
+  display: none;
+  top: 4px;
+  left: 56px;
+}
+
 .direct-messages-list li {
   position: relative;
   border-bottom: 1px solid #eee;
@@ -1112,6 +1123,9 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
 .profile-modal .modal-content .profile-data {
   background: none;
 }
+.profile-modal .modal-content .members {
+    overflow-y: auto;
+}
 
 .profile-modal h2.profile-screen-name {
   display: block;
@@ -1466,11 +1480,18 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
   margin: 2px 0 4px 60px;
   color: #8a8691;
 }
-.post-context.post-retransmited-by-container {
+
+.post-rt-by {
   margin: 0 0 1em;
 }
+.post-rt-by div {
+  display: inline;
+}
+.post-rt-by .prep:before, .post-rt-by .prep:after {
+  content: ' ';
+}
 
-.post-retransmited-icon:before {
+.post-rt-icon:before {
   display: block;
   float: left;
   color: #A1B775;
@@ -1711,6 +1732,30 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
   border: 1px solid #ebebeb;
 }
 
+.profile-card[data-screen-name^=\*] .profile-bio {
+  text-align: center;
+  margin: 0;
+}
+.profile-card[data-screen-name^=\*] .profile-bio .group-description {
+  display: inline-block;
+  border: 1px solid rgba(0, 0, 0, 0);
+  background: none;
+  text-align: center;
+  width: 58%;
+  padding: 4px;
+  vertical-align: middle;
+}
+.profile-card[data-screen-name^=\*] .profile-bio .group-description:focus {
+  border: 1px solid rgba(0, 0, 0, .1);
+  background: white;
+}
+.profile-card[data-screen-name^=\*] .profile-bio .group-description:hover {
+  border: 1px solid rgba(0, 0, 0, .1);
+}
+.profile-card[data-screen-name^=\*] .profile-bio .save, .profile-card[data-screen-name^=\*] .profile-bio .cancel {
+  display: none;
+}
+
 .group-messages-control {
   text-align: left !important;
 }
@@ -2350,6 +2395,7 @@ ul.userMenu-search-profiles button, ul.userMenu-search-profiles .show-more-follo
   top: 5px;
   right: 5px;
   background: #A1B775;
+  text-align: center;
   text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
   color: #fff;
   width: 25px;

js/theme_option.js

@@ -13,12 +13,12 @@ $(window).load(function()
 $(document).ready(function()
 {
     var windowHeight = $(window).height();
-    
+
     testRightSide();
     reOrganizeTemplates();
 
     $.globalEval(postToElem.toString().replace(/postContext.append\(_templatePostRtBy/,
-        'postContext.addClass(\'post-retransmited-by-container\').prependTo(postContext.parent()).append(_templatePostRtBy'));
+        'postContext.prependTo(postContext.parent()).append(_templatePostRtBy'));
 
     $( '.userMenu-home.current a' ).on( 'click', function() {
         $('html, body').animate({scrollTop:0},300);
@@ -45,7 +45,7 @@ $(document).ready(function()
 
     });
 
-    // Collapse all .post.open 
+    // Collapse all .post.open
     var allPostButton = $('<li></li>').addClass('userMenu-collapsePosts').append('<a href="#">Collapse All</a>');
     $('.mini-profile-indicators').append(allPostButton);
     $(allPostButton).children('a').on('click', function(e) {
@@ -82,7 +82,7 @@ function reOrganizeTemplates() { // for nin's templating
     $('.profile-card-main').attr('style', '');
     $('.mini-profile-actions span').html('');
 
-    //group chat 
+    //group chat
     $('.mini-profile-indicators li.userMenu-groupmessages a span:last-child ').html('Group Msg');
 
     $('button.invite').html('invite');
@@ -94,7 +94,7 @@ function reOrganizeTemplates() { // for nin's templating
     $('.mini-profile .open-following-page').parent('li').detach().appendTo($('.mini-profile-indicators'));
     $('.mini-profile-indicators').detach().insertAfter($('.dashboard.left .profile-data'));
 
-    ///// page profile 
+    ///// page profile
     $('.forEdition .profile-card-main h2').detach().insertBefore($('.profile-card-main'));
 
     //loader
@@ -135,7 +135,7 @@ function reOrganizeTemplates() { // for nin's templating
         })
         .on("eventToggleUnfollow", function() {
             $(this).text('-').attr('title', polyglot.t('Unfollow'));
-        });    
+        });
 }
 
 // Close new post prompt with esc key
@@ -168,7 +168,7 @@ function localizeLabels() {
 }
 
 function openModal(modal) {
-    
+
     var windowHeight = $(window).height();
     if (!modal.classBase)
         modal.classBase = '.modal-wrapper';
@@ -188,7 +188,7 @@ function openModal(modal) {
         modal.postboard = modal.self.find('.postboard-posts');
 
         modal.self.prependTo('body').slideDown();
-     
+
 
     if (modal.classBase === '.modal-wrapper') {
         modal.content.outerHeight(modal.self.height() - modal.self.find('.modal-header').outerHeight());

sass/layout/_dm.sass

@@ -73,6 +73,12 @@
 		right: 5px
 	.post:hover 
 		background: white
+
+	.post .messages-qtd
+		display: none
+		top: 4px
+		left: 56px
+
 	li 
 		position: relative
 		border-bottom: 1px solid $main-background-color

sass/layout/_groupchat.sass

@@ -59,6 +59,30 @@
 			border: 1px solid darken( #F8F8F8 , 5%)
 
 
+// there is no special class for group DM profile modal window currently
+.profile-card[data-screen-name^=\*]
+	.profile-bio
+		text-align: center
+		margin: 0
+
+		.group-description
+			display: inline-block
+			border: 1px solid rgba(0, 0, 0, 0)
+			background: none
+			text-align: center
+			width: 58%
+			padding: 4px
+			vertical-align: middle
+
+			&:focus
+				border: 1px solid rgba(0, 0, 0, .1)
+				background: white
+
+			&:hover
+				border: 1px solid rgba(0, 0, 0, .1)
+
+			.save, .cancel
+				display: none
 
 
 // messages control
@@ -113,4 +137,4 @@
 		float: none 
 		display: inline-block
 		padding: 7px
-		@extend .color-1
+		@extend .color-1

sass/layout/_postboard.sass

@@ -197,10 +197,17 @@
 	margin: 2px 0 4px 60px
 
 	color: lighten($dark-grey,30%)
-	&.post-retransmited-by-container
-		margin: 0 0 1em
 
-.post-retransmited-icon
+
+.post-rt-by
+	margin: 0 0 1em
+	div
+		display: inline
+	.prep:before, .prep:after
+		content: ' '
+
+
+.post-rt-icon
 	@extend .ion-shuffle
 	@extend .ion
 	&:before
@@ -372,4 +379,4 @@
 	.post-info-time
 		font-size: 80%
 	.post-area
-		padding-left: 0
+		padding-left: 0

sass/layout/_profile.sass

@@ -15,7 +15,6 @@ $modal-postboard-post-height: 100%
 
 .profile-modal
 
-
 	.modal-content
 		overflow: hidden
 		padding: 0
@@ -28,13 +27,11 @@ $modal-postboard-post-height: 100%
 			height: 100%
 			position: absolute
 
-
 		.postboard-posts
 			display: block
 			height: $modal-postboard-post-height
 			overflow: auto
 
-
 		.profile-card
 			margin: 0
 			padding: 0
@@ -42,6 +39,9 @@ $modal-postboard-post-height: 100%
 		.profile-data 
 			background: none
 
+		.members
+			overflow-y: auto
+
 .profile-modal
 	h2.profile-screen-name
 		display: block

sass/layout/_prompt.sass

@@ -44,6 +44,9 @@
 		@extend .ion-shuffle
 
 
+.confirm-popup.prompt-wrapper
+	margin-top: -100px
+
 
 /************ FOLLOWING-CONFIG MODAL **********/
 

sass/style.sass

@@ -234,6 +234,7 @@ ul.userMenu-search-profiles
 	top: 5px
 	right: 5px
 	background: $main-color-color
+	text-align: center
 	+text-shadow(1px 1px 0 rgba(#000,.2))
 	color: #fff
 	width: 25px