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

Typography auto-scroll List

pull/91/head
iRouge 2015-02-03 10:52:27 -05:00 committed by Francis Lachapelle
parent 36c931b596
commit 09fa2be5bd
6 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/WebServerResources/scss/components/autoScrollList/_extends.scss 100644
View File

@ -0,0 +1,8 @@
/*! _extends.scss - */
////
/// SOGo
/// Version: #{$Version}
/// Module: autoScrollList
/// Extends for autoScroll module fron ngMaterial List
////
@import '../../../angular-material/src/components/list/list.scss';

7
UI/WebServerResources/scss/components/autoScrollList/_functions.scss 100644
View File

@ -0,0 +1,7 @@
/*! _functions.scss - */
////
/// SOGo
/// Version: #{$Version}
/// Module: autoScrollList
/// Functions for autoScrollList
////

31
UI/WebServerResources/scss/components/autoScrollList/autoScrollList.scss 100644
View File

@ -0,0 +1,31 @@
////
/// SOGo
/// Version: #{$Version}
/// Module: autoScrollList
/// Main definitions for autoScrollList
////
@import 'extends';
// 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'] {
md-item-content {
padding: $layout-gutter-width;
}
}
.sg-tile-content {
.sg-md-subhead-multi {
padding: 0 0 0 $layout-gutter-width;
margin: 0;
}
.sg-md-body-multi {
margin: 0;
}
a {
display: flex;
flex-direction: row;
justify-content: space-between;
flex-wrap: wrap;
}
}

7
UI/WebServerResources/scss/components/button/_functions.scss 100644
View File

@ -0,0 +1,7 @@
/*! _functions.scss - */
////
/// SOGo
/// Version: #{$Version}
/// Module: button
/// Functions for button
////

16
UI/WebServerResources/scss/core/typography/typography.scss
View File

@ -146,7 +146,7 @@ $md: $md-prefix;
$sg-rem-Base-value: 16 !global;
$sg-sp-value: (1 / $sg-rem-Base-value) !default; // sp value
$sg-md-baseline: 4px;
$sg-md-typo-baseline: 4px;
// Font-size basic scale (from Google)
// NiceToHave : generate with a loop
@ -183,15 +183,15 @@ $sg-font-size-9: nth($sg-typo-scale, 9) * 1px;
// Basic line heights
// ----------------------------------------------------------------------------
$sg-line-height-1: $sg-font-size-1 + $sg-md-baseline;
$sg-line-height-1: $sg-font-size-1 + $sg-md-typo-baseline;
$sg-line-height-2: 20px;
$sg-line-height-3: 24px;
$sg-line-height-4: $sg-font-size-4 + $sg-md-baseline;
$sg-line-height-4: $sg-font-size-4 + $sg-md-typo-baseline;
$sg-line-height-5: 32px;
$sg-line-height-6: 40px;
$sg-line-height-7: $sg-font-size-7 + $sg-md-baseline;
$sg-line-height-8: $sg-font-size-8 + $sg-md-baseline;
$sg-line-height-9: $sg-font-size-9 + $sg-md-baseline;
$sg-line-height-7: $sg-font-size-7 + $sg-md-typo-baseline;
$sg-line-height-8: $sg-font-size-8 + $sg-md-typo-baseline;
$sg-line-height-9: $sg-font-size-9 + $sg-md-typo-baseline;
// Font weights
// Google Material Design specifications strongly recommend to avoid bold
// font weight. Here are some variables to define weights more conveniently
@ -256,7 +256,7 @@ $h6-margin-Base: 2.33em 0;
@extend .#{$md}-body-1;
}
.#{$md}-body-2 {
$lineHeight : $sg-line-height-2 + $sg-md-baseline;
$lineHeight : $sg-line-height-2 + $sg-md-typo-baseline;
font-size: $sg-font-size-1;
line-height: $lineHeight;
font-weight: $sg-font-medium;
@ -280,7 +280,7 @@ $h6-margin-Base: 2.33em 0;
@extend .#{$md}-subhead-1;
}
.#{$md}-subhead-2 {
$lineHeight : $sg-line-height-3 + $sg-md-baseline;
$lineHeight : $sg-line-height-3 + $sg-md-typo-baseline;
font-size: $sg-font-size-3;
line-height: $lineHeight;
font-weight: $sg-font-regular;

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

@ -50,6 +50,7 @@
/* Angular-material components local overrides */
@import 'components/list/list.scss';
@import 'components/autoScrollList/autoScrollList.scss';
@import 'components/divider/divider.scss';
@import 'components/bottombar/bottombar.scss';
@import 'components/input/input.scss';