Skip to content

Commit db3ec44

Browse files
committed
Backed out changeset 6d11e2f54668 (bug 1855875) for causing bug 1856697
1 parent 877d80b commit db3ec44

File tree

8 files changed

+27
-28
lines changed

8 files changed

+27
-28
lines changed

browser/base/content/appmenu-viewcache.inc.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,12 +699,12 @@
699699

700700
<html:moz-button-group id="reset-pbm-panel-footer" class="panel-footer">
701701
<button id="reset-pbm-panel-cancel-button"
702-
class="footer-button"
702+
class="panel-footer-button"
703703
data-l10n-id="reset-pbm-panel-cancel-button"
704704
oncommand="ResetPBMPanel.onCancel(this)"></button>
705705
<button slot="primary"
706706
id="reset-pbm-panel-confirm-button"
707-
class="footer-button"
707+
class="panel-footer-button"
708708
data-l10n-id="reset-pbm-panel-confirm-button"
709709
oncommand="ResetPBMPanel.onConfirm(this)"></button>
710710
</html:moz-button-group>

browser/base/content/main-popupset.inc.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,12 @@
192192
data-l10n-id="bookmark-panel"
193193
data-l10n-attrs="style">
194194
<button id="editBookmarkPanelDoneButton"
195-
class="footer-button"
195+
class="panel-footer-button"
196196
data-l10n-id="bookmark-panel-save-button"
197197
default="true"
198198
oncommand="StarUI.panel.hidePopup();"/>
199199
<button id="editBookmarkPanelRemoveButton"
200-
class="footer-button"
200+
class="panel-footer-button"
201201
oncommand="StarUI.removeBookmarkButtonCommand();"/>
202202
</html:moz-button-group>
203203
</vbox>

browser/components/controlcenter/content/protectionsPanel.inc.xhtml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,11 @@
372372
<html:moz-button-group id="protections-popup-sendReportView-footer"
373373
class="panel-footer">
374374
<button id="protections-popup-sendReportView-cancel"
375-
class="footer-button"
375+
class="panel-footer-button"
376376
data-l10n-id="protections-panel-content-blocking-breakage-report-view-cancel"
377377
oncommand="gProtectionsHandler._protectionsPopupMultiView.goBack();"/>
378378
<button id="protections-popup-sendReportView-submit"
379-
class="footer-button"
379+
class="panel-footer-button"
380380
default="true"
381381
data-l10n-id="protections-panel-content-blocking-breakage-report-view-send-report"
382382
oncommand="gProtectionsHandler.onSendReportClicked(); gProtectionsHandler.recordClick('send_report_submit');"/>
@@ -399,17 +399,17 @@
399399
<button id="protections-popup-cookieBannerView-cancel"
400400
data-l10n-id="protections-panel-cookie-banner-view-cancel"
401401
oncommand="gProtectionsHandler._protectionsPopupMultiView.goBack();"
402-
class="footer-button" />
402+
class="panel-footer-button" />
403403
<button id="protections-popup-cookieBannerView-enable-button"
404404
data-l10n-id="protections-panel-cookie-banner-view-turn-on"
405405
oncommand="gProtectionsHandler.onCookieBannerToggleCommand()"
406406
default="true"
407-
class="footer-button" />
407+
class="panel-footer-button" />
408408
<button id="protections-popup-cookieBannerView-disable-button"
409409
data-l10n-id="protections-panel-cookie-banner-view-turn-off"
410410
oncommand="gProtectionsHandler.onCookieBannerToggleCommand()"
411411
default="true"
412-
class="footer-button" />
412+
class="panel-footer-button" />
413413
</html:moz-button-group>
414414
</panelview>
415415
</panelmultiview>

browser/components/customizableui/content/customizeMode.inc.xhtml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
# NB: because oncommand fires after click, by the time we've fired, the checkbox binding
3030
# will already have switched the button's state, so this is correct:
3131
oncommand="gCustomizeMode.toggleTitlebar(this.checked)" data-l10n-id="customize-mode-titlebar"/>
32-
<button id="customization-toolbar-visibility-button" class="footer-button" type="menu" data-l10n-id="customize-mode-toolbars">
32+
<button id="customization-toolbar-visibility-button" class="customizationmode-button" type="menu" data-l10n-id="customize-mode-toolbars">
3333
<menupopup id="customization-toolbar-menu" onpopupshowing="onViewToolbarsPopupShowing(event)"/>
3434
</button>
3535
<button id="customization-uidensity-button"
3636
data-l10n-id="customize-mode-uidensity"
37-
class="footer-button"
37+
class="customizationmode-button"
3838
type="menu"
3939
hidden="true">
4040
<panel type="arrow" id="customization-uidensity-menu"
@@ -90,31 +90,30 @@
9090

9191
<button id="whimsy-button"
9292
type="checkbox"
93-
class="footer-button"
93+
class="customizationmode-button"
9494
oncommand="gCustomizeMode.togglePong(this.checked);"
9595
hidden="true"/>
9696

