LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Review core scss following ng-material changes

pull/91/head
Francis Lachapelle 2015-03-27 10:27:06 -04:00
parent 05e58b30cc
commit ae2990d8d6
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/WebServerResources/angular-material

@ -1 +1 @@
Subproject commit eda14e9b367cccfe61ddc53686d288d7ed237d92
Subproject commit d34ac5bdbc1623421d6888095ff159563b5ac40b

11
UI/WebServerResources/scss/core/typography/typography.scss → UI/WebServerResources/scss/core/typography.scss
View File

@ -1,11 +1,6 @@
/*! typography.scss - */
////
/// SOGo
/// Version: #{$Version}
/// Module: typography
///
/// Main typography module file define basic typographic styles
////
// Import from sources for extends
// -------------------------------
@import "../../angular-material/src/core/style/typography";
// Fonts declaration
// ----------------------------------------------------------------------------

17
UI/WebServerResources/scss/core/variables.scss
View File

@ -10,13 +10,24 @@ $version: '3.alpha';
//@import '../themes/color-palette'; // fixme : clarify if it is needed or assure by javascript
@import 'components/palette'; // fixme : The maps in color-palettes are more js then scss
// Font Variables
$font-family: 'Fira sans', 'Helvetica Neue', sans-serif !default;
$primary-color: sg-color($sogoBlue, 300) !default;
//$foreground-primary-color: rgba($foreground-base-color, 0.73) !default;
$foreground-primary-color: rgba($primary-color, 0.87);//override
// Typography
// ------------------------------
$font-family: 'Fira sans', 'Helvetica Neue', sans-serif !default;
$display-4-font-size-base: 11.20rem !default;
$display-3-font-size-base: 5.600rem !default;
$display-2-font-size-base: 4.500rem !default;
$display-1-font-size-base: 3.400rem !default;
$headline-font-size-base: 2.400rem !default;
$title-font-size-base: 2.000rem !default;
$subhead-font-size-base: 1.600rem !default;
$body-font-size-base: 1.400rem !default;
$caption-font-size-base: 1.200rem !default;
// Layout and grid
// ------------------------------

2
UI/WebServerResources/scss/styles.scss
View File

@ -31,7 +31,7 @@
@import 'core/mixins';
@import 'core/structure';
@import 'core/layout';
@import 'core/typography/typography';
@import 'core/typography';
// Original angular-material components
// ------------------------------------------------------------------------------