Fine-tune presentation of Mailer UI

- Colors
- Icons
- Dimmensions
- Typography
This commit is contained in:
iRouge
2015-06-11 15:57:22 -04:00
committed by Francis Lachapelle
parent 16f275af52
commit cd32bcf961
16 changed files with 446 additions and 198 deletions
@@ -23,20 +23,25 @@
<div class="sg-tile-content">
<a data-ui-sref="mail.account.mailbox.message({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: currentMessage.uid})"
data-ui-sref-active="_selected">
<div class="sg-md-subhead-multi">
{{currentMessage.$shortAddress('from')}}
<div class="sg-md-subhead-multi subject">
{{currentMessage.subject}}
</div>
<span class="right" data-ng-bind-html="currentMessage.relativedate"><!-- date --></span>
<div class="sg-md-body-multi">{{currentMessage.subject}}</div>
<span class="right msg-date" data-ng-bind-html="currentMessage.relativedate"><!-- date --></span>
<div class="sg-md-body-multi name">{{currentMessage.$shortAddress('from')}}</div>
<i class="icon-ion-refresh"
data-ng-hide="mailbox.$loadMessage(currentMessage.uid)"><!-- loading --></i>
</a>
</div>
<div class="sg-tile-icons">
<a><i class="md-icon-star"> </i></a>
<a><i class="md-icon-flag"> </i></a>
<a><i class="md-icon-attach-file disable"> </i></a>
</div>
</md-item-content>
</md-item>
</md-list>
</md-content>
<div layout="column" flex="60" data-ui-view="message"><!-- message view --></div>
<div layout="column" data-ui-view="message"><!-- message view --></div>
</container>
+1 -1
View File
@@ -270,7 +270,7 @@
<span class="sg-md-title md-flex">{{activeUser.identification}}</span>
</h2>
</md-toolbar>
<md-content md-scroll-y="md-scroll-y" class="md-flex md-padding" ng-controller="LeftCtrl">
<md-content md-scroll-y="md-scroll-y" class="md-flex" ng-controller="LeftCtrl">
<md-button ng-click="close()" class="md-primary md-hide-gt-md">Close</md-button>
<md-list ng-repeat="account in accounts track by account.id">
<md-item>
+36 -33
View File
@@ -6,43 +6,46 @@
xmlns:rsrc="OGo:url"
xmlns:label="OGo:label"
xmlns:uix="OGo:uix">
<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="md-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="md-icon-reply-all"><!-- 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="md-icon-forward"><!-- 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="md-icon-create"><!-- edit --></i></a>
<span class="button tiny radius alert"
<md-content md-scroll-y="md-scroll-y" class="md-padding">
<header class="header">
<hgroup>
<h3 class="sg-md-headline" data-ng-bind="message.subject"><!-- subject --></h3>
<div class="msg-header-group">
<div class="md-tile-left">
<!--avatar-->
</div>
<div class="sg-md-body-multi name">
<a data-ng-href="mailto:{{message.from[0].email}}" data-ng-bind="message.from[0].full"><!-- from --></a>
</div>
<div class="msg-date sg-md-body-multi"><span data-ng-bind="message.date"><!-- date --></span></div>
</div>
<div>
<a data-ng-href="mailto:{{message.to[0].email}}" data-ng-bind="message.to[0].full"><!-- to --></a>
</div>
<p class="flags">
<span class="label radius" data-ng-repeat="flag in message.flags">{{flag}}</span>
</p>
</hgroup>
<div class="sg-icon-bar">
<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="md-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="md-icon-reply-all"><!-- 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="md-icon-forward"><!-- 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="md-icon-create"><!-- edit --></i></a>
<span class="button tiny radius alert"
data-ng-click="doDelete(message)"><i class="md-icon-delete"><!-- 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>
</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>
</h5>
<p class="flags">
<span class="label radius" data-ng-repeat="flag in message.flags">{{flag}}</span>
</p>
</header>
</div>
</header>
<div class="mailer_mailcontent"
data-ng-bind-html="message.$content()"><!-- msg --></div>
+181 -82
View File
@@ -2950,15 +2950,13 @@ md-tab > .md-ripple-container .md-ripple {
white-space: nowrap;
text-transform: capitalize; }
.sg-md-body-1, .sg-md-body-multi {
font-size: 12px;
.sg-md-body-1, .sg-md-body-multi, .mailer_mailcontent {
font-size: 14px;
line-height: 20px;
font-weight: 400;
margin-top: -20px;
margin-bottom: 20px; }
font-weight: 400; }
.sg-md-body-2, .sg-md-body-solo {
font-size: 12px;
font-size: 14px;
line-height: 24px;
font-weight: 600;
margin-top: -24px;
@@ -2988,8 +2986,8 @@ md-tab > .md-ripple-container .md-ripple {
font-size: 24px;
line-height: 32px;
font-weight: 400;
margin-top: -32px;
margin-bottom: 32px; }
margin-top: 0;
margin-bottom: 8px; }
.sg-md-display-1 {
font-size: 34px;
@@ -3316,8 +3314,15 @@ md-bottom-sheet {
border-right-width: 1px;
border-radius: 0px 2px 2px 0px; }
.sg-active button {
color: #bfe0dd; }
sg-folder-tree .md-button {
outline: none;
color: inherit;
font-size: 14px;
padding: 0;
-webkit-font-smoothing: auto; }
.sg-active .md-button {
color: #639997; }
/*! card/_extends.scss - */
md-card {
@@ -4906,7 +4911,7 @@ svg, object {
.md-icon-folder:before {
content: "\f1a6"; }
.md-icon-folder-open:before {
.md-icon-folder-open:before, .sg-active i.md-icon-folder:before {
content: "\f1a7"; }
.md-icon-folder-shared:before {
@@ -6001,21 +6006,6 @@ md-item-content {
.md-tile-right {
padding-right: 0px; }
.sg-tile-content .name {
margin: 0 0 3px 0;
font-weight: 400;
font-size: 1.1em; }
.sg-tile-content .subject {
margin: 0 0 3px 0;
font-weight: 400;
font-size: 0.9em;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap; }
.sg-tile-content p {
margin: 0 0 3px 0;
font-size: 0.75em; }
.md-tile-right {
padding-right: 0px; }
@@ -6031,6 +6021,19 @@ md-item-content {
.md-tile-right {
margin-right: -16px; }
div.md-tile-left {
min-width: 72px; }
.sg-tile-icons {
font-size: 12px;
color: rgba(0, 0, 0, 0.54);
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
width: 32px;
height: 56px; }
.md-tile-left:before {
content: "\f251";
font-family: 'Material Design Iconic Font';
@@ -6086,20 +6089,47 @@ md-item-content {
border-bottom: 2px solid transparent;
z-index: 10; }
[id='messagesList'] md-item-content {
padding: 16px; }
padding: 0 0 0 16px;
margin: 16px 0;
transition: all 0.35s cubic-bezier(0.55, 0, 0.55, 0.2) 0.15s; }
[id='messagesList'] md-item-content:hover {
background-color: #e6d8ba;
color: #639997;
cursor: pointer; }
[id='messagesList'] md-item-content:active {
color: #639997; }
[id='messagesList'] md-item-content:focus {
background-color: #e1f5f3; }
[id='messagesList'] .sg-md-subhead-solo {
margin: 0; }
.sg-tile-content .name {
font-weight: 200;
margin-top: 0;
margin-bottom: 0; }
.sg-tile-content .subject {
font-weight: 600;
max-width: 75%;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap; }
.sg-tile-content p {
margin: 0 0 3px 0;
font-size: 14px; }
.sg-tile-content .msg-date {
font-size: 14px; }
.sg-tile-content {
padding: 0 0 0 16px; }
.sg-tile-content .sg-md-subhead-multi,
.sg-tile-content .sg-md-subhead-solo {
margin: 0; }
.sg-tile-content .sg-md-body-multi {
.sg-tile-content .sg-md-body-multi, .sg-tile-content .mailer_mailcontent {
margin: 0; }
.sg-tile-content a {
display: flex;
flex-direction: row;
align-items: baseline;
justify-content: space-between;
flex-wrap: wrap; }
@@ -7427,10 +7457,61 @@ md-sidenav {
@media (max-width: 320px) {
md-sidenav {
width: 85%; } }
.md-sidenav-left, md-sidenav {
border-right: 1px solid #d6c48d; }
.md-sidenav-left md-content, md-sidenav md-content, .md-sidenav-left md-toolbar, md-sidenav md-toolbar {
background-color: inherit; }
.md-sidenav-left md-content, md-sidenav md-content, .md-sidenav-left md-toolbar, md-sidenav md-toolbar {
background-color: inherit; }
md-item-content .sg-child-level-1 {
padding-left: 2em; }
md-item-content .sg-child-level-2 {
padding-left: 4em; }
md-item-content .sg-child-level-3 {
padding-left: 6em; }
md-item-content .sg-child-level-4 {
padding-left: 8em; }
md-item-content .sg-child-level-5 {
padding-left: 10em; }
md-item-content .sg-child-level-6 {
padding-left: 12em; }
md-item-content .sg-child-level-7 {
padding-left: 14em; }
md-item-content .sg-child-level-8 {
padding-left: 16em; }
md-item-content .sg-child-level-9 {
padding-left: 18em; }
md-item-content .sg-child-level-10 {
padding-left: 20em; }
md-item-content .sg-child-level-11 {
padding-left: 22em; }
[class*="sg-child-level"] {
margin-right: 1em; }
.md-sidenav-left md-item-content, md-sidenav md-item-content {
line-height: 40px;
padding: 0 16px;
transition: background-color 0.3s cubic-bezier(0.55, 0, 0.55, 0.2); }
.md-sidenav-left md-item-content:hover, md-sidenav md-item-content:hover {
background-color: #d6c48d;
cursor: pointer; }
.md-sidenav-left md-item-content.sg-active, md-sidenav md-item-content.sg-active {
color: #639997; }
.md-sidenav-left md-item-content.sg-loading, md-sidenav md-item-content.sg-loading {
color: #a1ccc8; }
.md-sidenav-left md-item-content .sg-item-name, md-sidenav md-item-content .sg-item-name {
text-align: left;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap; }
/*! slider/_extends.scss - */
@keyframes sliderFocusThumb {
@@ -8154,6 +8235,34 @@ md-toolbar {
z-index: 20;
box-shadow: none; }
header {
flex-direction: row;
align-items: flex-start;
justify-content: space-between;
display: flex; }
hgroup {
align-items: center;
flex: 1 1 auto; }
hgrouph3 {
margin-bottom: 0; }
.sg-icon-bar {
font-size: 24px;
color: rgba(0, 0, 0, 0.54);
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
width: 64px;
height: 192px;
margin-right: -16px; }
.sg-icon-bar *.button {
display: block;
margin: 0 auto;
width: 32px; }
/*! toolbar/_extends.scss - */
md-toolbar {
display: flex;
@@ -8209,6 +8318,34 @@ md-toolbar {
z-index: 20;
box-shadow: none; }
header {
flex-direction: row;
align-items: flex-start;
justify-content: space-between;
display: flex; }
hgroup {
align-items: center;
flex: 1 1 auto; }
hgrouph3 {
margin-bottom: 0; }
.sg-icon-bar {
font-size: 24px;
color: rgba(0, 0, 0, 0.54);
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
width: 64px;
height: 192px;
margin-right: -16px; }
.sg-icon-bar *.button {
display: block;
margin: 0 auto;
width: 32px; }
md-toolbar.sg-bottombar {
@extends md-toolbar;
background-color: #212121;
@@ -8330,61 +8467,23 @@ md-tooltip {
.md-whiteframe-z5 {
box-shadow: 0px 27px 24px 0 rgba(0, 0, 0, 0.2); }
md-sidenav md-list md-item-content {
transition: background-color 0.2s ease-out, color 0.5s linear; }
md-sidenav md-list md-item-content:hover {
background-color: #ede5ca;
cursor: pointer; }
md-sidenav md-list md-item-content.sg-active {
color: #00b0c0; }
md-sidenav md-list md-item-content.sg-loading {
color: #a1ccc8; }
md-sidenav md-list md-item-content .sg-item-name {
text-align: left;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap; }
md-item-content .sg-child-level-1 {
padding-left: 15px; }
md-item-content .sg-child-level-2 {
padding-left: 30px; }
md-item-content .sg-child-level-3 {
padding-left: 45px; }
md-item-content .sg-child-level-4 {
padding-left: 60px; }
md-item-content .sg-child-level-5 {
padding-left: 75px; }
md-item-content .sg-child-level-6 {
padding-left: 90px; }
md-item-content .sg-child-level-7 {
padding-left: 105px; }
md-item-content .sg-child-level-8 {
padding-left: 120px; }
md-item-content .sg-child-level-9 {
padding-left: 135px; }
md-item-content .sg-child-level-10 {
padding-left: 150px; }
md-item-content .sg-child-level-11 {
padding-left: 165px; }
[id="messagesList"] {
max-width: 384px;
max-width: 448px;
flex: 1 1 auto; }
[data-ui-view="message"] {
max-width: 512px; }
.msg-header-group {
display: flex;
flex-direction: row;
align-items: flex-start;
justify-content: space-between; }
.msg-header-group .sg-md-body-multi.name, .msg-header-group .name.mailer_mailcontent,
.msg-date {
padding: 16px 0 0 16px; }
.view[layout=row] {
max-height: 100%; }
@@ -8412,7 +8511,7 @@ main {
.sg-tile-content .sg-md-subhead-multi,
.sg-tile-content .sg-md-subhead-solo {
min-width: 50%; }
min-width: 65%; }
html.dev.guide::after {
display: block;
File diff suppressed because one or more lines are too long
@@ -215,8 +215,8 @@
template:
'<md-item>' +
' <md-item-content>' +
' <i class="md-icon-folder-open"></i>' +
' <button class="md-button md-flex md-tile-content sg-item-name">{{folder.name}}</button>' +
' <i class="md-icon-folder"></i>' +
' <button class="md-button md-flex sg-item-name">{{folder.name}}</button>' +
' <md-input-container class="md-flex md-tile-content ng-hide">'+
' <input type="text"' +
' ng-model="folder.name"' +
+1 -1
View File
@@ -23,5 +23,5 @@
.sg-tile-content .sg-md-subhead-multi,
.sg-tile-content .sg-md-subhead-solo {
min-width: 50%;
min-width: 65%;
}
@@ -9,18 +9,61 @@
// The only selector for vs-repeat lists is this id, we use attributes selector to
// avoid overspecifying
// todo: create new classes and refactor templates markup
// ----------------------------------------------------------------------------
[id='messagesList'] {
border-top: 44px solid transparent; // padding for the header.subheader,
border-bottom: 2px solid transparent; //close to a hack
z-index: 10;
// In use in MAILER messages list but re-usable
// --------------------------------------------
md-item-content {
padding: $layout-gutter-width;
padding: 0 0 0 $mg;
margin: $mg 0;
transition: all 0.35s $swift-ease-in-timing-function 0.15s;
&:hover {
background-color: sg-color($sogoPaper, 300);
color: sg-color($sogoBlue, 800);
cursor: pointer;
}
&:active {
color: sg-color($sogoBlue, 800);
}
&:focus {
background-color: sg-color($sogoBlue, 100);
}
}
.sg-md-subhead-solo {
margin: 0;
}
}
.sg {
&-tile-content {
@extend .md-tile-content;
.name {
font-weight: $sg-font-light;
margin-top: 0;
margin-bottom: 0;
}
.subject {
font-weight: $sg-font-medium;
// dirty fix for vs-repeat damages
max-width: 75%;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
p {
margin: $list-p-margin;
font-size: sg-size(body);
}
.msg-date {
font-size: sg-size(body);
}
}
}
.sg-tile-content {
padding: 0 0 0 $layout-gutter-width;
.sg-md-subhead-multi,
@@ -33,6 +76,7 @@
a {
display: flex;
flex-direction: row;
align-items: baseline;
justify-content: space-between;
flex-wrap: wrap;
}
@@ -7,6 +7,17 @@
/// Definitions for button extends
///
@import 'extends';
.sg-active button {
color: $primary-color;
// Buttons for the sidenav folder tree
// ------------------------------------
sg-folder-tree .md-button {
outline: none;
color: inherit;
font-size: sg-size(button);
padding: 0;
-webkit-font-smoothing: auto;
}
.sg-active .md-button {
color: sg-color($sogoBlue, 800);
}
@@ -36,4 +36,4 @@ src: url(data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAjEMAAsAA
src: url('#{$md-font-path}/Material-Design-Iconic-Font.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
}
@@ -4,30 +4,29 @@
/// Module: List
/// Main definitions for List
////
@import 'extends';
.sg {
&-tile-content {
@extend .md-tile-content;
.name {
margin: $list-h3-margin;
font-weight: $list-h3-font-weight;
font-size: $list-h3-font-size;
}
.subject {
margin: $list-h4-margin;
font-weight: $list-h4-font-weight;
font-size: $list-h4-font-size;
// dirty fix for vs-repeat damages
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
p {
margin: $list-p-margin;
font-size: $list-p-font-size;
}
}
}
// List variables
// ----------------------------------------------------------------------------
//$list-h3-font-size: 1.1em !default;
//$list-h3-margin: 0 0 3px 0 !default;
//$list-h3-font-weight: 400 !default;
//$list-h4-font-size: 0.9em !default;
//$list-h4-font-weight: 400 !default;
//$list-h4-margin: 0 0 3px 0 !default;
//$list-p-font-size: 0.75em !default;
//$list-p-margin: 0 0 3px 0 !default;
//
//$list-padding-top: $baseline-grid !default;
//$list-padding-right: 0px !default;
//$list-padding-left: 0px !default;
//$list-padding-bottom: $baseline-grid !default;
//
//$item-padding-top: 0px !default;
//$item-padding-right: 0px !default;
//$item-padding-left: 0px !default;
//$item-padding-bottom: 0px !default;
// The right tile for a list item.
// ----------------------------------------------------------------------------
@@ -49,6 +48,23 @@
.md-tile-right {
margin-right: -$layout-gutter-width;
}
// Overqualifying to override a rule in source
div.md-tile-left {
min-width: $sg-md-grid-pitch + $baseline-grid;
}
.sg-tile-icons {
font-size: $sg-font-size-1;
color: $colorGray;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
width: (2 * $mg);
height:(7 * $line);
}
// Avatar placeholder
// ------------------------------------
.md-tile-left:before {
content: "\f251";
font-family: 'Material Design Iconic Font';
@@ -101,11 +101,65 @@ md-sidenav {
width: 85%;
}
}
// MAIN SIDENAV, actually to the left
// ----------------------------------------------------------------------------
.md-sidenav-left {
border-right: 1px solid sg-color($sogoPaper, 500);
& md-content,
& md-toolbar {
background-color: inherit;
}
}
// MAILER Folder tree (in the left sidenav
// ---------------------------------------
$i: 1;
@while $i < 12 {
md-item-content .sg-child-level-#{$i} { padding-left: 2em * $i; }
$i: $i + 1;
}
// Folder and mailboxes icons
// ---------------------------------------
[class*="sg-child-level"] {
margin-right: 1em;
};
// This hack is so BAD I'm ashame putting it in the shame file
// -----------------------------------------------------------
// Folder tree's controler function are very intricate, the way
// elements are marked as 'active reminds me of good old time JQuery
// There must be a more straigthforward, angular-way to swap classes
// selection, but I don't wan't to mess in that script.
// Here's the hack : on selection I use the parent > child selector to
// change the definition of the icon's class. Yes, this means that
// md-icon-folder:before as the value of md-icon-folder:before:before,
// and this is wrong !
.sg-active i.md-icon-folder:before {
@extend .md-icon-folder-open:before;
}
.md-sidenav-left {
md-item-content {
line-height: $sg-line-height-6; // 40px eg. display-1
padding: 0 $mg;
transition: background-color $swift-ease-in-duration $swift-ease-in-timing-function;
&:hover {
background-color: sg-color($sogoPaper, 500);
cursor: pointer;
}
&.sg-active {
color: sg-color($sogoBlue, 800);
}
&.sg-loading {
color: sg-color($sogoBlue, 500);
}
.sg-item-name {
text-align: left;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
}
}
@@ -3,4 +3,35 @@
md-toolbar {
z-index: 20;
box-shadow: none;
}
}
header {
flex-direction: row;
align-items: flex-start;
justify-content: space-between;
display: flex;
}
hgroup {
align-items: center;
flex: 1 1 auto;
&h3 {
margin-bottom: 0;
}
}
.sg-icon-bar {
font-size: $sg-font-size-5;
color: $colorGray;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
width: ($pitch);
height:(3 * $pitch);
margin-right: $mg * -1;
}
.sg-icon-bar *.button {
display: block;
margin: 0 auto;
width: (2 * $mg);
}
@@ -53,6 +53,6 @@
/// (caption, body, button, menu, subhead, title, headline, display-1, display-2, display-3, display-4 ; ther's also shortcut aliases : d1, d2, d3, d4)
/// @return : type size
@function sg-size($size) {
@return map-get($typeSize, $size);
@return (map-get($typeSize, $size) * 1px);
}
@@ -217,27 +217,27 @@ $sg-line-height-9: $sg-font-size-9 + $sg-md-typo-baseline;
$sg-font-light: 200;
$sg-font-regular: 400;
$sg-font-medium: 600;
$sg-font-Bold: $sg-font-medium;
$sg-font-bold: $sg-font-medium;
// h elements definitions
// ----------------------------------------------------------------------------
$h1-font-size-Base: $sg-font-size-9;
$h1-margin-Base: 0.67em 0;
//$h1-margin-Base: 0.67em 0;
$h2-font-size-Base: $sg-font-size-8;
$h2-margin-Base: 0.83em 0;
//$h2-margin-Base: 0.83em 0;
$h3-font-size-Base: $sg-font-size-7;
$h3-margin-Base: 1em 0;
//$h3-margin-Base: 1em 0;
$h4-font-size-Base: $sg-font-size-6;
$h4-margin-Base: 1.33em 0;
//$h4-margin-Base: 1.33em 0;
$h5-font-size-Base: $sg-font-size-5;
$h5-margin-Base: 1.67em 0;
//$h5-margin-Base: 1.67em 0;
$h6-font-size-Base: $sg-font-size-4;
$h6-margin-Base: 2.33em 0;
//$h6-margin-Base: 2.33em 0;
/// Gogle Material Design Standard styles
/// as specified (http://www.google.com/design/spec/style/typography.html#typography-standard-styles)
@@ -263,11 +263,9 @@ $h6-margin-Base: 2.33em 0;
text-transform: capitalize;
}
.#{$md}-body-1 {
font-size: $sg-font-size-1;
font-size: $sg-font-size-2;
line-height: $sg-line-height-2;
font-weight: $sg-font-regular;
margin-top: ($sg-line-height-2 * -1);
margin-bottom: $sg-line-height-2;
}
/// @alias .body-1
.#{$md}-body-multi {
@@ -275,7 +273,7 @@ $h6-margin-Base: 2.33em 0;
}
.#{$md}-body-2 {
$lineHeight : $sg-line-height-2 + $sg-md-typo-baseline;
font-size: $sg-font-size-1;
font-size: $sg-font-size-2;
line-height: $lineHeight;
font-weight: $sg-font-medium;
margin-top: ($lineHeight * -1);
@@ -321,8 +319,8 @@ $h6-margin-Base: 2.33em 0;
font-size: $sg-font-size-5;
line-height: $lineHeight;
font-weight: $sg-font-regular;
margin-top: ($lineHeight * -1);
margin-bottom: $lineHeight;
margin-top: 0;
margin-bottom: $line;
}
.#{$md}-display-1 {
$lineHeight : $sg-line-height-6;
+17 -30
View File
@@ -1,41 +1,28 @@
md-sidenav {
md-list {
md-item-content {
transition: background-color 0.2s ease-out,
color 0.5s linear;
&:hover {
background-color: #ede5ca; // paper 200
cursor: pointer;
}
&.sg-active {
color: #00b0c0; // vintage-blue A700
}
&.sg-loading {
color: #a1ccc8; // vintage-blue 500
}
.sg-item-name {
text-align: left;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
}
}
}
$i: 1;
@while $i < 12 {
md-item-content .sg-child-level-#{$i} { padding-left: 15px * $i; }
$i: $i + 1;
}
[id="messagesList"] {
max-width: grid-step(6);
max-width: grid-step(7);
flex: 1 1 auto;
}
[data-ui-view="message"] {
max-width: grid-step(8);
}
.msg-header-group {
display: flex;
flex-direction: row;
align-items: flex-start;
justify-content: space-between;
}
.msg-header-group .sg-md-body-multi.name,
.msg-date {
padding: $mg 0 0 $mg;
}
.mailer_mailcontent {
@extend .sg-md-body-multi;
}
//$total-columns: 13;
//$column-gutter: 0;