MODULE-TYPO

- Ajustements, message-view
pull/91/head
iRouge 2015-01-16 09:33:46 -05:00 committed by Francis Lachapelle
parent 25213605bb
commit 5919580b5d
7 changed files with 95 additions and 31 deletions

View File

@ -6,7 +6,7 @@
xmlns:rsrc="OGo:url"
xmlns:label="OGo:label"
xmlns:uix="OGo:uix">
<md-content md-scroll-y="md-scroll-y" flex="flex" style="min-width: 300px;" id="messagesList">
<md-content flex="40" style="min-width: 300px;" id="messagesList">
<!--dirty fix for vs-repeat-->
<style>
.vs-repeat-repeated-element {
@ -39,6 +39,6 @@
</md-list>
</md-content>
<md-content class="md-padding" flex="flex" data-ui-view="message"><!-- message view --></md-content>
<div layout="column" flex="60" data-ui-view="message"><!-- message view --></div>
</container>

View File

@ -6,38 +6,45 @@
xmlns:rsrc="OGo:url"
xmlns:label="OGo:label"
xmlns:uix="OGo:uix">
<div class="header">
<h2 data-ng-bind="message.subject"><!-- subject --></h2>
<h6>
<md-toolbar class="md-toolbar-small md-hue-1 buttonsToolbar">
<span layout="row" flex="flex" layout-align="space-around center">
<a class="button tiny radius"
data-ui-sref="mail.account.mailbox.message.action({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: message.uid, actionName: 'reply'})"><i class="icon-reply"><!-- reply --></i></a>
<a class="button tiny radius"
data-ui-sref="mail.account.mailbox.message.action({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: message.uid, actionName: 'replyall'})"><i class="icon-reply"><!-- reply all --></i></a>
<a class="button tiny radius"
data-ui-sref="mail.account.mailbox.message.action({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: message.uid, actionName: 'forward'})"><i class="icon-reply"><!-- forward --></i></a>
<a class="button tiny radius"
data-ui-sref="mail.account.mailbox.message.edit({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: message.uid})"
data-ng-show="message.isDraft"><i class="icon-pencil"><!-- edit --></i></a>
<span class="button tiny radius alert"
data-ng-click="doDelete(message)"><i class="icon-trash"><!-- delete --></i></span>
<span class="button tiny radius"
data-ng-show="message.hasUnsafeContent"
data-ng-click="loadImages()"><var:string label:value="Load Images"/></span>
</span>
</md-toolbar>
<md-content md-scroll-y="md-scroll-y" class="md-padding">
<header class="header">
<!--todo : default headings don't suit. Define new styles-->
<h3 data-ng-bind="message.subject"><!-- subject --></h3>
<div layout="row" layout-align="space-between center">
<h5>
<a data-ng-href="mailto:{{message.from[0].email}}"
data-ng-bind="message.from[0].full"><!-- from --></a>
-
<a data-ng-href="mailto:{{message.to[0].email}}"
</h5>
<h6 data-ng-bind="message.date"><!-- date --></h6>
</div>
<h5>
<a data-ng-href="mailto:{{message.to[0].email}}"
data-ng-bind="message.to[0].full"><!-- to --></a>
</h6>
</h5>
<p class="flags">
<span class="label radius" data-ng-repeat="flag in message.flags">{{flag}}</span>
</p>
<h6 data-ng-bind="message.date"><!-- date --></h6>
</div>
<div class="buttonsToolbar">
<span>
<a class="button tiny radius"
data-ui-sref="mail.account.mailbox.message.action({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: message.uid, actionName: 'reply'})"><i class="icon-reply"><!-- reply --></i></a>
<a class="button tiny radius"
data-ui-sref="mail.account.mailbox.message.action({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: message.uid, actionName: 'replyall'})"><i class="icon-reply"><!-- reply all --></i></a>
<a class="button tiny radius"
data-ui-sref="mail.account.mailbox.message.action({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: message.uid, actionName: 'forward'})"><i class="icon-reply"><!-- forward --></i></a>
<a class="button tiny radius"
data-ui-sref="mail.account.mailbox.message.edit({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: message.uid})"
data-ng-show="message.isDraft"><i class="icon-pencil"><!-- edit --></i></a>
<span class="button tiny radius alert"
data-ng-click="doDelete(message)"><i class="icon-trash"><!-- delete --></i></span>
<span class="button tiny radius"
data-ng-show="message.hasUnsafeContent"
data-ng-click="loadImages()"><var:string label:value="Load Images"/></span>
</span>
</div>
</header>
<div class="mailer_mailcontent"
data-ng-bind-html="message.$content()"><!-- msg --></div>
</md-content>
</container>

View File

@ -4237,4 +4237,56 @@ md-divider {
md-divider[md-inset] {
margin-left: 72px; }
md-toolbar {
display: flex;
flex-direction: column;
position: relative;
z-index: 2;
font-size: 1.3em;
min-height: 64px;
width: 100%; }
md-toolbar.md-tall {
height: 128px;
min-height: 128px;
max-height: 128px; }
md-toolbar.md-medium-tall {
height: 88px;
min-height: 88px;
max-height: 88px; }
md-toolbar.md-medium-tall .md-toolbar-tools {
height: 48px;
min-height: 48px;
max-height: 48px; }
md-toolbar.md-toolbar-small {
min-height: 48px; }
md-toolbar .md-indent {
margin-left: 64px; }
.md-toolbar-tools {
display: flex;
align-items: center;
flex-direction: row;
width: 100%;
height: 64px;
min-height: 100%;
max-height: 64px;
font-size: inherit;
font-weight: normal;
padding: 0 16px;
margin: 0; }
.md-toolbar-tools > * {
font-size: inherit; }
.md-toolbar-tools h2, .md-toolbar-tools h3 {
font-weight: normal; }
.md-toolbar-tools a {
color: inherit;
text-decoration: none; }
.md-toolbar-tools .fill-height {
display: flex;
align-items: center; }
.md-toolbar-tools .md-tools {
margin-left: auto; }
.md-toolbar-tools .md-button {
font-size: 14px; }
/*# sourceMappingURL=components.css.map */

File diff suppressed because one or more lines are too long

View File

@ -50,6 +50,7 @@
/* Angular-material components local overrides */
@import 'vendors/angular-material/components/list/list.scss';
@import 'vendors/angular-material/components/divider/divider.scss';
@import 'vendors/angular-material/components/toolbar/toolbar.scss';
// Pages-specific styles

View File

@ -34,6 +34,10 @@ md-toolbar {
}
}
&.md-toolbar-small {
min-height: $baseline-grid * 6;
}
.md-indent {
margin-left: $toolbar-indent-margin;
}

View File

@ -22,7 +22,7 @@ $sg-rem-value: $sg-rem-base-value !default;
$sg-sp-scale-factor: $sg-rem-value / $sg-rem-base-value !global;
// Font-size basic scale (from Google)
// nice-to-have : generate with a loop
// NiceToHave : generate with a loop
$sg-typo-scale: (
12,
14,