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

Bug 1613758 - Update the Account Manager in Tab UI to match the Preferences Tab UI. r=aleca

This commit is contained in:
Richard Marti 2020-02-11 21:16:14 +01:00
Родитель 5f25e3440c
Коммит 93e30df23b
20 изменённых файлов: 176 добавлений и 79 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
chat/content/imAccountOptionsHelper.js
Просмотреть файл

@ -91,7 +91,7 @@ var accountOptionsHelper = {
break;
case Ci.prplIPref.typeString:
vbox.appendChild(
this.createTextbox(null, opt.getString(), text, name)
this.createTextbox("text", opt.getString(), text, name)
);
break;
case Ci.prplIPref.typeList:

1
mail/components/im/content/am-im.xhtml
Просмотреть файл

@ -4,7 +4,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % imDTD SYSTEM "chrome://messenger/locale/am-im.dtd">

12
mail/themes/linux/mail/accountManage.css
Просмотреть файл

@ -4,7 +4,19 @@
@import url("chrome://messenger/skin/shared/accountManage.css");
window > vbox,
#accountTreeBox {
font-size: 1.11em;
}
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
list-style-image: url("chrome://messenger/skin/icons/server.png");
-moz-image-region: rect(16px 64px 32px 48px);
}
#accountActionsButton > .button-box > .button-menu-dropmarker {
margin-inline-end: 4px;
list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
-moz-context-properties: fill;
fill: currentColor;
}

19
mail/themes/osx/mail/accountManage.css
Просмотреть файл

