mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset e88b44182dda (bug 1698883) for causing bc failures in browser_documentnavigation.js and browser_protectionsUI.js. 

CLOSED TREE
This commit is contained in:
Brindusan Cristian 2021-06-17 22:43:47 +03:00
Родитель c69960a99b
Коммит 20b73f0fc2
7 изменённых файлов: 79 добавлений и 44 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
browser/components/controlcenter/content/identityPanel.inc.xhtml
Просмотреть файл

@ -94,11 +94,10 @@
<!-- Clear Site Data Button --> <!-- Clear Site Data Button -->
<vbox hidden="true" <vbox hidden="true"
id="identity-popup-clear-sitedata-footer"> id="identity-popup-clear-sitedata-footer"
<toolbarseparator /> class="panel-footer panel-footer-menulike">
<toolbarbutton id="identity-popup-clear-sitedata-button" <button id="identity-popup-clear-sitedata-button"
data-l10n-id="identity-clear-site-data" data-l10n-id="identity-clear-site-data"
class="subviewbutton panel-subview-footer-button"
oncommand="gIdentityHandler.clearSiteData(event);"/> oncommand="gIdentityHandler.clearSiteData(event);"/>
</vbox> </vbox>
</panelview> </panelview>
@ -184,12 +183,10 @@
oncommand="gIdentityHandler.enableMixedContentProtection()"/> oncommand="gIdentityHandler.enableMixedContentProtection()"/>
</vbox> </vbox>
<vbox id="identity-popup-more-info-footer"> <vbox id="identity-popup-more-info-footer" class="panel-footer panel-footer-menulike">
<!-- More Security Information --> <!-- More Security Information -->
<toolbarseparator /> <button id="identity-popup-more-info"
<toolbarbutton id="identity-popup-more-info"
data-l10n-id="identity-more-info-link-text" data-l10n-id="identity-more-info-link-text"
class="subviewbutton panel-subview-footer-button"
oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
</vbox> </vbox>

38
browser/components/controlcenter/content/protectionsPanel.inc.xhtml
Просмотреть файл

@ -234,11 +234,11 @@
<toolbarseparator></toolbarseparator> <toolbarseparator></toolbarseparator>
<vbox id="protections-popup-trackersView-list" class="protections-popup-list"> <vbox id="protections-popup-trackersView-list" class="protections-popup-list">
</vbox> </vbox>
<toolbarseparator></toolbarseparator> <vbox class="panel-footer panel-footer-menulike">
<toolbarbutton id="protections-popup-trackersView-settings-button" <button id="protections-popup-trackersView-settings-button"
data-l10n-id="protections-panel-content-blocking-manage-settings" data-l10n-id="protections-panel-content-blocking-manage-settings"
class="subviewbutton panel-subview-footer-button" oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'trackers');"/>
oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'trackers');"/> </vbox>
</panelview> </panelview>
<!-- Social Block SubView --> <!-- Social Block SubView -->
@ -263,11 +263,11 @@
<toolbarseparator></toolbarseparator> <toolbarseparator></toolbarseparator>
<vbox id="protections-popup-socialblockView-list" class="protections-popup-list"> <vbox id="protections-popup-socialblockView-list" class="protections-popup-list">
</vbox> </vbox>
<toolbarseparator></toolbarseparator> <vbox class="panel-footer panel-footer-menulike">
<toolbarbutton id="protections-popup-socialblockView-settings-button" <button id="protections-popup-socialblockView-settings-button"
data-l10n-id="protections-panel-content-blocking-manage-settings" data-l10n-id="protections-panel-content-blocking-manage-settings"
class="subviewbutton panel-subview-footer-button" oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'social');"/>
oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'social');"/> </vbox>
</panelview> </panelview>
<!-- Cookies SubView --> <!-- Cookies SubView -->
@ -280,11 +280,11 @@
<toolbarseparator></toolbarseparator> <toolbarseparator></toolbarseparator>
<vbox id="protections-popup-cookiesView-list" class="protections-popup-list"> <vbox id="protections-popup-cookiesView-list" class="protections-popup-list">
</vbox> </vbox>
<toolbarseparator></toolbarseparator> <vbox class="panel-footer panel-footer-menulike">
<toolbarbutton id="protections-popup-cookiesView-settings-button" <button id="protections-popup-cookiesView-settings-button"
data-l10n-id="protections-panel-content-blocking-manage-settings" data-l10n-id="protections-panel-content-blocking-manage-settings"
class="subviewbutton panel-subview-footer-button"
oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'cookies');"/> oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'cookies');"/>
</vbox>
</panelview> </panelview>
<!-- Fingerprinters SubView --> <!-- Fingerprinters SubView -->
@ -309,11 +309,11 @@
<toolbarseparator></toolbarseparator> <toolbarseparator></toolbarseparator>
<vbox id="protections-popup-fingerprintersView-list" class="protections-popup-list"> <vbox id="protections-popup-fingerprintersView-list" class="protections-popup-list">
</vbox> </vbox>
<toolbarseparator></toolbarseparator> <vbox class="panel-footer panel-footer-menulike">
<toolbarbutton id="protections-popup-fingerprintersView-settings-button" <button id="protections-popup-fingerprintersView-settings-button"
data-l10n-id="protections-panel-content-blocking-manage-settings" data-l10n-id="protections-panel-content-blocking-manage-settings"
class="subviewbutton panel-subview-footer-button"
oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'fingerprinters');"/> oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'fingerprinters');"/>
</vbox>
</panelview> </panelview>
<!-- Cryptominers SubView --> <!-- Cryptominers SubView -->
@ -338,11 +338,11 @@
<toolbarseparator></toolbarseparator> <toolbarseparator></toolbarseparator>
<vbox id="protections-popup-cryptominersView-list" class="protections-popup-list"> <vbox id="protections-popup-cryptominersView-list" class="protections-popup-list">
</vbox> </vbox>
<toolbarseparator></toolbarseparator> <vbox class="panel-footer panel-footer-menulike">
<toolbarbutton id="protections-popup-cryptominersView-settings-button" <button id="protections-popup-cryptominersView-settings-button"
data-l10n-id="protections-panel-content-blocking-manage-settings" data-l10n-id="protections-panel-content-blocking-manage-settings"
class="subviewbutton panel-subview-footer-button"
oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'cryptominers');"/> oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'cryptominers');"/>
</vbox>
</panelview> </panelview>
<!-- Send Report SubView --> <!-- Send Report SubView -->

