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

fix(fakt): Switch to otf fonts with correct baseline, remove hacky styles

Browse source
This commit is contained in:
Ben Gotow 2015-06-03 11:07:59 -07:00
parent 7ea8b0ea06
commit 2cac5e1edf
10 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal_packages/account-sidebar/stylesheets/account-sidebar.less
View file

@ -34,8 +34,8 @@
font-weight: @font-weight-medium;
color: @source-list-active-bg;
background: @source-list-active-color;
padding-top:@padding-small-vertical * 0.8;
padding-bottom:@padding-small-vertical * 0.8 - 2;
padding-top:@padding-small-vertical * 0.6;
padding-bottom:@padding-small-vertical * 0.6;
margin-left:@padding-small-horizontal;
}
.name {
@ -53,7 +53,6 @@
}
&:hover {
background: darken(@source-list-bg, 5%);
cursor: default;
}
}

8
internal_packages/message-list/lib/email-frame.cjsx
View file

@ -10,28 +10,28 @@ EmailFixingStyles = """
font-family: 'FaktPro';
font-style: normal;
font-weight: 300;
src: local('FaktPro-Blond'), url('fonts/Fakt/FaktPro-Blond.ttf'), local('Comic Sans MS');
src: local('FaktPro-Blond'), url('fonts/Fakt/FaktPro-Blond.otf'), local('Comic Sans MS');
}
@font-face {
font-family: 'FaktPro';
font-style: normal;
font-weight: 400;
src: local('FaktPro-Normal'), url('fonts/Fakt/FaktPro-Normal.ttf'), local('Comic Sans MS');
src: local('FaktPro-Normal'), url('fonts/Fakt/FaktPro-Normal.otf'), local('Comic Sans MS');
}
@font-face {
font-family: 'FaktPro';
font-style: normal;
font-weight: 500;
src: local('FaktPro-Medium'), url('fonts/Fakt/FaktPro-Medium.ttf'), local('Comic Sans MS');
src: local('FaktPro-Medium'), url('fonts/Fakt/FaktPro-Medium.otf'), local('Comic Sans MS');
}
@font-face {
font-family: 'FaktPro';
font-style: normal;
font-weight: 600;
src: local('FaktPro-SemiBold'), url('fonts/Fakt/FaktPro-SemiBold.ttf'), local('Comic Sans MS');
src: local('FaktPro-SemiBold'), url('fonts/Fakt/FaktPro-SemiBold.otf'), local('Comic Sans MS');
}
/* Clean Message Display */

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

@ -32,7 +32,7 @@
color:@text-color-heading;
-webkit-app-region: drag;
margin:0;
margin-top:13px;
margin-top:11px;
font-size: @font-size-h4;
font-weight: @font-weight-normal;
white-space: nowrap;

1
internal_packages/search-bar/stylesheets/search-bar.less
View file

@ -18,7 +18,6 @@
border:none;
input {
padding-top: 3.5px;
padding-left:30px;
width: 100%;
height: 30px;

3
internal_packages/thread-list/stylesheets/thread-list.less
View file

@ -125,7 +125,8 @@
background-size: 100%;
background-repeat: no-repeat;
position: relative;
top:3px;
top: 5px;
vertical-align: top;
}
.thread-icon-attachment {
background-image:url(../static/images/thread-list/icon-attachment-@2x.png);

2
internal_packages/today/stylesheets/today-view.less
View file

@ -16,7 +16,7 @@
text-align:center;
font-weight:500;
font-size:11px;
line-height:19px;
line-height:16px;
position:relative;
top:5px;
background-color:@text-color-very-subtle;

2
static/components/list-tabular.less
View file

@ -78,7 +78,7 @@
.list-item {
font-size: @font-size-base;
line-height: @line-height-computed * 1.15;
line-height: @line-height-computed;
color: @text-color;
background: @list-bg;

20
static/components/tokenizing-text-field.less
View file

@ -31,7 +31,7 @@
.token {
display: inline-block;
position: relative;
padding: 0.5em @spacing-half 0.10em @spacing-half;
padding: 0.4em @spacing-half 0.4em @spacing-half;
padding-right: 1.5em;
margin: 0 5px 5px 0;
border-radius: @border-radius-base;
@ -43,7 +43,7 @@
position:absolute;
padding: 0;
padding-top: 1px;
right: 5px;
right: 7px;
border: 0;
margin: 0;
background-color: transparent;
@ -58,7 +58,10 @@
&.dragging {
background-color: @background-tertiary;
color: @text-color-inverse;
.action { color: @text-color-inverse-subtle; }
.action {
color: @text-color-inverse-subtle;
img { -webkit-filter: brightness(100); }
}
}
&.dragging {
cursor: -webkit-grabbing;
@ -85,12 +88,17 @@
input {
display: inline-block;
width: initial;
padding: 6px 0 3px 0;
margin: 0 5px 5px 0;
vertical-align:top;
border: none;
min-width: 5em;
background-color:transparent;
vertical-align:bottom;
// Note: padding and margin should match `.token` to ensure
// they have the same baseline!
padding: 0.4em @spacing-half 0.4em @spacing-half;
padding-right: 1.5em;
margin: 0 5px 5px 0;
&.noop-input {
position: absolute;
min-width: 0;

8
static/variables/ui-variables.less
View file

@ -90,28 +90,28 @@
font-family: 'FaktPro';
font-style: normal;
font-weight: 300;
src: local('FaktPro-Blond'), url('fonts/Fakt/FaktPro-Blond.ttf'), local('Comic Sans MS');
src: local('FaktPro-Blond'), url('fonts/Fakt/FaktPro-Blond.otf'), local('Comic Sans MS');
}
@font-face {
font-family: 'FaktPro';
font-style: normal;
font-weight: 400;
src: local('FaktPro-Normal'), url('fonts/Fakt/FaktPro-Normal.ttf'), local('Comic Sans MS');
src: local('FaktPro-Normal'), url('fonts/Fakt/FaktPro-Normal.otf'), local('Comic Sans MS');
}
@font-face {
font-family: 'FaktPro';
font-style: normal;
font-weight: 500;
src: local('FaktPro-Medium'), url('fonts/Fakt/FaktPro-Medium.ttf'), local('Comic Sans MS');
src: local('FaktPro-Medium'), url('fonts/Fakt/FaktPro-Medium.otf'), local('Comic Sans MS');
}
@font-face {
font-family: 'FaktPro';
font-style: normal;
font-weight: 600;
src: local('FaktPro-SemiBold'), url('fonts/Fakt/FaktPro-SemiBold.ttf'), local('Comic Sans MS');
src: local('FaktPro-SemiBold'), url('fonts/Fakt/FaktPro-SemiBold.otf'), local('Comic Sans MS');
}
@font-family-sans-serif: "FaktPro", "Helvetica", 'Lucida Grande', 'Segoe UI', sans-serif;

2
static/workspace.less
View file

@ -158,7 +158,7 @@ body.is-blurred {
}
.btn-toolbar {
margin-top: @spacing-half;
margin-top: @spacing-half * 0.94;
margin-left: @spacing-three-quarters;
margin-right: @spacing-three-quarters;
flex-shrink: 0;