Merge pull request #5743 from josiah-keller/master

Fix findbar background on sites with a translucent theme color Thanks @josiah-keller ! cc @bbondy
brave · Nov 20, 2016 · 33cbd18 · 33cbd18
2 parents e1201a6 + f194667
commit 33cbd18
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/js/components/findbar.js b/js/components/findbar.js
@@ -199,12 +199,16 @@ class FindBar extends ImmutableComponent {
 
     const backgroundColor = this.backgroundColor
     let findBarStyle = {}
+    let findBarTextStyle = {}
 
     if (backgroundColor) {
       findBarStyle = {
         background: backgroundColor,
         color: this.textColor
       }
+      findBarTextStyle = {
+        color: this.textColor
+      }
     }
 
     return <div className='findBar' style={findBarStyle} onBlur={this.onBlur}>
@@ -236,10 +240,10 @@ class FindBar extends ImmutableComponent {
           id='caseSensitivityCheckbox'
           checkedOn={this.isCaseSensitive}
           onClick={this.onCaseSensitivityChange} />
-        <label htmlFor='caseSensitivityCheckbox' data-l10n-id='caseSensitivity' style={findBarStyle} />
+        <label htmlFor='caseSensitivityCheckbox' data-l10n-id='caseSensitivity' style={findBarTextStyle} />
       </div>
       <span className='findButton closeButton'
-        style={findBarStyle}
+        style={findBarTextStyle}
         onClick={this.props.onFindHide}>+</span>
     </div>
   }

diff --git a/less/findbar.less b/less/findbar.less
@@ -23,6 +23,7 @@
 
   label {
     color: @mediumGray;
+    -webkit-user-select: none;
   }
 
   span.findButton {
@@ -48,6 +49,7 @@
     margin-right: 0;
     opacity: 0.5;
     transform: rotate(45deg);
+    -webkit-user-select: none;
   }
 
   .searchContainer {