Bug 1105809 - Centered feedback form in Loop standalone ended room conversation view. r=Standard8 a=sylvestre
authorNicolas Perriault <nperriault@mozilla.com>
Thu, 04 Dec 2014 10:04:40 -0800
changeset 242357 9c46ff90308af56165b3c2c067974c747dcb3aca
parent 242356 4fdb2b128230804ea54804be794a2cf23c52efef
child 242358 a408c98d4f5d219dab6c3fff8f3400d92e4c508a
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, sylvestre
bugs1105809
milestone36.0a2
Bug 1105809 - Centered feedback form in Loop standalone ended room conversation view. r=Standard8 a=sylvestre
browser/components/loop/standalone/content/css/webapp.css
browser/components/loop/ui/ui-showcase.js
browser/components/loop/ui/ui-showcase.jsx
--- a/browser/components/loop/standalone/content/css/webapp.css
+++ b/browser/components/loop/standalone/content/css/webapp.css
@@ -242,16 +242,19 @@ p.standalone-btn-label {
   top: 20px;
   left: 10%;
   right: 10%;
   background: #FFF;
   box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.4);
   border-radius: 3px;
   z-index: 1002; /* ensures the form is always on top of the control bar */
 }
+.standalone .room-conversation-wrapper .ended-conversation .feedback {
+  right: 35%;
+}
 
 .standalone .ended-conversation .local-stream {
   /* Hide  local media stream when feedback form is shown. */
   display: none;
 }
 
 @media screen and (max-width:640px) {
   .standalone .ended-conversation .feedback {
--- a/browser/components/loop/ui/ui-showcase.js
+++ b/browser/components/loop/ui/ui-showcase.js
@@ -616,16 +616,27 @@
                 StandaloneRoomView({
                   dispatcher: dispatcher, 
                   activeRoomStore: activeRoomStore, 
                   roomState: ROOM_STATES.FULL, 
                   helper: {isFirefox: returnFalse}})
               )
             ), 
 
+            Example({summary: "Standalone room conversation (feedback)"}, 
+              React.DOM.div({className: "standalone"}, 
+                StandaloneRoomView({
+                  dispatcher: dispatcher, 
+                  activeRoomStore: activeRoomStore, 
+                  feedbackStore: feedbackStore, 
+                  roomState: ROOM_STATES.ENDED, 
+                  helper: {isFirefox: returnFalse}})
+              )
+            ), 
+
             Example({summary: "Standalone room conversation (failed)"}, 
               React.DOM.div({className: "standalone"}, 
                 StandaloneRoomView({
                   dispatcher: dispatcher, 
                   activeRoomStore: activeRoomStore, 
                   roomState: ROOM_STATES.FAILED, 
                   helper: {isFirefox: returnFalse}})
               )
--- a/browser/components/loop/ui/ui-showcase.jsx
+++ b/browser/components/loop/ui/ui-showcase.jsx
@@ -616,16 +616,27 @@
                 <StandaloneRoomView
                   dispatcher={dispatcher}
                   activeRoomStore={activeRoomStore}
                   roomState={ROOM_STATES.FULL}
                   helper={{isFirefox: returnFalse}} />
               </div>
             </Example>
 
+            <Example summary="Standalone room conversation (feedback)">
+              <div className="standalone">
+                <StandaloneRoomView
+                  dispatcher={dispatcher}
+                  activeRoomStore={activeRoomStore}
+                  feedbackStore={feedbackStore}
+                  roomState={ROOM_STATES.ENDED}
+                  helper={{isFirefox: returnFalse}} />
+              </div>
+            </Example>
+
             <Example summary="Standalone room conversation (failed)">
               <div className="standalone">
                 <StandaloneRoomView
                   dispatcher={dispatcher}
                   activeRoomStore={activeRoomStore}
                   roomState={ROOM_STATES.FAILED}
                   helper={{isFirefox: returnFalse}} />
               </div>