6
browser/components/downloads/content/downloads.css
Просмотреть файл

@ -95,7 +95,11 @@
padding: 0.62em; padding: 0.62em;
} }
#downloadsHistory,
#downloadsFooterButtons { #downloadsFooterButtons {
margin: 0; margin: 0;
} }
#downloadsHistory {
padding: 0.62em;
margin: 0.62em 0 0;
}

10
browser/components/downloads/content/downloadsPanel.inc.xhtml
Просмотреть файл

@ -146,15 +146,15 @@
crop="end"/> crop="end"/>
</vbox> </vbox>
</hbox> </hbox>
<vbox id="downloadsFooterButtons"> <hbox id="downloadsFooterButtons"
<toolbarseparator /> class="panel-footer panel-footer-menulike">
<toolbarbutton id="downloadsHistory" <button id="downloadsHistory"
data-l10n-id="downloads-history" data-l10n-id="downloads-history"
class="downloadsPanelFooterButton subviewbutton panel-subview-footer-button" class="downloadsPanelFooterButton"
flex="1" flex="1"
oncommand="DownloadsPanel.showDownloadsHistory();" oncommand="DownloadsPanel.showDownloadsHistory();"
pack="start"/> pack="start"/>
</vbox> </hbox>
</stack> </stack>
</vbox> </vbox>
</panelview> </panelview>

4
browser/themes/shared/controlcenter/panel.inc.css
Просмотреть файл

@ -906,6 +906,10 @@ description#identity-popup-content-verifier,
/* Protection popup footer categories */ /* Protection popup footer categories */
#protections-popup-footer {
padding: var(--vertical-section-padding) 0;
}
#protections-popup-trackers-blocked-counter-box { #protections-popup-trackers-blocked-counter-box {
margin-inline-end: var(--horizontal-padding); margin-inline-end: var(--horizontal-padding);
visibility: hidden; visibility: hidden;

15
browser/themes/shared/customizableui/panelUI.inc.css
Просмотреть файл

