From d188d0dfbc260cc1f5a104609f5f98c1381af869 Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Tue, 19 May 2015 14:40:12 -0700 Subject: [PATCH] talk details --- base/pub/talk/src/css/main.css | 3 +- base/pub/talk/src/css/main.styl | 8 +-- .../src/js/components/StationComponent.coffee | 2 +- .../src/js/components/WritingComponent.coffee | 7 ++- base/pub/talk/src/js/main.js | 54 +++++++++---------- 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/base/pub/talk/src/css/main.css b/base/pub/talk/src/css/main.css index aeeeb39ec..6fdb13921 100644 --- a/base/pub/talk/src/css/main.css +++ b/base/pub/talk/src/css/main.css @@ -435,7 +435,7 @@ a { } .type.public:before { content: "▒"; - line-height: 0.8rem; + line-height: 1.1rem; } .mess, .iden, @@ -461,6 +461,7 @@ a { } .attr .iden { margin-left: 0.3rem; + line-hieght: 1.4rem; } .audi, .station .path { diff --git a/base/pub/talk/src/css/main.styl b/base/pub/talk/src/css/main.styl index a8aaea5ff..bdff0719f 100644 --- a/base/pub/talk/src/css/main.styl +++ b/base/pub/talk/src/css/main.styl @@ -98,7 +98,7 @@ body #messages-container vertical-align top - margin-top 4rem + margin-top 5rem // // components @@ -381,11 +381,11 @@ a .type.private:before content "•" font-size 1rem - line-height .7rem + line-height 1.1rem .type.public:before content "▒" - line-height .8rem + line-height 1.1rem .mess .iden @@ -399,6 +399,7 @@ a vertical-align top .attr > div + line-height 1.4rem max-width 16rem .attr @@ -411,6 +412,7 @@ a .attr .iden margin-left .3rem + line-hieght 1.4rem .audi .station .path diff --git a/base/pub/talk/src/js/components/StationComponent.coffee b/base/pub/talk/src/js/components/StationComponent.coffee index 89a05bd9b..e2487dc62 100644 --- a/base/pub/talk/src/js/components/StationComponent.coffee +++ b/base/pub/talk/src/js/components/StationComponent.coffee @@ -84,7 +84,7 @@ module.exports = recl if @state.station and @state.members members = _.map @state.members, (stations,member) -> audi = _.map stations,(presence,station) -> (div {className:"audi"}, station.slice(1)) - (div {}, [audi,(React.createElement Member, {ship:member})]) + (div {}, [(React.createElement Member, {ship:member}),audi]) else members = "" diff --git a/base/pub/talk/src/js/components/WritingComponent.coffee b/base/pub/talk/src/js/components/WritingComponent.coffee index 5091bc4e6..a38077e6f 100644 --- a/base/pub/talk/src/js/components/WritingComponent.coffee +++ b/base/pub/talk/src/js/components/WritingComponent.coffee @@ -43,11 +43,10 @@ module.exports = recl addCC: (audi) -> listening = @state.config[window.util.mainStation(window.urb.user)].sources cc = false - for s in listening - if audi.indexOf(s) is -1 + for s in audi + if listening.indexOf(s) is -1 cc = true - if listening.length is 0 - cc = true + if listening.length is 0 then cc = true if cc is true audi.push window.util.mainStationPath(window.urb.user) audi diff --git a/base/pub/talk/src/js/main.js b/base/pub/talk/src/js/main.js index d2d980c6d..122f09a71 100644 --- a/base/pub/talk/src/js/main.js +++ b/base/pub/talk/src/js/main.js @@ -1,4 +1,4 @@ -(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o