diff --git a/application/palemoon/components/abouthome/aboutHome.css b/application/palemoon/components/abouthome/aboutHome.css index 5fe96c2926..bb730b489d 100644 --- a/application/palemoon/components/abouthome/aboutHome.css +++ b/application/palemoon/components/abouthome/aboutHome.css @@ -7,7 +7,7 @@ html { font: message-box; font-size: 100%; - background-color: rgb(229,229,229); + background-color: #eee; color: #000; height: 100%; } @@ -18,8 +18,6 @@ body { -moz-box-orient: vertical; width: 100%; height: 100%; - background-image: url(chrome://browser/content/abouthome/noise.png), - linear-gradient(hsla(0,0%,100%,.7), hsla(0,0%,100%,.4)); } input, @@ -52,10 +50,6 @@ a { } /* SEARCH */ -#searchForm { - width: 470px; -} - #searchContainer { display: -moz-box; position: relative; @@ -63,25 +57,21 @@ a { margin: 10px 0 15px; } -#searchContainer[page-disabled] { - opacity: 0; - pointer-events: none; -} - #searchForm { + width: 470px; display: -moz-box; position: relative; - height: 36px; + height: 36px; /* 32 px logo + 2*1px pad + 2*1px border */ -moz-box-flex: 1; - max-width: 600px; /* 2 * (290 cell width + 10 cell margin) */ + max-width: 600px; } #searchEngineLogo { border: 1px transparent; - padding: 2px 4px 2px 2px; + padding: 4px; margin: 0; - width: 32px; - height: 32px; + width: 28px; + height: 28px; position: absolute; } @@ -89,77 +79,76 @@ a { -moz-box-flex: 1; padding-top: 6px; padding-bottom: 6px; - padding-inline-start: 42px; + padding-inline-start: 38px; /* room for logo */ padding-inline-end: 8px; - background: hsla(0,0%,100%,.9) padding-box; + background: rgba(255, 255, 255, 0.9) padding-box; border: 1px solid; - border-spacing: 0; - border-radius: 2px 0 0 2px; - border-color: hsla(228,54%,20%,.15) hsla(228,54%,20%,.17) hsla(228,54%,20%,.2); - box-shadow: 0 1px 0 hsla(228,65%,9%,.02) inset, - 0 0 2px hsla(228,65%,9%,.1) inset, - 0 1px 0 hsla(0,0%,100%,.2); - color: inherit; - unicode-bidi: plaintext; + border-color: rgba(37, 46, 65, 0.15) rgba(37, 46, 65, 0.17) rgba(37, 46, 65, 0.2); + box-shadow: 0 1px 0 rgba(37, 46, 65, 0.02) inset, + 0 0 2px rgba(37, 46, 65, 0.1) inset, + 0 1px 0 rgba(255, 255, 255, 0.2); + border-radius: 2.5px 0 0 2.5px; } -#searchText:dir(rtl) { - border-radius: 0 2px 2px 0; +#searchText:-moz-dir(rtl) { + border-radius: 0 2.5px 2.5px 0; } -#searchText[aria-expanded="true"] { - border-radius: 2px 0 0 0; +#searchText:focus, +#searchText[autofocus] { + border-color: rgba(92, 133, 214, 0.6) rgba(78, 114, 188, 0.6) rgba(41, 82, 163, 0.6); } -#searchText[aria-expanded="true"]:dir(rtl) { - border-radius: 0 2px 0 0; -} - -#searchText[keepfocus], -#searchText:focus { - border-color: hsla(234,0%,60%,.6) hsla(234,0%,52%,.6) hsla(234,0%,40%,.6); -} +#searchText::placeholder { + font-style: italic; + opacity: 0.3; +} #searchSubmit { margin-inline-start: -1px; + background: linear-gradient(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.1)) padding-box; padding: 0 9px; border: 1px solid; - background-color: #e0e0e0; - color: black; - border-color: hsla(234,0%,20%,.15) hsla(234,0%,20%,.17) hsla(234,0%,20%,.2); + border-color: rgba(37, 46, 65, 0.2) rgba(37, 46, 65, 0.2) rgba(37, 46, 65, 0.2); + border-inline-start: 1px solid transparent; border-radius: 0 2.5px 2.5px 0; - box-shadow: 0 0 2px hsla(0,0%,100%,.5) inset, - 0 1px 0 hsla(0,0%,100%,.2); + box-shadow: 0 0 2px rgba(255, 255, 255, 0.5) inset, + 0 1px 0 rgba(255, 255, 255, 0.2); cursor: pointer; - width: 50px; + transition-property: background-color, border-color, box-shadow; + transition-duration: 150ms; } -#searchSubmit:dir(rtl) { - border-radius: 2px 0 0 2px; +#searchSubmit:-moz-dir(rtl) { + border-radius: 2.5px 0 0 2.5px; } -#searchSubmit:hover { - background-color: hsl(220,54%,30%); +#searchText:focus + #searchSubmit, +#searchText + #searchSubmit:hover, +#searchText[autofocus] + #searchSubmit { + border-color: #8da1c8 #768bb5 #6579a2; color: white; } #searchText:focus + #searchSubmit, -#searchText + #searchSubmit:hover { - border-color: #808080; +#searchText[autofocus] + #searchSubmit { + background-image: linear-gradient(#85a8e0, #3d75cf); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, + 0 0 0 1px rgba(255, 255, 255, 0.1) inset, + 0 1px 0 rgba(23, 46, 67, 0.03); } -#searchText[keepfocus], -#searchText:focus, -#searchText[keepfocus] + #searchSubmit, -#searchText:focus + #searchSubmit -{ - box-shadow: 0 0 2px hsla(0,0%,100%,.5) inset, - 0 2px 4px 0px rgba(37,37,37,.2); -} +#searchText + #searchSubmit:hover { + background-image: linear-gradient(#85a8e0, #3d75cf); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, + 0 0 0 1px rgba(255, 255, 255, 0.1) inset, + 0 1px 0 rgba(23, 42, 79, 0.03), + 0 0 4px rgba(0, 34, 102, 0.2);} #searchText + #searchSubmit:hover:active { - background-color: hsl(220,24%,10%); - color: #a0a0a0; + box-shadow: 0 1px 1px rgba(3, 11, 27, 0.1) inset, + 0 0 1px rgba(3, 11, 27, 0.2) inset; + transition-duration: 0ms; } /* LAUNCHER */ @@ -168,10 +157,10 @@ a { -moz-box-align: center; -moz-box-pack: center; width: 100%; - background-color: rgba(0,0,0,.03); - border-top: 1px solid rgba(0,0,0,.03); - box-shadow: 0 1px 2px rgba(0,0,0,.02) inset, - 0 -1px 0 rgba(255,255,255,.25); + background-color: rgba(0, 0, 0, 0.03); + border-top: 1px solid rgba(0, 0, 0, 0.03); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.02) inset, + 0 -1px 0 rgba(255, 255, 255, 0.25); } #launcher:not([session]), @@ -193,12 +182,12 @@ body[narrow] #launcher[session] { white-space: normal; background: transparent padding-box; border: 1px solid transparent; - border-radius: 5px; + border-radius: 2.5px; color: #525c66; font-size: 75%; cursor: pointer; transition-property: background-color, border-color, box-shadow; - transition-duration: 120ms; + transition-duration: 150ms; } body[narrow] #launcher[session] > .launchButton { diff --git a/application/palemoon/components/abouthome/aboutHome.js b/application/palemoon/components/abouthome/aboutHome.js index 40f01298b5..686644673a 100644 --- a/application/palemoon/components/abouthome/aboutHome.js +++ b/application/palemoon/components/abouthome/aboutHome.js @@ -107,9 +107,9 @@ function setupSearchEngine() logoElt.src = searchEngineInfo.image; logoElt.alt = searchEngineName; searchText.placeholder = ""; - } - else { - logoElt.parentNode.hidden = true; + } else { + logoElt.parentNode.hidden = false; + logoElt.src = SEARCH_ENGINES['generic'].image; searchText.placeholder = searchEngineName; } diff --git a/application/palemoon/components/abouthome/jar.mn b/application/palemoon/components/abouthome/jar.mn index 14a0d85f2c..d9499347c0 100644 --- a/application/palemoon/components/abouthome/jar.mn +++ b/application/palemoon/components/abouthome/jar.mn @@ -6,9 +6,6 @@ browser.jar: * content/browser/abouthome/aboutHome.xhtml * content/browser/abouthome/aboutHome.js * content/browser/abouthome/aboutHome.css - content/browser/abouthome/noise.png - content/browser/abouthome/snippet1.png - content/browser/abouthome/snippet2.png content/browser/abouthome/downloads.png content/browser/abouthome/bookmarks.png content/browser/abouthome/history.png @@ -19,8 +16,6 @@ browser.jar: content/browser/abouthome/settings.png content/browser/abouthome/restore.png content/browser/abouthome/restore-large.png - content/browser/abouthome/snippet1@2x.png - content/browser/abouthome/snippet2@2x.png content/browser/abouthome/downloads@2x.png content/browser/abouthome/bookmarks@2x.png content/browser/abouthome/history@2x.png diff --git a/application/palemoon/components/abouthome/noise.png b/application/palemoon/components/abouthome/noise.png deleted file mode 100644 index 3467cf4d47..0000000000 Binary files a/application/palemoon/components/abouthome/noise.png and /dev/null differ diff --git a/application/palemoon/components/abouthome/snippet1.png b/application/palemoon/components/abouthome/snippet1.png deleted file mode 100644 index ce2ec55c23..0000000000 Binary files a/application/palemoon/components/abouthome/snippet1.png and /dev/null differ diff --git a/application/palemoon/components/abouthome/snippet1@2x.png b/application/palemoon/components/abouthome/snippet1@2x.png deleted file mode 100644 index f57cd0a827..0000000000 Binary files a/application/palemoon/components/abouthome/snippet1@2x.png and /dev/null differ diff --git a/application/palemoon/components/abouthome/snippet2.png b/application/palemoon/components/abouthome/snippet2.png deleted file mode 100644 index e0724fb6df..0000000000 Binary files a/application/palemoon/components/abouthome/snippet2.png and /dev/null differ diff --git a/application/palemoon/components/abouthome/snippet2@2x.png b/application/palemoon/components/abouthome/snippet2@2x.png deleted file mode 100644 index 40577f52f6..0000000000 Binary files a/application/palemoon/components/abouthome/snippet2@2x.png and /dev/null differ diff --git a/application/palemoon/components/newtab/newTab.css b/application/palemoon/components/newtab/newTab.css index 9d0ef5612d..3cbcf452f9 100644 --- a/application/palemoon/components/newtab/newTab.css +++ b/application/palemoon/components/newtab/newTab.css @@ -13,7 +13,7 @@ body { height: 100%; padding: 0; margin: 0; - background-color: rgb(229,229,229); + background-color: #eee; display: -moz-box; position: relative; -moz-box-flex: 1; @@ -236,17 +236,13 @@ input[type=button] { margin: 10px 0 15px; } -#searchContainer[page-disabled] { - opacity: 0; - pointer-events: none; -} - #searchForm { + width: 470px; display: -moz-box; position: relative; - height: 36px; + height: 36px; /* 32 px logo + 2*1px pad + 2*1px border */ -moz-box-flex: 1; - max-width: 600px; /* 2 * (290 cell width + 10 cell margin) */ + max-width: 600px; } #searchEngineLogo { @@ -262,77 +258,76 @@ input[type=button] { -moz-box-flex: 1; padding-top: 6px; padding-bottom: 6px; - padding-inline-start: 42px; + padding-inline-start: 38px; /* room for logo */ padding-inline-end: 8px; - background: hsla(0,0%,100%,.9) padding-box; + background: rgba(255, 255, 255, 0.9) padding-box; border: 1px solid; - border-spacing: 0; - border-radius: 2px 0 0 2px; - border-color: hsla(228,54%,20%,.15) hsla(228,54%,20%,.17) hsla(228,54%,20%,.2); - box-shadow: 0 1px 0 hsla(228,65%,9%,.02) inset, - 0 0 2px hsla(228,65%,9%,.1) inset, - 0 1px 0 hsla(0,0%,100%,.2); - color: inherit; - unicode-bidi: plaintext; + border-color: rgba(37, 46, 65, 0.15) rgba(37, 46, 65, 0.17) rgba(37, 46, 65, 0.2); + box-shadow: 0 1px 0 rgba(37, 46, 65, 0.02) inset, + 0 0 2px rgba(37, 46, 65, 0.1) inset, + 0 1px 0 rgba(255, 255, 255, 0.2); + border-radius: 2.5px 0 0 2.5px; } -#searchText:dir(rtl) { - border-radius: 0 2px 2px 0; +#searchText:-moz-dir(rtl) { + border-radius: 0 2.5px 2.5px 0; } -#searchText[aria-expanded="true"] { - border-radius: 2px 0 0 0; +#searchText:focus, +#searchText[autofocus] { + border-color: rgba(92, 133, 214, 0.6) rgba(78, 114, 188, 0.6) rgba(41, 82, 163, 0.6); } -#searchText[aria-expanded="true"]:dir(rtl) { - border-radius: 0 2px 0 0; -} - -#searchText[keepfocus], -#searchText:focus { - border-color: hsla(234,0%,60%,.6) hsla(234,0%,52%,.6) hsla(234,0%,40%,.6); +#searchText::placeholder { + font-style: italic; + opacity: 0.3; } #searchSubmit { margin-inline-start: -1px; + background: linear-gradient(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.1)) padding-box; padding: 0 9px; border: 1px solid; - background-color: #e0e0e0; - color: black; - border-color: hsla(234,0%,20%,.15) hsla(234,0%,20%,.17) hsla(234,0%,20%,.2); + border-color: rgba(37, 46, 65, 0.2) rgba(37, 46, 65, 0.2) rgba(37, 46, 65, 0.2); + border-inline-start: 1px solid transparent; border-radius: 0 2.5px 2.5px 0; - box-shadow: 0 0 2px hsla(0,0%,100%,.5) inset, - 0 1px 0 hsla(0,0%,100%,.2); + box-shadow: 0 0 2px rgba(255, 255, 255, 0.5) inset, + 0 1px 0 rgba(255, 255, 255, 0.2); cursor: pointer; - width: 50px; + transition-property: background-color, border-color, box-shadow; + transition-duration: 150ms; } -#searchSubmit:dir(rtl) { - border-radius: 2px 0 0 2px; +#searchSubmit:-moz-dir(rtl) { + border-radius: 2.5px 0 0 2.5px; } -#searchSubmit:hover { - background-color: hsl(220,54%,30%); +#searchText:focus + #searchSubmit, +#searchText + #searchSubmit:hover, +#searchText[autofocus] + #searchSubmit { + border-color: #8da1c8 #768bb5 #6579a2; color: white; } #searchText:focus + #searchSubmit, -#searchText + #searchSubmit:hover { - border-color: #808080; +#searchText[autofocus] + #searchSubmit { + background-image: linear-gradient(#85a8e0, #3d75cf); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, + 0 0 0 1px rgba(255, 255, 255, 0.1) inset, + 0 1px 0 rgba(23, 46, 67, 0.03); } -#searchText[keepfocus], -#searchText:focus, -#searchText[keepfocus] + #searchSubmit, -#searchText:focus + #searchSubmit -{ - box-shadow: 0 0 2px hsla(0,0%,100%,.5) inset, - 0 2px 4px 0px rgba(37,37,37,.2); -} +#searchText + #searchSubmit:hover { + background-image: linear-gradient(#85a8e0, #3d75cf); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, + 0 0 0 1px rgba(255, 255, 255, 0.1) inset, + 0 1px 0 rgba(23, 42, 79, 0.03), + 0 0 4px rgba(0, 34, 102, 0.2);} #searchText + #searchSubmit:hover:active { - background-color: hsl(220,24%,10%); - color: #a0a0a0; + box-shadow: 0 1px 1px rgba(3, 11, 27, 0.1) inset, + 0 0 1px rgba(3, 11, 27, 0.2) inset; + transition-duration: 0ms; } .contentSearchSuggestionTable { diff --git a/application/palemoon/components/newtab/page.js b/application/palemoon/components/newtab/page.js index a982e001aa..9088c89f16 100644 --- a/application/palemoon/components/newtab/page.js +++ b/application/palemoon/components/newtab/page.js @@ -108,14 +108,14 @@ var gPage = { this._initialized = true; - // XXX: this comment makes no sense for what it does. There's no HC check, - // and it changes the button unconditionally to a "play" button. Which is - // wrong for search. Commented out for now. - // + // XXX: This comment makes no sense for what it does. There is no HC check, + // and it changes the button unconditionally to a "play" button, which is + // wrong for a search action. Commented out for now. + // Set submit button label for when CSS background are disabled (e.g. // high contrast mode). - // document.getElementById("searchSubmit").value = - // document.body.getAttribute("dir") == "ltr" ? "\u25B6" : "\u25C0"; + //document.getElementById("searchSubmit").value = + // document.body.getAttribute("dir") == "ltr" ? "\u25B6" : "\u25C0"; if (document.hidden) { addEventListener("visibilitychange", this); diff --git a/application/palemoon/components/newtab/search.js b/application/palemoon/components/newtab/search.js index f574003bb5..78bc171ef6 100644 --- a/application/palemoon/components/newtab/search.js +++ b/application/palemoon/components/newtab/search.js @@ -88,7 +88,8 @@ function setupSearchEngine() { logoElt.alt = searchEngineName; searchText.placeholder = ""; } else { - logoElt.parentNode.hidden = true; + logoElt.parentNode.hidden = false; + logoElt.src = SEARCH_ENGINES['generic'].image; searchText.placeholder = searchEngineName; } } diff --git a/application/palemoon/components/preferences/privacy.js b/application/palemoon/components/preferences/privacy.js index 7b319c3ee6..05ed3bcdd3 100644 --- a/application/palemoon/components/preferences/privacy.js +++ b/application/palemoon/components/preferences/privacy.js @@ -19,41 +19,15 @@ var gPrivacyPane = { /** * Sets up the UI for the number of days of history to keep, and updates the * label of the "Clear Now..." button. - * Also restores the previously selected tab or tab index passed as argument. */ init: function() { - this._inited = true; - var privacyPrefs = document.getElementById("privacyPrefs"); - - var extraArgs = window.arguments[1]; - if (extraArgs && extraArgs["privacyTab"]){ - privacyPrefs.selectedTab = document.getElementById(extraArgs["privacyTab"]); - } else { - var preference = document.getElementById("browser.preferences.privacy.selectedTabIndex"); - if (preference.value !== null) - privacyPrefs.selectedIndex = preference.value; - } - this._updateSanitizeSettingsButton(); this.initializeHistoryMode(); this.updateHistoryModePane(); this.updatePrivacyMicroControls(); this.initAutoStartPrivateBrowsingReverter(); }, - - /** - * Stores the identity of the current tab in preferences so that the selected - * tab can be persisted between openings of the preferences window. - */ - tabSelectionChanged: function() - { - if (!this._inited) - return; - var privacyPrefs = document.getElementById("privacyPrefs"); - var preference = document.getElementById("browser.preferences.privacy.selectedTabIndex"); - preference.valueFromPreferences = privacyPrefs.selectedIndex; - }, // HISTORY MODE diff --git a/application/palemoon/components/preferences/privacy.xul b/application/palemoon/components/preferences/privacy.xul index 25ce8843d5..50b89f1620 100644 --- a/application/palemoon/components/preferences/privacy.xul +++ b/application/palemoon/components/preferences/privacy.xul @@ -22,10 +22,6 @@ - -