@ -512,6 +512,13 @@ panelview[id^=PanelUI-webext-] {
overflow: hidden; overflow: hidden;
} }
panelview:not([mainview]) .toolbarbutton-text,
.cui-widget-panel .toolbarbutton-text,
#overflowMenu-customize-button > .toolbarbutton-text {
text-align: start;
display: -moz-box;
}
.cui-widget-panel, .cui-widget-panel,
.cui-widget-panel::part(arrowcontent) { .cui-widget-panel::part(arrowcontent) {
--arrowpanel-padding: 4px 0; --arrowpanel-padding: 4px 0;
@ -1530,11 +1537,6 @@ panelview .toolbarbutton-1,
margin: 0; margin: 0;
} }
.subviewbutton > .toolbarbutton-text {
text-align: start;
display: -moz-box;
}
.panel-subview-footer-button { .panel-subview-footer-button {
margin-bottom: 6px; margin-bottom: 6px;
} }
@ -1818,10 +1820,9 @@ menuitem.panel-subview-footer@menuStateActive@,
.PanelUI-subView toolbarseparator, .PanelUI-subView toolbarseparator,
#permission-popup-mainView > toolbarseparator, #permission-popup-mainView > toolbarseparator,
#protections-popup-multiView toolbarseparator, #protections-popup-multiView toolbarseparator,
#identity-popup-mainView toolbarseparator, #identity-popup-mainView > toolbarseparator,
#identity-popup-securityView > toolbarseparator, #identity-popup-securityView > toolbarseparator,
#editBookmarkPanel toolbarseparator, #editBookmarkPanel toolbarseparator,
#downloadsPanel-mainView toolbarseparator,
.cui-widget-panelview menuseparator, .cui-widget-panelview menuseparator,
.cui-widget-panel toolbarseparator { .cui-widget-panel toolbarseparator {
appearance: none; appearance: none;

37
toolkit/themes/shared/popupnotification.inc.css
Просмотреть файл

@ -111,6 +111,12 @@ popupnotification {
margin: 8px 16px 16px; margin: 8px 16px 16px;
} }
.panel-footer.panel-footer-menulike {
margin-inline: 8px;
margin-bottom: 6px;
border-top: 1px solid var(--panel-separator-color);
}
.panel-footer > button { .panel-footer > button {
appearance: none; appearance: none;
border: 0; border: 0;
@ -121,6 +127,29 @@ popupnotification {
margin-inline: 8px 0; margin-inline: 8px 0;
} }
.panel-footer.panel-footer-menulike > button {
font-weight: unset;
padding: 8px;
margin: 4px 0 0;
}
.panel-footer.panel-footer-menulike > button:focus-visible {
box-shadow: var(--panelview-toolbarbutton-focus-box-shadow);
}
.panel-footer.panel-footer-menulike > button:hover:active {
color: inherit;
}
.panel-footer.panel-footer-menulike > button > .button-box {
padding: 0;
display: inline;
}
.panel-footer.panel-footer-menulike > button > .button-box > .button-text {
margin-inline: 0;
}
.panel-footer > .popup-notification-dropmarker { .panel-footer > .popup-notification-dropmarker {
margin-inline-start: 0; margin-inline-start: 0;
border-start-start-radius: 0; border-start-start-radius: 0;
@ -136,15 +165,15 @@ popupnotification {
color: var(--button-color, inherit); color: var(--button-color, inherit);
} }
.panel-footer > button { .panel-footer:not(.panel-footer-menulike) > button {
background-color: var(--button-bgcolor, color-mix(in srgb, currentColor 13%, transparent)); background-color: var(--button-bgcolor, color-mix(in srgb, currentColor 13%, transparent));
} }
.panel-footer > button[disabled] { .panel-footer:not(.panel-footer-menulike) > button[disabled] {
opacity: 0.4; opacity: 0.4;
} }
.panel-footer > button:focus-visible { .panel-footer:not(.panel-footer-menulike) > button:focus-visible {
outline: 2px solid var(--focus-outline-color); outline: 2px solid var(--focus-outline-color);
outline-offset: var(--focus-outline-offset, 2px); outline-offset: var(--focus-outline-offset, 2px);
} }
@ -170,7 +199,7 @@ popupnotification {
background-color: var(--button-primary-active-bgcolor); background-color: var(--button-primary-active-bgcolor);
} }
.panel-footer > button > .button-box { .panel-footer:not(.panel-footer-menulike) > button > .button-box {
padding: 0; padding: 0;
} }