Bug 1209592 - Fix Loop's screenshare dropdown being misplaced on large window sizes. r=mikedeboer,a=lhenry
authorMark Banner <standard8@mozilla.com>
Fri, 02 Oct 2015 14:24:09 +0100
changeset 296303 192e84036f5a8bab4bfe6e341c6e14a5b3806fd3
parent 296302 38d39d3820244bc8495b31cb17a8e8859f9e0cb7
child 296304 4c88c4270076d54df23f74ba99c7ff318ff0c454
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer, lhenry
bugs1209592
milestone43.0a2
Bug 1209592 - Fix Loop's screenshare dropdown being misplaced on large window sizes. r=mikedeboer,a=lhenry
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
@@ -454,26 +454,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
@@ -160,17 +160,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
@@ -160,17 +160,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}>