added better column handling

Author: John Jones

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inbrief",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "author": "John Jones <johnjones4@gmail.com>",
   "description": " InBrief is a personal briefing app and dashboard.",
   "private": true,

src/ui/widgets/Twitter.js

@@ -61,7 +61,8 @@ class Twitter extends Widget {
     if (!data) {
       return null
     }
-    if (this.getWidgetConfig().merge) {
+    const config = this.getWidgetConfig()
+    if (config.merge) {
       const all = []
       data.forEach(tweets => {
         tweets.tweets.forEach(tweet => {
@@ -106,8 +107,10 @@ class Twitter extends Widget {
   }
 
   renderTweets (tweets, i) {
+    const config = this.getWidgetConfig()
+    const width = Math.floor(100.0 / (config.layout.w || 0)) + '%'
     return (
-      <div className='twitter-feed' key={i}>
+      <div className='twitter-feed' style={{width}} key={i}>
         {tweets.title && (
           <div className='twitter-feed-title widget-subhead'>
             {tweets.title}
@@ -180,7 +183,7 @@ class Twitter extends Widget {
                 tempConfig.credentials.access.tokenSecret ? (
                   <div>
                     <label>
-                      <input type='checkbox' name='merge' checked={this.getWidgetTempConfig().merge || false} onClick={(event) => this.setTempConfigValue('merge', event.target.checked)} />
+                      <input type='checkbox' name='merge' checked={this.getWidgetTempConfig().merge || false} onChange={(event) => this.setTempConfigValue('merge', event.target.checked)} />
                       Merge Lists
                     </label>
                     <button className='destructive pull-right' onClick={() => this.setAccessCredentials(null)}>Deauthorize</button>

src/ui/widgets/Twitter.scss

@@ -1,7 +1,6 @@
 @import '../vars_mixins.scss';
 
 .twitter-feed {
-  width: 50%;
   float: left;
   padding-right: 0.5em;
   margin-bottom: 1em;
@@ -40,13 +39,6 @@
   float: right;
 }
 
-@media (max-width: 1900px) {
-  .twitter-feed {
-    width: auto;
-    float: none;
-  }
-}
-
 .twitter-feed-tweet-name {
   margin-right: 0.25em;
   color: $widget_body_strong_text_color;