Bug 1105802 - Added beta tag to standalone room layout. r=dmose
authorNicolas Perriault <nperriault@mozilla.com>
Thu, 04 Dec 2014 12:21:09 -0800
changeset 218473 656951a7539181b1427c0bdb2e87be95d435c7a9
parent 218472 64ba905a6180609d0f879fc9300344ae853807b9
child 218474 5d5425acf620d4eab70d5147fe48cf170ab5312d
push idunknown
push userunknown
push dateunknown
reviewersdmose
bugs1105802
milestone37.0a1
Bug 1105802 - Added beta tag to standalone room layout. r=dmose
browser/components/loop/standalone/content/css/webapp.css
browser/components/loop/standalone/content/js/standaloneRoomViews.js
browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
--- a/browser/components/loop/standalone/content/css/webapp.css
+++ b/browser/components/loop/standalone/content/css/webapp.css
@@ -17,17 +17,28 @@ body,
   text-align: center;
   font-family: Open Sans,sans-serif;
 }
 
 /**
  * Note: the is-standalone-room class is dynamically set by the StandaloneRoomView.
  */
 .standalone.is-standalone-room {
-  background-color: #000;
+  background: #000;
+}
+
+.standalone .beta-logo {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 50px;
+  height: 50px;
+  background: transparent url(../shared/img/beta-ribbon.svg) no-repeat;
+  background-size: 50px;
+  z-index: 1000;
 }
 
 .standalone-header {
   border-radius: 4px;
   background: #fff;
   border: 1px solid #E7E7E7;
   box-shadow: 0px 2px 0px rgba(0, 0, 0, 0.03);
   background-image: url("../shared/img/beta-ribbon.svg#beta-ribbon");
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.js
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
@@ -346,16 +346,17 @@ loop.standaloneRoomViews = (function(moz
         hide: !this._roomIsActive(),
         local: true,
         "local-stream": true,
         "local-stream-audio": this.state.videoMuted
       });
 
       return (
         React.DOM.div({className: "room-conversation-wrapper"}, 
+          React.DOM.div({className: "beta-logo"}), 
           StandaloneRoomHeader(null), 
           StandaloneRoomInfoArea({roomState: this.state.roomState, 
                                   failureReason: this.state.failureReason, 
                                   joinRoom: this.joinRoom, 
                                   helper: this.props.helper, 
                                   activeRoomStore: this.props.activeRoomStore, 
                                   feedbackStore: this.props.feedbackStore}), 
           React.DOM.div({className: "video-layout-wrapper"}, 
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
@@ -346,16 +346,17 @@ loop.standaloneRoomViews = (function(moz
         hide: !this._roomIsActive(),
         local: true,
         "local-stream": true,
         "local-stream-audio": this.state.videoMuted
       });
 
       return (
         <div className="room-conversation-wrapper">
+          <div className="beta-logo" />
           <StandaloneRoomHeader />
           <StandaloneRoomInfoArea roomState={this.state.roomState}
                                   failureReason={this.state.failureReason}
                                   joinRoom={this.joinRoom}
                                   helper={this.props.helper}
                                   activeRoomStore={this.props.activeRoomStore}
                                   feedbackStore={this.props.feedbackStore} />
           <div className="video-layout-wrapper">