Bug 1209592 - Fix Loop's screenshare dropdown being misplaced on large window sizes. r=mikedeboer
authorMark Banner <standard8@mozilla.com>
Fri, 02 Oct 2015 14:24:09 +0100
changeset 265663 0ee75d7cc16b2433dcb8d190c53b66ddde31eef0
parent 265662 d5f73661541a7ebc1c277acccbfbe9346b4e95fc
child 265664 616c04d4e5a1d7e46033447078bb73bb17e3a653
push id15476
push usermbanner@mozilla.com
push dateFri, 02 Oct 2015 13:24:31 +0000
treeherderfx-team@616c04d4e5a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer
bugs1209592
milestone44.0a1
Bug 1209592 - Fix Loop's screenshare dropdown being misplaced on large window sizes. r=mikedeboer
browser/components/loop/content/shared/css/conversation.css
browser/components/loop/content/shared/js/views.js
browser/components/loop/content/shared/js/views.jsx
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -425,26 +425,21 @@ html[dir="rtl"] .room-failure > .setting
 .conversation-window-dropdown > li {
   padding: .2rem;
   font-size: 1rem;
   white-space: nowrap;
 }
 
 .screen-share-menu.dropdown-menu,
 .settings-menu.dropdown-menu {
-  left: auto;
   bottom: 3.1rem;
 }
 
-.screen-share-menu.dropdown-menu {
-  /*offset dropdown menu to be above menu button*/
-  right: 40px;
-}
-
 .settings-menu.dropdown-menu {
+  left: auto;
   /*offset dropdown menu to be above menu button*/
   right: 14px;
 }
 
 html[dir="rtl"] .screen-share-menu.dropdown-menu,
 html[dir="rtl"] .settings-menu.dropdown-menu {
   right: auto;
 }
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -158,17 +158,17 @@ loop.shared.views = (function(_, mozL10n
         "dropdown-menu-item": true,
         "disabled": this.state.windowSharingDisabled
       });
 
       return (
         React.createElement("div", null, 
           React.createElement("button", {className: screenShareClasses, 
                   onClick: this.handleClick, 
-                  ref: "menu-button", 
+                  ref: "anchor", 
                   title: this._getTitle()}, 
             isActive ? null : React.createElement("span", {className: "chevron"})
           ), 
           React.createElement("ul", {className: dropdownMenuClasses, ref: "menu"}, 
             React.createElement("li", {className: "dropdown-menu-item", onClick: this._handleShareTabs}, 
               mozL10n.get("share_tabs_button_title2")
             ), 
             React.createElement("li", {className: windowSharingClasses, onClick: this._handleShareWindows}, 
--- a/browser/components/loop/content/shared/js/views.jsx
+++ b/browser/components/loop/content/shared/js/views.jsx
@@ -158,17 +158,17 @@ loop.shared.views = (function(_, mozL10n
         "dropdown-menu-item": true,
         "disabled": this.state.windowSharingDisabled
       });
 
       return (
         <div>
           <button className={screenShareClasses}
                   onClick={this.handleClick}
-                  ref="menu-button"
+                  ref="anchor"
                   title={this._getTitle()}>
             {isActive ? null : <span className="chevron"/>}
           </button>
           <ul className={dropdownMenuClasses} ref="menu">
             <li className="dropdown-menu-item" onClick={this._handleShareTabs}>
               {mozL10n.get("share_tabs_button_title2")}
             </li>
             <li className={windowSharingClasses} onClick={this._handleShareWindows}>