Merge branch 'master' into firefox-41-beta

5 files changed, 39 insertions, 25 deletions

diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css
index 64efd33..82fc9e9 100644
--- a/arc-firefox-theme/chrome/browser/browser.css
+++ b/arc-firefox-theme/chrome/browser/browser.css
@@ -1275,8 +1275,8 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 3px 5px;
-  border-radius: 20px;
+  padding: 3px;
+  border-radius: 3px;
   margin: 0 3px;
   box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
@@ -1290,6 +1290,9 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
   background-color: #ffffff;
   border: 1px solid #5294E2; }
 
+.searchbar-textbox {
+  border-radius: 20px; }
+
 .urlbar-textbox-container {
   -moz-appearance: none;
   -moz-box-align: center; }
@@ -2221,14 +2224,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
     border-color: #ef5f0f;
     color: #ffffff; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(ltr) {
-    border-radius: 20px 0 0 20px;
+    border-radius: 3px 0 0 3px;
     border-right-width: 0; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(rtl) {
-    border-radius: 0 20px 20px 0;
+    border-radius: 0 3px 3px 0;
     border-left-width: 0; }
   .browserContainer > findbar .findbar-textbox.minimal {
     border-width: 1px;
-    border-radius: 20px; }
+    border-radius: 3px; }
 
 .browserContainer > findbar .findbar-find-previous,
 .browserContainer > findbar .findbar-find-next {
diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
index 4a446f1..5de59e3 100644
--- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
+++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss
@@ -1675,8 +1675,8 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 3px 5px;
-  border-radius: 20px;
+  padding: 3px;
+  border-radius: 3px;
   margin: 0 3px;
   @include entry(normal);
 }
@@ -1686,6 +1686,8 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
   @include entry(focus);
 }
 
+.searchbar-textbox { border-radius: 20px; }
+
 //#urlbar {
 //  background-color: -moz-field;
 //}
@@ -2957,18 +2959,18 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   }
 
   &:-moz-locale-dir(ltr) {
-    border-radius: 20px 0 0 20px;
+    border-radius: 3px 0 0 3px;
     border-right-width: 0;
   }
 
   &:-moz-locale-dir(rtl) {
-    border-radius: 0 20px 20px 0;
+    border-radius: 0 3px 3px 0;
     border-left-width: 0;
   }
 
   &.minimal {
     border-width: 1px;
-    border-radius: 20px;
+    border-radius: 3px;
   }
 }
 
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
index 62431de..a7f3d04 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css
@@ -1275,8 +1275,8 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 3px 5px;
-  border-radius: 20px;
+  padding: 3px;
+  border-radius: 3px;
   margin: 0 3px;
   box-shadow: inset 0 0 rgba(56, 60, 69, 0);
   color: #D3DAE3;
@@ -1290,6 +1290,9 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
   background-color: #383c45;
   border: 1px solid #5294E2; }
 
+.searchbar-textbox {
+  border-radius: 20px; }
+
 .urlbar-textbox-container {
   -moz-appearance: none;
   -moz-box-align: center; }
@@ -2221,14 +2224,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
     border-color: #ef5f0f;
     color: #ffffff; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(ltr) {
-    border-radius: 20px 0 0 20px;
+    border-radius: 3px 0 0 3px;
     border-right-width: 0; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(rtl) {
-    border-radius: 0 20px 20px 0;
+    border-radius: 0 3px 3px 0;
     border-left-width: 0; }
   .browserContainer > findbar .findbar-textbox.minimal {
     border-width: 1px;
-    border-radius: 20px; }
+    border-radius: 3px; }
 
 .browserContainer > findbar .findbar-find-previous,
 .browserContainer > findbar .findbar-find-next {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
index c0e2e60..3a5c545 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css
@@ -1275,8 +1275,8 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 3px 5px;
-  border-radius: 20px;
+  padding: 3px;
+  border-radius: 3px;
   margin: 0 3px;
   box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
@@ -1290,6 +1290,9 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
   background-color: #ffffff;
   border: 1px solid #5294E2; }
 
+.searchbar-textbox {
+  border-radius: 20px; }
+
 .urlbar-textbox-container {
   -moz-appearance: none;
   -moz-box-align: center; }
@@ -2221,14 +2224,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
     border-color: #ef5f0f;
     color: #ffffff; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(ltr) {
-    border-radius: 20px 0 0 20px;
+    border-radius: 3px 0 0 3px;
     border-right-width: 0; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(rtl) {
-    border-radius: 0 20px 20px 0;
+    border-radius: 0 3px 3px 0;
     border-left-width: 0; }
   .browserContainer > findbar .findbar-textbox.minimal {
     border-width: 1px;
-    border-radius: 20px; }
+    border-radius: 3px; }
 
 .browserContainer > findbar .findbar-find-previous,
 .browserContainer > findbar .findbar-find-next {
diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css
index 64efd33..82fc9e9 100644
--- a/arc-firefox-theme/chrome/browser/sass/browser-light.css
+++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css
@@ -1275,8 +1275,8 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;
-  padding: 3px 5px;
-  border-radius: 20px;
+  padding: 3px;
+  border-radius: 3px;
   margin: 0 3px;
   box-shadow: inset 0 0 rgba(255, 255, 255, 0);
   color: #5c616c;
@@ -1290,6 +1290,9 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
   background-color: #ffffff;
   border: 1px solid #5294E2; }
 
+.searchbar-textbox {
+  border-radius: 20px; }
+
 .urlbar-textbox-container {
   -moz-appearance: none;
   -moz-box-align: center; }
@@ -2221,14 +2224,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
     border-color: #ef5f0f;
     color: #ffffff; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(ltr) {
-    border-radius: 20px 0 0 20px;
+    border-radius: 3px 0 0 3px;
     border-right-width: 0; }
   .browserContainer > findbar .findbar-textbox:-moz-locale-dir(rtl) {
-    border-radius: 0 20px 20px 0;
+    border-radius: 0 3px 3px 0;
     border-left-width: 0; }
   .browserContainer > findbar .findbar-textbox.minimal {
     border-width: 1px;
-    border-radius: 20px; }
+    border-radius: 3px; }
 
 .browserContainer > findbar .findbar-find-previous,
 .browserContainer > findbar .findbar-find-next {