Removed megabar3.patch
parent
bf95af6af7
commit
6d8f5a5637
|
@ -1,148 +0,0 @@
|
|||
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
|
||||
index f076d5d7f2..92f0adf003 100644
|
||||
--- a/browser/components/urlbar/UrlbarInput.jsm
|
||||
+++ b/browser/components/urlbar/UrlbarInput.jsm
|
||||
@@ -1704,13 +1704,13 @@ class UrlbarInput {
|
||||
|
||||
// Enable the animation only after the first extend call to ensure it
|
||||
// doesn't run when opening a new window.
|
||||
- if (!this.hasAttribute("breakout-extend-animate")) {
|
||||
- this.window.promiseDocumentFlushed(() => {
|
||||
- this.window.requestAnimationFrame(() => {
|
||||
- this.setAttribute("breakout-extend-animate", "true");
|
||||
- });
|
||||
- });
|
||||
- }
|
||||
+// if (!this.hasAttribute("breakout-extend-animate")) {
|
||||
+// this.window.promiseDocumentFlushed(() => {
|
||||
+// this.window.requestAnimationFrame(() => {
|
||||
+// this.setAttribute("breakout-extend-animate", "true");
|
||||
+// });
|
||||
+// });
|
||||
+// }
|
||||
}
|
||||
|
||||
endLayoutExtend() {
|
||||
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
index 3abd701732..87713b9cbd 100644
|
||||
--- a/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
@@ -5,7 +5,7 @@
|
||||
%endif
|
||||
|
||||
%define fieldHoverBorderColor hsla(240,5%,5%,.35)
|
||||
-%define urlbarMarginInline 5px
|
||||
+%define urlbarMarginInline 0px
|
||||
%define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
|
||||
|
||||
:root {
|
||||
@@ -273,40 +273,40 @@
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend] {
|
||||
- top: -@urlbarBreakoutExtend@;
|
||||
- left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
|
||||
- width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
|
||||
+ top: 0;
|
||||
+ left: 0;
|
||||
+ width: 100%;
|
||||
}
|
||||
|
||||
@media (-moz-proton) {
|
||||
#urlbar[breakout][breakout-extend] {
|
||||
top: 0;
|
||||
- left: -@urlbarMarginInline@;
|
||||
- width: calc(100% + 2 * @urlbarMarginInline@);
|
||||
+ left: 0;
|
||||
+ width: 100%;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
@media not (-moz-proton) {
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||
- box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
|
||||
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend][open] > #urlbar-background {
|
||||
- box-shadow: 0 5px 18px rgba(0,0,0,.2);
|
||||
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||
- height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
|
||||
- padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
|
||||
- padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
|
||||
+ height: var(--urlbar-toolbar-height);
|
||||
+ padding-block: 0;
|
||||
+ padding-inline: 0;
|
||||
}
|
||||
|
||||
@media (-moz-proton) {
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||
height: var(--urlbar-toolbar-height);
|
||||
- padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding));
|
||||
- padding-inline: calc(@urlbarMarginInline@ + var(--urlbar-container-padding));
|
||||
+ padding-block: 0;
|
||||
+ padding-inline: 0;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
@@ -325,7 +325,7 @@
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||
- animation-name: urlbar-grow;
|
||||
+ animation-name: none;
|
||||
animation-duration: 0s;
|
||||
animation-timing-function: var(--animation-easing-function);
|
||||
}
|
||||
diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
|
||||
index e58531723e..dba8668168 100644
|
||||
--- a/browser/themes/shared/urlbarView.inc.css
|
||||
+++ b/browser/themes/shared/urlbarView.inc.css
|
||||
@@ -86,16 +86,16 @@
|
||||
display: block;
|
||||
text-shadow: none;
|
||||
overflow: clip;
|
||||
- margin-inline: calc(5px + var(--urlbar-container-padding));
|
||||
- width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
|
||||
+ margin-inline: 0;
|
||||
+ width: 100%
|
||||
/* Match urlbar-background's border. */
|
||||
border-inline: 1px solid transparent;
|
||||
}
|
||||
|
||||
@media not (-moz-proton) {
|
||||
.urlbarView {
|
||||
- margin-inline: calc(4px + var(--identity-box-margin-inline));
|
||||
- width: calc(100% - 2 * (4px + var(--identity-box-margin-inline)));
|
||||
+ margin-inline: 0;
|
||||
+ width: 100%;
|
||||
}
|
||||
/* If the view is open, offset the toolbar overlap so the view's top border
|
||||
aligns with the toolbar. */
|
||||
@@ -298,6 +298,7 @@
|
||||
object-fit: contain;
|
||||
flex-shrink: 0;
|
||||
-moz-context-properties: fill, fill-opacity;
|
||||
+ margin-inline-start: 20px;
|
||||
}
|
||||
|
||||
@media not (-moz-proton) {
|
||||
@@ -331,10 +332,10 @@
|
||||
|
||||
.urlbarView-type-icon {
|
||||
position: absolute;
|
||||
- width: 12px;
|
||||
- height: 12px;
|
||||
- margin-bottom: -4px;
|
||||
- margin-inline-start: 8px;
|
||||
+ width: 16px;
|
||||
+ height: 16px;;
|
||||
+ margin-bottom: 0;
|
||||
+ margin-inline-start: 0;
|
||||
align-self: end;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
|
@ -1,148 +0,0 @@
|
|||
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
|
||||
index f076d5d7f2..92f0adf003 100644
|
||||
--- a/browser/components/urlbar/UrlbarInput.jsm
|
||||
+++ b/browser/components/urlbar/UrlbarInput.jsm
|
||||
@@ -1704,13 +1704,13 @@ class UrlbarInput {
|
||||
|
||||
// Enable the animation only after the first extend call to ensure it
|
||||
// doesn't run when opening a new window.
|
||||
- if (!this.hasAttribute("breakout-extend-animate")) {
|
||||
- this.window.promiseDocumentFlushed(() => {
|
||||
- this.window.requestAnimationFrame(() => {
|
||||
- this.setAttribute("breakout-extend-animate", "true");
|
||||
- });
|
||||
- });
|
||||
- }
|
||||
+// if (!this.hasAttribute("breakout-extend-animate")) {
|
||||
+// this.window.promiseDocumentFlushed(() => {
|
||||
+// this.window.requestAnimationFrame(() => {
|
||||
+// this.setAttribute("breakout-extend-animate", "true");
|
||||
+// });
|
||||
+// });
|
||||
+// }
|
||||
}
|
||||
|
||||
endLayoutExtend() {
|
||||
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
index 3abd701732..87713b9cbd 100644
|
||||
--- a/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
@@ -5,7 +5,7 @@
|
||||
%endif
|
||||
|
||||
%define fieldHoverBorderColor hsla(240,5%,5%,.35)
|
||||
-%define urlbarMarginInline 5px
|
||||
+%define urlbarMarginInline 0px
|
||||
%define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
|
||||
|
||||
:root {
|
||||
@@ -273,40 +273,40 @@
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend] {
|
||||
- top: -@urlbarBreakoutExtend@;
|
||||
- left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
|
||||
- width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
|
||||
+ top: 0;
|
||||
+ left: 0;
|
||||
+ width: 100%;
|
||||
}
|
||||
|
||||
@media (-moz-proton) {
|
||||
#urlbar[breakout][breakout-extend] {
|
||||
top: 0;
|
||||
- left: -@urlbarMarginInline@;
|
||||
- width: calc(100% + 2 * @urlbarMarginInline@);
|
||||
+ left: 0;
|
||||
+ width: 100%;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
@media not (-moz-proton) {
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||
- box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
|
||||
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend][open] > #urlbar-background {
|
||||
- box-shadow: 0 5px 18px rgba(0,0,0,.2);
|
||||
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||
- height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
|
||||
- padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
|
||||
- padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
|
||||
+ height: var(--urlbar-toolbar-height);
|
||||
+ padding-block: 0;
|
||||
+ padding-inline: 0;
|
||||
}
|
||||
|
||||
@media (-moz-proton) {
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||
height: var(--urlbar-toolbar-height);
|
||||
- padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding));
|
||||
- padding-inline: calc(@urlbarMarginInline@ + var(--urlbar-container-padding));
|
||||
+ padding-block: 0;
|
||||
+ padding-inline: 0;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
@@ -325,7 +325,7 @@
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||
- animation-name: urlbar-grow;
|
||||
+ animation-name: none;
|
||||
animation-duration: 0s;
|
||||
animation-timing-function: var(--animation-easing-function);
|
||||
}
|
||||
diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
|
||||
index e58531723e..dba8668168 100644
|
||||
--- a/browser/themes/shared/urlbarView.inc.css
|
||||
+++ b/browser/themes/shared/urlbarView.inc.css
|
||||
@@ -86,16 +86,16 @@
|
||||
display: block;
|
||||
text-shadow: none;
|
||||
overflow: clip;
|
||||
- margin-inline: calc(5px + var(--urlbar-container-padding));
|
||||
- width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
|
||||
+ margin-inline: 0;
|
||||
+ width: 100%
|
||||
/* Match urlbar-background's border. */
|
||||
border-inline: 1px solid transparent;
|
||||
}
|
||||
|
||||
@media not (-moz-proton) {
|
||||
.urlbarView {
|
||||
- margin-inline: calc(4px + var(--identity-box-margin-inline));
|
||||
- width: calc(100% - 2 * (4px + var(--identity-box-margin-inline)));
|
||||
+ margin-inline: 0;
|
||||
+ width: 100%;
|
||||
}
|
||||
/* If the view is open, offset the toolbar overlap so the view's top border
|
||||
aligns with the toolbar. */
|
||||
@@ -298,6 +298,7 @@
|
||||
object-fit: contain;
|
||||
flex-shrink: 0;
|
||||
-moz-context-properties: fill, fill-opacity;
|
||||
+ margin-inline-start: 20px;
|
||||
}
|
||||
|
||||
@media not (-moz-proton) {
|
||||
@@ -331,10 +332,10 @@
|
||||
|
||||
.urlbarView-type-icon {
|
||||
position: absolute;
|
||||
- width: 12px;
|
||||
- height: 12px;
|
||||
- margin-bottom: -4px;
|
||||
- margin-inline-start: 8px;
|
||||
+ width: 16px;
|
||||
+ height: 16px;;
|
||||
+ margin-bottom: 0;
|
||||
+ margin-inline-start: 0;
|
||||
align-self: end;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
Loading…
Reference in New Issue