Browse Source

[MAIL] More primary structural and stylistic changes

custom-2020
Matt A. Tobin 4 years ago committed by Roy Tam
parent
commit
ab47b30748
  1. 3
      calendar/base/content/dialogs/calendar-event-dialog.xul
  2. 2115
      mail/base/content/mailWindowOverlay.xul
  3. 19
      mail/base/content/messageWindow.xul
  4. 62
      mail/base/content/messenger.xul
  5. 3
      mail/base/jar.mn
  6. 2
      mail/themes/classic/jar.mn
  7. 22
      mail/themes/classic/messenger/primaryToolbar.css
  8. 67
      mail/themes/classic/messenger/tabmail.css
  9. 2
      mail/themes/moz.build

3
calendar/base/content/dialogs/calendar-event-dialog.xul

@ -264,7 +264,8 @@
defaulticonsize="small"
#endif
labelalign="end"
defaultlabelalign="end">
defaultlabelalign="end"
isNotMainWindow="true">
<!-- Menubar -->
<menubar id="event-menubar">

2115
mail/base/content/mailWindowOverlay.xul

File diff suppressed because it is too large Load Diff

19
mail/base/content/messageWindow.xul

@ -127,11 +127,20 @@
</vbox>
#endif
<!-- navigation-toolbox is provided by mailWindowOverlay.xul -->
<toolbox id="navigation-toolbox" class="toolbox-top">
<!-- mail-toolbox is provided by mailWindowOverlay.xul -->
<toolbar id="mail-toolbar-menubar2" />
<toolbox id="mail-toolbox" messagewindow="true"/>
<!-- mail-toolbox children are provided by mailWindowOverlay.xul -->
<toolbox id="mail-toolbox"
class="mail-toolbox"
mode="full"
defaultmode="full"
iconsize="small"
defaulticonsize="small"
labelalign="end"
defaultlabelalign="end"
isNotMainWindow="true">
<toolbar id="mail-toolbar-menubar2" />
<toolbarpalette id="MailToolbarPalette" />
<toolbar id="mail-bar3" />
<toolbarset id="customToolbars" context="toolbar-context-menu"/>
</toolbox>
<tooltip id="aHTMLTooltip" page="true"/>

62
mail/base/content/messenger.xul