@ -4,9 +4,9 @@
@import url("chrome://messenger/skin/shared/accountManage.css");
#accounttree {
margin-inline-end: 8px;
window > vbox,
#accountTreeBox {
font-size: 1.36em;
}
treechildren::-moz-tree-cell-text(folderNameCol, isServer-true) {
@ -41,9 +41,12 @@ description {
background-color: #FFFFFF;
}
/* ::::: dialog header ::::: */
.dialogheader {
margin: 0 5px 5px;
padding: 5px 8px;
#accountActionsButton> .button-box > .button-menu-dropmarker {
-moz-appearance: none;
display: -moz-box;
list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
-moz-context-properties: fill;
fill: currentColor;
width: 12px;
height: 12px;
}

156
mail/themes/shared/mail/accountManage.css
Просмотреть файл

@ -7,9 +7,103 @@
======================================================================= */
@import url("chrome://messenger/skin/");
@import url("chrome://global/skin/in-content/common.css");
@import url("chrome://messenger/skin/preferences/preferences.css");
window > vbox {
padding-block: 40px;
padding-inline: 25px 28px;
}
groupbox {
-moz-appearance: none;
border-style: none;
margin: 0 0 32px;
padding: initial;
}
#accountTreeBox {
margin-block: 28px;
margin-inline: 28px 3px;
}
/* Styles for the Account Actions button */
#accountActionsButton {
margin-inline: 0;
}
#accountActionsDropdown {
-moz-appearance: none;
min-width: 32ch;
font-size: 1em;
border: 1px solid var(--in-content-box-border-color);
border-radius: 2px;
background-color: var(--in-content-box-background);
}
#accountActionsDropdown menuitem {
-moz-appearance: none;
color: var(--in-content-text-color);
padding-block: 0.2em;
padding-inline: 10px 30px;
}
#accountActionsDropdown > menuitem:not([disabled="true"])[_moz-menuactive="true"] {
color: var(--in-content-text-color);
background-color: var(--in-content-item-hover);
}
#accountActionsDropdown > menuitem:not([disabled="true"])[selected="true"] {
color: var(--in-content-selected-text);
background-color: var(--in-content-item-selected);
}
#accountActionsDropdown > menuitem[disabled="true"] {
color: #999;
/* override the [_moz-menuactive="true"] background color from
global/menu.css */
background-color: transparent;
}
#accountActionsDropdown menuseparator {
-moz-appearance: none;
margin: 0;
padding: 0;
border-top: 1px solid var(--in-content-box-border-color);
border-bottom: none;
}
/* ::::: account manager :::::: */
.header {
font-size: 1.1em;
font-weight: 600;
line-height: 1.4em;
margin-block: 16px 4px;
padding-bottom: 0;
}
.input-container:not([hidden="true"]) {
display: flex;
}
.input-container:not([hidden="true"]) > .input-inline {
flex: 1;
}
.identity-table {
margin-inline-end: 14px;
}
.folderMenuItem > .menulist-dropmarker {
-moz-image-region: auto;
}
menupopup[is="folder-menupopup"] {
-moz-appearance: none;
}
.specialFolderPickerGrid {
margin-inline-start: 20px;
}
@ -39,8 +133,9 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
width: 1ch;
}
#accountActionsDropdown {
min-width: 30ch;
.label-inline {
margin-block: auto;
min-width: 200px;
}
/* ::::: SMTP Server Panel :::::: */
@ -50,15 +145,30 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
}
#backgroundBox {
background-color: #FFFFFF;
opacity: 0.5;
background-color: var(--in-content-box-background);
}
#smtpServerInfoBox {
border: 1px solid ThreeDShadow;
border-right-color: ThreeDHighlight;
border-bottom-color: ThreeDHighlight;
margin: 0 5px 5px;
background-color: var(--in-content-box-background);
margin: 0 6px 5px;
}
#smtpServerInfoBox label {
height: 30px;
margin-block: 0;
padding-block: 3px;
}
#smtpServerInfoBox .input-container {
display: flex;
height: 30px;
}
.input-container > .plain {
flex: 1;
background-color: transparent;
border-style: none;
padding-block: 0;
}
#smtpServerInfoBox textbox {
@ -71,18 +181,13 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
/* ::::: dialog header ::::: */
.dialogheader {
margin: 0 5px 5px;
border: 1px solid ThreeDDarkShadow;
padding: 5px 8px;
background-color: Highlight;
color: HighlightText;
}
.dialogheader-title {
margin: 0 !important;
font-size: larger;
font-weight: bold;
margin-block: 0 8px;
margin-inline-start: 0;
font-size: 1.46em;
font-weight: 300;
line-height: 1.3em;
color: var(--in-content-text-color);
}
.identity-table th {
@ -97,16 +202,3 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-im) {
.identity-table td input {
width: 100%;
}
input[type="number"].size2 {
width: calc(2ch + 30px);
}
input[type="number"].size3 {
width: calc(3ch + 30px);
}
input[type="number"].size4 {
width: calc(4ch + 30px);
}
input[type="number"].size5 {
width: calc(5ch + 30px);
}

5
mail/themes/windows/mail/accountManage.css
Просмотреть файл

@ -4,6 +4,11 @@
@import url("chrome://messenger/skin/shared/accountManage.css");
window > vbox,
#accountTreeBox {
font-size: 1.25em;
}
treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-smtp) {
list-style-image: url("chrome://messenger/skin/icons/server.png");
-moz-image-region: rect(16px 64px 32px 48px);

2
mailnews/base/prefs/content/AccountManager.xhtml
Просмотреть файл

@ -24,7 +24,7 @@
<script src="chrome://messenger/content/amUtils.js"/>
<hbox flex="1">
<vbox style="&accountTree.width;">
<vbox id="accountTreeBox" style="&accountTree.width;">
<tree flex="1" onselect="onAccountTreeSelect(null, null);" id="accounttree"
seltype="single" hidecolumnpicker="true">
<treecols>

2
mailnews/base/prefs/content/am-copies.xhtml
Просмотреть файл

@ -4,9 +4,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd">

1
mailnews/base/prefs/content/am-identities-list.xhtml
Просмотреть файл

@ -36,7 +36,6 @@
<hbox flex="1">
<richlistbox id="identitiesList"
class="theme-listbox"
ondblclick="onEdit(event);"
onselect="updateButtons();"
seltype="single"

1
mailnews/base/prefs/content/am-identity-edit.xhtml
Просмотреть файл

@ -6,7 +6,6 @@
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % identityEditDTD SYSTEM "chrome://messenger/locale/am-identity-edit.dtd" >

7
mailnews/base/prefs/content/am-junk.xhtml
Просмотреть файл

@ -2,12 +2,9 @@
<!-- 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/.
-->
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
<!DOCTYPE window [
@ -99,7 +96,7 @@
<label id="whiteListLabel"
accesskey="&whitelistHeader.accesskey;"
control="whiteListAbURI">&whitelistHeader.label;</label>
<richlistbox id="whiteListAbURI" class="theme-listbox" height="100px"/>
<richlistbox id="whiteListAbURI" height="200px"/>
</vbox>
<separator/>

3
mailnews/base/prefs/content/am-main.xhtml
Просмотреть файл

@ -4,7 +4,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-main.dtd" >
@ -119,7 +118,7 @@
</html:tr>
</html:table>
<hbox class="indent" flex="1" style="min-height: 50px;display: flex;align-items: stretch;">
<hbox class="indent" flex="1" style="min-height: 100px; display: flex; align-items: stretch;">
<html:textarea id="identity.htmlSigText" wsm_persist="true" rows="4" style="flex-grow: 1;"
prefstring="mail.identity.%identitykey%.htmlSigText" class="signatureBox"/>
</hbox>

1
mailnews/base/prefs/content/am-offline.xhtml
Просмотреть файл

@ -3,7 +3,6 @@
- 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-offline.dtd">

1
mailnews/base/prefs/content/am-server-advanced.xhtml
Просмотреть файл

@ -7,7 +7,6 @@
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-advanced.dtd">

10
mailnews/base/prefs/content/am-server.xhtml
Просмотреть файл

@ -4,10 +4,8 @@
- file, You can obtain one at https://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/content/am-server.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % trashDTD SYSTEM "chrome://messenger/locale/am-server-top.dtd">
@ -69,7 +67,7 @@
<xul:label id="fixedServerPort"
collapsed="true" use="server.port"/>
<html:input id="server.port" type="number"
class="size3 input-inline"
class="size3"
min="1" max="65535"
wsm_persist="true"
preftype="int"
@ -171,7 +169,7 @@
prefattribute="value"
prefstring="mail.server.%serverkey%.check_new_mail"/>
<html:input id="server.biffMinutes" type="number"
class="size3 input-inline" min="1"
class="size3" min="1"
wsm_persist="true"
aria-labelledby="server.doBiff server.biffMinutes biffEnd"
preftype="int"
@ -219,7 +217,7 @@
prefattribute="value"
prefstring="mail.server.%serverkey%.delete_by_age_from_server"/>
<html:input id="pop3.numDaysToLeaveOnServer" type="number"
class="size3 input-inline" min="1"
class="size3" min="1"
wsm_persist="true"
aria-labelledby="pop3.deleteByAgeFromServer pop3.numDaysToLeaveOnServer daysEnd"
preftype="int"
@ -341,7 +339,7 @@
prefattribute="value"
prefstring="mail.server.%serverkey%.notify.on"/>
<html:input id="nntp.maxArticles" type="number"
class="size4 input-inline" min="1"
class="size4" min="1"
wsm_persist="true"
aria-labelledby="nntp.notifyOn nntp.maxArticles maxMessagesEnd"
preftype="int"

6
mailnews/base/prefs/content/am-serverwithnoidentities.xhtml
Просмотреть файл

@ -4,7 +4,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % accountNoIdentDTD SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >%accountNoIdentDTD;
@ -20,6 +19,7 @@
<script src="chrome://messenger/content/am-serverwithnoidentities.js"/>
<script src="chrome://messenger/content/amUtils.js"/>
<vbox>
<hbox class="dialogheader">
<label class="dialogheader-title" value="&accountTitle.label;"/>
</hbox>
@ -33,14 +33,13 @@
id="server.storeContractID"/>
<description class="secDesc">&accountSettingsDesc.label;</description>
<hbox align="center" class="input-container">
<hbox align="center">
<label id="server.prettyName.label" value="&accountName.label;"
control="server.prettyName" accesskey="&accountName.accesskey;"/>
<html:input id="server.prettyName"
type="text"
wsm_persist="true"
size="30"
class="input-inline"
onblur="parent.setAccountLabel(gAccount.key, null, this.value);"
prefstring="mail.server.%serverkey%.name"
aria-labelledby="server.prettyName.label"/>
@ -94,4 +93,5 @@
oncommand="BrowseForLocalFolders()"/>
</hbox>
</groupbox>
</vbox>
</window>

2
mailnews/base/prefs/content/am-smtp.xhtml
Просмотреть файл

@ -4,7 +4,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd">
@ -30,7 +29,6 @@
<hbox flex="1">
<richlistbox id="smtpList"
class="theme-listbox"
onselect="gSmtpServerListWindow.onSelectionChanged(event);"
ondblclick="gSmtpServerListWindow.onEditServer(event);"
seltype="single"

7
mailnews/extensions/newsblog/content/am-newsblog.xhtml
Просмотреть файл

@ -5,7 +5,6 @@
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger-newsblog/skin/feed-subscriptions.css" type="text/css"?>
<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
<!DOCTYPE window [
<!ENTITY % newsblogDTD SYSTEM "chrome://messenger-newsblog/locale/am-newsblog.dtd" >
@ -39,11 +38,11 @@
<description class="secDesc">&accountSettingsDesc.label;</description>
<hbox align="center" class="input-container">
<hbox align="center">
<label id="server.prettyNameLabel" value="&accountName.label;"
accesskey="&accountName.accesskey;"
control="server.prettyName"/>
<html:input id="server.prettyName" type="text" class="input-inline"
<html:input id="server.prettyName" type="text"
wsm_persist="true"
size="30"
aria-labelled-by="server.prettyNameLabel"
@ -137,7 +136,7 @@
<label id="server.localPathLabel" value="&localPath.label;" control="server.localPath"/>
<hbox align="center" class="input-container">
<html:input id="server.localPath" type="text" readonly="readonly"
class="uri-element input-filefield"
class="uri-element input-inline"
aria-labelledby="server.localPathLabel"
wsm_persist="true"
datatype="nsIFile"

16
mailnews/extensions/smime/content/am-smime.inc.xhtml
Просмотреть файл

@ -86,13 +86,15 @@
</groupbox>
<!-- Certificate manager -->
<groupbox id="smimeCertificateManager" orient="horizontal">
<groupbox id="smimeCertificateManager">
<label class="header">&certificates.label;</label>
<button id="openCertManagerButton" oncommand="openCertManager();"
label="&manageCerts2.label;" accesskey="&manageCerts2.accesskey;"
prefstring="security.disable_button.openCertManager"/>
<button id="openDeviceManagerButton" oncommand="openDeviceManager();"
label="&manageDevices.label;" accesskey="&manageDevices.accesskey;"
prefstring="security.disable_button.openDeviceManager"/>
<hbox>
<button id="openCertManagerButton" oncommand="openCertManager();"
label="&manageCerts2.label;" accesskey="&manageCerts2.accesskey;"
prefstring="security.disable_button.openCertManager"/>
<button id="openDeviceManagerButton" oncommand="openDeviceManager();"
label="&manageDevices.label;" accesskey="&manageDevices.accesskey;"
prefstring="security.disable_button.openDeviceManager"/>
</hbox>
</groupbox>
</vbox>

1
mailnews/extensions/smime/content/am-smime.xhtml
Просмотреть файл

@ -4,7 +4,6 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-smime.dtd">