amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-07 11:29:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix (tried to) regressions introduced by angular-material update

Browse Source
This commit is contained in:
Benoit Favreault
2015-03-31 18:33:14 -04:00
committed by Francis Lachapelle
parent 1477bd6eae
commit eaeae77be4
7 changed files with 130 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/scss/core/typography.scss
+111 -1
View File
@@ -1,6 +1,6 @@
// Import from sources for extends
// -------------------------------
@import "../../angular-material/src/core/style/typography";
//@import "../../angular-material/src/core/style/typography";
// Fonts declaration
// ----------------------------------------------------------------------------
@@ -124,6 +124,96 @@
font-style: italic;
}
html {
// angular-material does it like in 2005
font-size: 62.5%;
// but we won't let evrything pass
line-height: 1;
}
body {
// angular-material does it like in 2005
font-size: 1.6rem;
}
html, body {
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-touch-callout: none;
-webkit-text-size-adjust: 100%;
-webkit-font-smoothing: antialiased;
}
md-select, md-card, md-list, md-toolbar,
ul, ol, p, h1, h2, h3, h4, h5, h6 {
text-rendering: optimizeLegibility;
}
// angular-material source
/************
* Headings
************/
.md-display-4 {
font-size: $display-4-font-size-base;
font-weight: 300;
letter-spacing: -0.010em;
line-height: $display-4-font-size-base;
}
.md-display-3 {
font-size: $display-3-font-size-base;
font-weight: 400;
letter-spacing: -0.005em;
line-height: $display-3-font-size-base;
}
.md-display-2 {
font-size: $display-2-font-size-base;
font-weight: 400;
line-height: 6.4rem;
}
.md-display-1 {
font-size: $display-1-font-size-base;
font-weight: 400;
line-height: 4rem;
}
.md-headline {
font-size: $headline-font-size-base;
font-weight: 400;
line-height: 3.2rem;
}
.md-title {
font-size: $title-font-size-base;
font-weight: 500;
letter-spacing: 0.005em;
}
.md-subhead {
font-size: $subhead-font-size-base;
font-weight: 400;
letter-spacing: 0.010em;
line-height: 2.4rem;
}
/************
* Body Copy
************/
.md-body-1 {
font-size: $body-font-size-base;
font-weight: 400;
letter-spacing: 0.010em;
line-height: 2rem;
}
.md-body-2 {
font-size: $body-font-size-base;
font-weight: 500;
letter-spacing: 0.010em;
line-height: 2.4rem;
}
.md-caption {
font-size: $caption-font-size-base;
letter-spacing: 0.020em;
}
.md-button {
letter-spacing: 0.010em;
}
// Google's Material design specs are in 'sp' or 'dp' which are not css units
// 'dp' is 'density independant pixels' and 'sp' is 'scale-independent pixels'
// (same as dp, but will be scaled by the user's font size preference)
@@ -262,6 +352,7 @@ h6 {
html p {
font-size: inherit;
line-height: $sg-base-line-height;
margin: 0;
}
@@ -405,6 +496,25 @@ $today-font-size: 72px; // Visualy adjusted
font-weight: $sg-font-thin;
}
/************
* Defaults
************/
button,
select,
html,
textarea,
input {
font-family: $font-family;
}
select,
button,
textarea,
input {
font-size: 100%;
}
a,
a:hover,
a:active,