@ -238,12 +238,29 @@
</vbox>
#endif
<!-- navigation-toolbox is augmented by mailWindowOverlay.xul -->
<toolbox id="navigation-toolbox" class="toolbox-top">
#ifndef MOZ_CALENDAR
<!-- mail-toolbox is provided by mailWindowOverlay.xul -->
<!-- mail-toolbox children are provided by mailWindowOverlay.xul -->
<toolbox id="mail-toolbox"
class="mail-toolbox"
mode="full"
defaultmode="full"
iconsize="small"
defaulticonsize="small"
labelalign="end"
defaultlabelalign="end">
<toolbar id="mail-toolbar-menubar2" />
<toolbarpalette id="MailToolbarPalette" />
<toolbar id="mail-bar3" />
<toolbarset id="customToolbars" context="toolbar-context-menu"/>
</toolbox>
#endif
<toolbox id="navigation-toolbox"
class="toolbox-top"
labelalign="end"
defaultlabelalign="end">
#ifdef MOZ_CALENDAR
<toolbar id="mail-toolbar-menubar2" />
<toolbox id="mail-toolbox" />
#endif
<toolbar id="tabs-toolbar" class="toolbar-primary">
@ -282,21 +299,7 @@
id="alltabs-popup" position="after_end"
tabcontainer="tabcontainer"/>
</toolbarbutton>
#ifdef CAN_DRAW_IN_TITLEBAR
<hbox class="titlebar-placeholder" type="caption-buttons"
id="titlebar-placeholder-on-TabsToolbar-for-captions-buttons" persist="width"
#ifndef XP_MACOSX
ordinal="1000"
#endif
/>
#ifdef XP_MACOSX
<hbox class="titlebar-placeholder" type="fullscreen-button"
id="titlebar-placeholder-on-TabsToolbar-for-fullscreen-button" persist="width"
/>
#endif
#endif
</toolbar>
</toolbar>
</toolbox>
<!-- XXX This extension point (tabmail-container) is only temporary!
@ -318,8 +321,19 @@
beneath both of them. -->
<box id="mailContent" orient="vertical" flex="1">
#ifdef MOZ_CALENDAR
<!-- mail-toolbox is provided by mailWindowOverlay.xul -->
<toolbox id="mail-toolbox" />
<!-- mail-toolbox children are provided by mailWindowOverlay.xul -->
<toolbox id="mail-toolbox"
class="mail-toolbox"
mode="full"
defaultmode="full"
iconsize="small"
defaulticonsize="small"
labelalign="end"
defaultlabelalign="end">
<toolbarpalette id="MailToolbarPalette" />
<toolbar id="mail-bar3" />
<toolbarset id="customToolbars" context="toolbar-context-menu"/>
</toolbox>
#endif
<box id="messengerBox" orient="horizontal" flex="1" minheight="100" height="100" persist="height">
<vbox id="folderPaneBox" minwidth="125" width="200" persist="width">
@ -388,7 +402,9 @@
</tree>
</vbox>
<splitter id="folderpane_splitter" collapse="before"/>
<splitter id="folderpane_splitter" collapse="before">
<grippy />
</splitter>
<vbox flex="1">
<box orient="vertical" id="messagesBox" flex="1">
@ -511,7 +527,7 @@
<splitter id="threadpane-splitter"
collapse="after"
collapsed="true"
onmouseup="OnMouseUpThreadAndMessagePaneSplitter()"/>
onmouseup="OnMouseUpThreadAndMessagePaneSplitter()" />
<!-- a convenience box for ease of extension overlaying -->
<hbox id="messagepaneboxwrapper"

3
mail/base/jar.mn

@ -27,8 +27,9 @@ messenger.jar:
* content/messenger/messenger.xul (content/messenger.xul)
* content/messenger/hiddenWindow.xul (content/hiddenWindow.xul)
content/messenger/hiddenWindow.js (content/hiddenWindow.js)
content/messenger/msgHdrViewOverlay.css (content/msgHdrViewOverlay.css)
content/messenger/msgHdrViewOverlay.js (content/msgHdrViewOverlay.js)
content/messenger/msgHdrViewOverlay.xul (content/msgHdrViewOverlay.xul)
* content/messenger/msgHdrViewOverlay.xul (content/msgHdrViewOverlay.xul)
content/messenger/msgViewNavigation.js (content/msgViewNavigation.js)
content/messenger/mailWidgets.xml (content/mailWidgets.xml)
content/messenger/nsDragAndDrop.js (content/nsDragAndDrop.js)

2
mail/themes/classic/jar.mn

@ -254,7 +254,7 @@ classic.jar:
skin/classic/messenger/starContact.png (messenger/starContact.png)
skin/classic/messenger/starred48.png (messenger/starred48.png)
skin/classic/messenger/subscribe.css (messenger/subscribe.css)
skin/classic/messenger/tabmail.css (messenger/tabmail.css)
* skin/classic/messenger/tabmail.css (messenger/tabmail.css)
skin/classic/messenger/tagbg.png (messenger/tagbg.png)
skin/classic/messenger/tagColors.css (messenger/tagColors.css)
skin/classic/messenger/userIcon.png (messenger/userIcon.png)

22
mail/themes/classic/messenger/primaryToolbar.css

