Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-11 07:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(styles): fix fonts in settings and iframe

Browse source
This commit is contained in:
Evan Morikawa 2015-10-02 17:47:53 -07:00
parent 7e57ae817f
commit c093cb1764
4 changed files with 50 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal_packages/message-list/stylesheets/message-list.less
View file

@ -256,7 +256,7 @@
.message-header { .message-header {
position: relative; position: relative;
font-size: @font-size-small; font-size: @font-size-small;
padding-bottom: @spacing-standard; padding-bottom: 0;
padding-top: 19px; padding-top: 19px;
&.pending { &.pending {
@ -370,7 +370,7 @@
width: 100%; width: 100%;
border: 0; border: 0;
padding: 0; padding: 0;
margin-top: @spacing-sub-double; margin-top: 20px;
overflow: auto; overflow: auto;
} }
} }

2
internal_packages/preferences/lib/main.cjsx
View file

@ -55,7 +55,7 @@ module.exports =
width: 520 width: 520
resizable: false resizable: false
autosize: true autosize: true
stylesheetRegex: /preferences/ stylesheetRegex: /(preferences|nylas\-fonts)/
props: { props: {
initialTab: tab initialTab: tab
} }

2
src/components/timeout-transition-group.cjsx
View file

@ -21,10 +21,12 @@ animationSupported = => true
### ###
addClass = (element, className) => addClass = (element, className) =>
return unless element
element.classList.add(className) element.classList.add(className)
element element
removeClass = (element, className) => removeClass = (element, className) =>
return unless element
if element.classList.contains(className) if element.classList.contains(className)
element.classList.remove(className) element.classList.remove(className)
element element

45
static/email-frame.less
View file

@ -2,6 +2,51 @@
@import 'ui-variables'; @import 'ui-variables';
.ignore-in-parent-frame { .ignore-in-parent-frame {
// ----- Font Families -----
@font-face {
font-family: 'Nylas-Pro';
font-style: normal;
font-weight: 200;
src: url('nylas://nylas-private-fonts/fonts/Nylas-Pro-Thin.otf');
}
@font-face {
font-family: 'Nylas-Pro';
font-style: normal;
font-weight: 300;
src: url('nylas://nylas-private-fonts/fonts/Nylas-Pro-Blond.otf');
}
@font-face {
font-family: 'Nylas-Pro';
font-style: normal;
font-weight: 400;
src: url('nylas://nylas-private-fonts/fonts/Nylas-Pro-Normal.otf');
}
@font-face {
font-family: 'Nylas-Pro';
font-style: normal;
font-weight: 500;
src: url('nylas://nylas-private-fonts/fonts/Nylas-Pro-Medium.otf');
}
@font-face {
font-family: 'Nylas-Pro';
font-style: normal;
font-weight: 600;
src: url('nylas://nylas-private-fonts/fonts/Nylas-Pro-SemiBold.otf');
}
// Pro-SemiBold doesn't render emoji properly. Override the emjoi unicode
// block so that it uses the "Normal" weight even at font-weight:600.
@font-face {
font-family: 'Nylas-Pro';
font-style: normal;
font-weight: 600;
src: url('nylas://nylas-private-fonts/fonts/Nylas-Pro-Normal.otf'), Helvetica, sans-serif;
unicode-range: U+1F300-1F5FF, U+1F600-1F64F, U+1F680-1F6FF, U+2600-26FF;
}
html, body { html, body {
font-family: "Nylas-Pro", "Helvetica", "Lucidia Grande", sans-serif; font-family: "Nylas-Pro", "Helvetica", "Lucidia Grande", sans-serif;