9797
<spacer id="customization-footer-spacer"/>
9898
#ifdef XP_MACOSX
9999
<button id="customization-touchbar-button"
100-
class="footer-button"
100+
class="customizationmode-button"
101101
hidden="true"
102102
oncommand="gCustomizeMode.customizeTouchBar();"
103103
data-l10n-id="customize-mode-touchbar-cmd"/>
104104
<spacer hidden="true" id="customization-touchbar-spacer"/>
105105
#endif
106106
<button id="customization-undo-reset-button"
107-
class="footer-button"
107+
class="customizationmode-button"
108108
hidden="true"
109109
oncommand="gCustomizeMode.undoReset();"
110110
data-l10n-id="customize-mode-undo-cmd"/>
111111
<button id="customization-reset-button"
112112
oncommand="gCustomizeMode.reset();"
113113
data-l10n-id="customize-mode-restore-defaults"
114-
class="footer-button"/>
114+
class="customizationmode-button"/>
115115
<button id="customization-done-button"
116116
oncommand="gCustomizeMode.exit();"
117117
data-l10n-id="customize-mode-done"
118-
default="true"
119-
class="footer-button"/>
118+
class="customizationmode-button"/>
120119
</hbox>

browser/components/downloads/content/downloadsPanel.inc.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,10 @@
182182
<html:moz-button-group id="downloadsPanel-blockedSubview-buttons"
183183
class="panel-footer">
184184
<button id="downloadsPanel-blockedSubview-unblockButton"
185-
class="footer-button"
185+
class="panel-footer-button"
186186
command="downloadsCmd_unblockAndOpen"/>
187187
<button id="downloadsPanel-blockedSubview-deleteButton"
188-
class="footer-button"
188+
class="panel-footer-button"
189189
oncommand="DownloadsBlockedSubview.confirmBlock();"
190190
default="true"/>
191191
</html:moz-button-group>

browser/components/translations/content/translationsPanel.inc.xhtml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,17 @@
8585

8686
<html:moz-button-group class="panel-footer translations-panel-footer">
8787
<button id="translations-panel-restore-button"
88-
class="footer-button"
88+
class="panel-footer-button"
8989
oncommand="TranslationsPanel.onRestore(event);"
9090
data-l10n-id="translations-panel-restore-button">
9191
</button>
9292
<button id="translations-panel-cancel"
93-
class="footer-button"
93+
class="panel-footer-button"
9494
oncommand="TranslationsPanel.onCancel(event);"
9595
data-l10n-id="translations-panel-translate-cancel">
9696
</button>
9797
<button id="translations-panel-translate"
98-
class="footer-button"
98+
class="panel-footer-button"
9999
oncommand="TranslationsPanel.onTranslate(event);"
100100
data-l10n-id="translations-panel-translate-button"
101101
default="true">
@@ -127,12 +127,12 @@
127127

128128
<html:moz-button-group class="panel-footer translations-panel-footer">
129129
<button id="translations-panel-change-source-language"
130-
class="footer-button"
130+
class="panel-footer-button"
131131
oncommand="TranslationsPanel.onChangeSourceLanguage(event);"
132132
data-l10n-id="translations-panel-error-change-button">
133133
</button>
134134
<button id="translations-panel-dismiss-error"
135-
class="footer-button"
135+
class="panel-footer-button"
136136
oncommand="TranslationsPanel.onCancel(event);"
137137
data-l10n-id="translations-panel-error-dismiss-button"
138138
default="true">

toolkit/content/widgets/popupnotification.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@
9696
</hbox>
9797
<hbox class="popup-notification-footer-container"></hbox>
9898
<html:moz-button-group class="panel-footer">
99-
<button class="popup-notification-secondary-button footer-button"/>
100-
<button type="menu" class="popup-notification-dropmarker footer-button" data-l10n-id="popup-notification-more-actions-button">
99+
<button class="popup-notification-secondary-button panel-footer-button"/>
100+
<button type="menu" class="popup-notification-dropmarker panel-footer-button" data-l10n-id="popup-notification-more-actions-button">
101101
<menupopup position="after_end" data-l10n-id="popup-notification-more-actions-button">
102102
</menupopup>
103103
</button>
104-
<button class="popup-notification-primary-button primary footer-button" data-l10n-id="popup-notification-default-button"/>
104+
<button class="popup-notification-primary-button primary panel-footer-button" data-l10n-id="popup-notification-default-button"/>
105105
</html:moz-button-group>
106106
`;
107107
}

toolkit/themes/shared/global-shared.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ button.text-link .button-text {
203203
margin: 8px 16px 16px;
204204
}
205205

206-
.footer-button {
206+
.panel-footer-button {
207207
appearance: none;
208208
border: 0;
209209
border-radius: 4px;

0 commit comments

Comments
 (0)