@ -18,9 +18,13 @@
}
#tabs-toolbar {
%ifdef MOZ_CALENDAR
border-bottom: 1px solid rgba(10, 31, 51, .35);
%ifndef MOZ_CALENDAR
padding-bottom: 2px;
padding-bottom: 1px;
%else
%ifdef XP_WIN
-moz-appearance: -moz-win-browsertabbar-toolbox;
%endif
%endif
}
@ -42,15 +46,17 @@
margin: 0 0 0px;
}
%ifdef MOZ_CALENDAR
.mail-toolbox {
-moz-appearance: none;
background: transparent;
border-bottom: 1px solid threedshadow;
}
%ifdef MOZ_CALENDAR
.mail-toolbox:not([messagewindow="true"]) {
border-top: 0px;
border-bottom: 1px solid threedshadow;
.mail-toolbox:not([isNotMainWindow="true"]),
.contentTabToolbox {
-moz-appearance: none;
border-top: none;
background-image: -moz-linear-gradient(rgba(255, 255, 255, .5),
rgba(255, 255, 255, .1) 19px) !important;
}
%endif

67
mail/themes/classic/messenger/tabmail.css

@ -60,11 +60,21 @@
.tabmail-tab {
-moz-appearance: none;
background: -moz-linear-gradient(bottom, rgba(10%, 10%, 10%, .4) 1px,
transparent 1px), -moz-linear-gradient(transparent,
hsla(0, 0%, 45%, .1) 1px, hsla(0, 0%, 32%, .2) 80%,
hsla(0, 0%, 0%, .2)),
-moz-linear-gradient(-moz-dialog, -moz-dialog);
background:
-moz-linear-gradient(
bottom,
rgba(10%, 10%, 10%, .4) 1px,
transparent 1px
),
-moz-linear-gradient(
transparent,
hsla(0, 0%, 32%, .2) 80%,
hsla(0, 0%, 0%, .2)
),
-moz-linear-gradient(
-moz-dialog,
-moz-dialog
);
background-origin: border-box;
background-position: 1px 2px;
background-size: -moz-calc(100% - 2px) -moz-calc(100% - 2px);
@ -72,22 +82,43 @@
margin: 0;
padding: 1px 0 3px;
-moz-border-image: url(icons/tab.png) 4 3 0 / 4px 3px 0 repeat stretch;
height: 26px;
height: 24px;
min-height: 24px;
border-radius: 0;
border-width: 0;
margin-top: 1px;
%ifndef MOZ_CALENDAR
margin-bottom: 4px;
%endif
}
.tabmail-tab:not(:-moz-lwtheme):not([selected="true"]):hover {
background-image: -moz-linear-gradient(bottom, rgba(10%, 10%, 10%, .4) 1px,
transparent 1px), -moz-linear-gradient(hsla(0, 0%, 100%, .3) 1px,
hsla(0, 0%, 75%, .2) 80%, hsla(0, 0%, 60%, .2)),
-moz-linear-gradient(-moz-dialog, -moz-dialog);
background-image:
-moz-linear-gradient(
bottom,
rgba(10%, 10%, 10%, .4) 1px,
transparent 1px
),
-moz-linear-gradient(
hsla(0, 0%, 100%, .3) 1px,
hsla(0, 0%, 75%, .2) 80%,
hsla(0, 0%, 60%, .2)
),
-moz-linear-gradient(
-moz-dialog,
-moz-dialog
);
}
.tabmail-tab[selected="true"]:not(:-moz-lwtheme) {
background-image: -moz-linear-gradient(rgba(255, 255, 255, .7),
rgba(255, 255, 255, .5) 30%),
-moz-linear-gradient(-moz-dialog, -moz-dialog);
background-image: -moz-linear-gradient(
rgba(255, 255, 255, .7),
rgba(255, 255, 255, .5) 30%
),
-moz-linear-gradient(
-moz-dialog,
-moz-dialog
);
color: -moz-dialogText;
}
@ -164,6 +195,16 @@
background-image: none;
}
%ifndef MOZ_CALENDAR
.tabs-bottom {
height: 4px !important;
margin: 0px !important;
background: -moz-dialog !important;
border-top: 1px solid threedshadow;
border-bottom: 1px solid threedshadow;
}
%endif
.tab-icon-image,
.tab-throbber {
-moz-margin-end: 3px;

2
mail/themes/moz.build

@ -6,4 +6,4 @@
DIRS += ['classic']
if CONFIG['MOZ_CALENDAR']:
DIRS += ['xplatform']
DIRS += ['ClassicTB2']
Loading…
Cancel
Save