From a1be17c1cea81ebb1e8b131a662c698d78f3f7f2 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 4 Jun 2018 13:17:38 +0200 Subject: Issue #303 Part 1: Move basilisk files from /browser to /application/basilisk --- .../basilisk/themes/osx/preferences/alwaysAsk.png | Bin 0 -> 530 bytes .../themes/osx/preferences/application.png | Bin 0 -> 795 bytes .../themes/osx/preferences/applications.css | 73 ++++++++++++ .../themes/osx/preferences/in-content/dialog.css | 36 ++++++ .../osx/preferences/in-content/preferences.css | 53 +++++++++ .../themes/osx/preferences/preferences.css | 131 +++++++++++++++++++++ .../basilisk/themes/osx/preferences/saveFile.png | Bin 0 -> 570 bytes 7 files changed, 293 insertions(+) create mode 100644 application/basilisk/themes/osx/preferences/alwaysAsk.png create mode 100644 application/basilisk/themes/osx/preferences/application.png create mode 100644 application/basilisk/themes/osx/preferences/applications.css create mode 100644 application/basilisk/themes/osx/preferences/in-content/dialog.css create mode 100644 application/basilisk/themes/osx/preferences/in-content/preferences.css create mode 100644 application/basilisk/themes/osx/preferences/preferences.css create mode 100644 application/basilisk/themes/osx/preferences/saveFile.png (limited to 'application/basilisk/themes/osx/preferences') diff --git a/application/basilisk/themes/osx/preferences/alwaysAsk.png b/application/basilisk/themes/osx/preferences/alwaysAsk.png new file mode 100644 index 000000000..c792d1488 Binary files /dev/null and b/application/basilisk/themes/osx/preferences/alwaysAsk.png differ diff --git a/application/basilisk/themes/osx/preferences/application.png b/application/basilisk/themes/osx/preferences/application.png new file mode 100644 index 000000000..b4c1ca7d0 Binary files /dev/null and b/application/basilisk/themes/osx/preferences/application.png differ diff --git a/application/basilisk/themes/osx/preferences/applications.css b/application/basilisk/themes/osx/preferences/applications.css new file mode 100644 index 000000000..8a4a01500 --- /dev/null +++ b/application/basilisk/themes/osx/preferences/applications.css @@ -0,0 +1,73 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/** + * Line up the actions menu with action labels above and below it. + * Equalize the distance from the left side of the action box to the left side + * of the icon for both the menu and the non-menu versions of the action box. + * Also make sure the labels are the same distance away from the icons. + */ +.actionsMenu { + margin-inline-start: -2px; + margin-top: 0; + margin-bottom: -1px; +} + +#handlersView > richlistitem label { + margin-inline-start: 3px; + margin-top: 2px; +} + +#handlersView > richlistitem { + min-height: 22px; +} + +.typeIcon, +.actionIcon { + margin-inline-start: 3px; +} + +.typeIcon, +.actionIcon, +.actionsMenu .menulist-icon { + margin-inline-end: 2px; +} + +.actionsMenu > menupopup > menuitem > .menu-iconic-left { + /* Undo content/browser/preferences/handlers.css - we don't + * want icon-less labels to line up with the other labels. + */ + min-width: 0; +} + +richlistitem[appHandlerIcon="ask"], +menuitem[appHandlerIcon="ask"] { + list-style-image: url("chrome://browser/skin/preferences/alwaysAsk.png"); +} + +richlistitem[appHandlerIcon="save"], +menuitem[appHandlerIcon="save"] { + list-style-image: url("chrome://browser/skin/preferences/saveFile.png"); +} + +richlistitem[appHandlerIcon="feed"], +menuitem[appHandlerIcon="feed"] { + list-style-image: url("chrome://browser/skin/page-livemarks.png"); +} + +richlistitem[appHandlerIcon="plugin"], +menuitem[appHandlerIcon="plugin"] { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png"); +} + +/* Repeat what menu.css does for .menuitem-iconic */ +menuitem[appHandlerIcon] { + padding-top: 1px; + padding-bottom: 3px; +} + +menuitem[appHandlerIcon] > .menu-iconic-left > .menu-iconic-icon { + margin-inline-start: 0; + width: 16px; +} diff --git a/application/basilisk/themes/osx/preferences/in-content/dialog.css b/application/basilisk/themes/osx/preferences/in-content/dialog.css new file mode 100644 index 000000000..46a6cb91c --- /dev/null +++ b/application/basilisk/themes/osx/preferences/in-content/dialog.css @@ -0,0 +1,36 @@ +/* - This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this file, + - You can obtain one at http://mozilla.org/MPL/2.0/. */ + +%include ../../../shared/incontentprefs/dialog.inc.css + +prefwindow, +.windowDialog { + font: message-box !important; +} + +label:not(.menu-text), +textbox, +description, +.tab-text, +caption > label { + font-size: 1.3em; +} + +/* Create a separate rule to unset these styles on .tree-input instead of + using :not(.tree-input) so the selector specifity doesn't change. */ +textbox.tree-input { + font-size: unset; +} + +button { + font-size: 1em; +} + +caption { + font: message-box; +} + +.prefWindow-dlgbuttons { + margin: 0; +} diff --git a/application/basilisk/themes/osx/preferences/in-content/preferences.css b/application/basilisk/themes/osx/preferences/in-content/preferences.css new file mode 100644 index 000000000..c59b08283 --- /dev/null +++ b/application/basilisk/themes/osx/preferences/in-content/preferences.css @@ -0,0 +1,53 @@ +/* - This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this file, + - You can obtain one at http://mozilla.org/MPL/2.0/. */ + +%include ../../../shared/incontentprefs/preferences.inc.css + +prefpane .groupbox-title { + background: none; + margin-bottom: 0; +} + +.actionsMenu > .menulist-label-box > .menulist-icon { + margin-top: 2px; + margin-inline-start: 2px; + margin-inline-end: 8px !important; +} + +#downloadFolder > .fileFieldContentBox { + padding-inline-start: 3px; +} + +#fxaProfileImage { + -moz-user-focus: normal; +} + +textbox + button { + margin-inline-start: -4px; +} + +filefield + button { + margin-inline-start: -8px; +} + +#popupPolicyRow { + /* Override styles from + browser/themes/osx/preferences/preferences.css */ + margin-bottom: 0 !important; + padding-bottom: 0 !important; + border-bottom: none; +} + +#advancedPrefs { + margin-right: 0; /*override margin from normal preferences.css */ + margin-left: 0; +} + +/** + * Dialog + */ + +#dialogTitle { + font-size: 1.1em; +} diff --git a/application/basilisk/themes/osx/preferences/preferences.css b/application/basilisk/themes/osx/preferences/preferences.css new file mode 100644 index 000000000..da0e66b6e --- /dev/null +++ b/application/basilisk/themes/osx/preferences/preferences.css @@ -0,0 +1,131 @@ +/* +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ + +%include ../../../../toolkit/themes/osx/global/shared.inc + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); + +.windowDialog { + padding: 12px; + font: -moz-dialog; +} + +/* ----- APPLICATIONS PREFPANE ----- */ +description { + font: small-caption; + font-weight: normal; + line-height: 1.3em; + margin-bottom: 4px !important; +} + +prefpane .groupbox-body { + -moz-appearance: none; + padding: 8px 4px 4px 4px; +} + +prefpane .groupbox-title { + background: url("chrome://global/skin/50pct_transparent_grey.png") repeat-x bottom left; + margin-bottom: 4px; +} + +tabpanels { + padding: 20px 7px 7px; +} + +caption { + padding-inline-start: 5px; + padding-top: 4px; + padding-bottom: 2px; +} + +#popupPolicyRow { + margin-bottom: 4px !important; + padding-bottom: 4px !important; + border-bottom: 1px solid #ccc; +} + +#translationAttributionImage { + width: 70px; + cursor: pointer; +} + +#browserUseCurrent, +#browserUseBookmark, +#browserUseBlank { + margin-top: 10px; +} + +#advancedPrefs { + margin: 0 8px; +} + +#privacyPrefs { + padding: 0 4px; +} + +#privacyPrefs > tabpanels { + padding: 18px 10px 10px; +} + +#OCSPDialogPane { + font: message-box !important; +} + +/* General Pane */ + +#useFirefoxSync, +#getStarted { + font-size: 90%; +} + +#isNotDefaultLabel { + font-weight: bold; +} + +/** + * Update Preferences + */ +#autoInstallOptions { + margin-inline-start: 20px; +} + +.updateControls { + margin-inline-start: 10px; +} + +/** + * Clear Private Data + */ +#SanitizeDialogPane > groupbox { + margin-top: 0; +} + + +/* ----- SYNC PANE ----- */ + +#syncDesc { + padding: 0 8em; +} + +#accountCaptionImage { + list-style-image: url("chrome://mozapps/skin/profile/profileicon.png"); +} + +#syncAddDeviceLabel { + margin-top: 1em; + margin-bottom: 1em; +} + +#noFxaAccount { + margin: 12px 4px; + line-height: 1.2em; +} + +#noFxaAccount > label:first-child { + margin-bottom: 0.6em; +} diff --git a/application/basilisk/themes/osx/preferences/saveFile.png b/application/basilisk/themes/osx/preferences/saveFile.png new file mode 100644 index 000000000..7177f8df3 Binary files /dev/null and b/application/basilisk/themes/osx/preferences/saveFile.png differ -- cgit v1.2.3 From fd614f7ced316722a98afdfd0219fac6ffb02551 Mon Sep 17 00:00:00 2001 From: SpockFan02 Date: Tue, 5 Jun 2018 00:59:02 +0000 Subject: Fix a file path for macOS Tag #286 --- application/basilisk/themes/osx/preferences/preferences.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/basilisk/themes/osx/preferences') diff --git a/application/basilisk/themes/osx/preferences/preferences.css b/application/basilisk/themes/osx/preferences/preferences.css index da0e66b6e..4f17ec58d 100644 --- a/application/basilisk/themes/osx/preferences/preferences.css +++ b/application/basilisk/themes/osx/preferences/preferences.css @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -%include ../../../../toolkit/themes/osx/global/shared.inc +%include ../../../../../toolkit/themes/osx/global/shared.inc @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); @namespace html url("http://www.w3.org/1999/xhtml"); -- cgit v1.2.3