Skip to content

Commit 302d5cc

Browse files
authored
Merge branch 'master' into mpopov/esf-header-icon-MASTER
2 parents e4bfc9d + a858f05 commit 302d5cc

16 files changed

+212
-13
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ The following example shows how you can use the Indigo theme:
5050

5151

5252
### New Features
53+
- `igxButton` directive
54+
- Added styles to support extended fab buttons.
5355
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
5456
- Introduced `showSummaryOnCollapse` grid property which allows you to control whether the summary row stays visible when the groupBy / parent row is collapsed.
5557
- Added support for tooltips on data cells default template and summary cells.

projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,8 @@
429429
@mixin igx-button($theme) {
430430
@include igx-root-css-vars($theme);
431431

432+
$left: if-ltr(left, right);
433+
$right: if-ltr(right, left);
432434
$button-border: 1px solid transparent;
433435
$button-width: rem(88px);
434436

@@ -514,15 +516,15 @@
514516

515517

516518
$button-floating-padding: (
517-
comfortable: rem(15px),
518-
cosy: rem(11px),
519-
compact: rem(7px)
519+
comfortable: rem(8px) rem(16px),
520+
cosy: rem(4px) rem(12px),
521+
compact: 0 rem(8px)
520522
);
521523

522524
$button-floating-size: (
523-
comfortable: rem(56px),
524-
cosy: rem(48px),
525-
compact: rem(40px)
525+
comfortable: rem(48px),
526+
cosy: rem(40px),
527+
compact: rem(32px)
526528
);
527529

528530
$icon-in-button-size: rem(18px);
@@ -762,18 +764,37 @@
762764
background: --var($theme, 'fab-focus-background');
763765
box-shadow: $fab-shadow--focus;
764766
}
767+
768+
igx-icon {
769+
display: inline-flex;
770+
order: -1;
771+
margin: rem(8px) 0;
772+
}
773+
774+
* + igx-icon {
775+
margin: 0;
776+
margin-#{$right}: rem(12px);
777+
}
765778
}
766779

767780
%igx-button--fab-cosy {
768781
padding: map-get($button-floating-padding, 'cosy');
769782
min-width: map-get($button-floating-size, 'cosy');
770783
min-height: map-get($button-floating-size, 'cosy');
784+
785+
* + igx-icon {
786+
margin-#{$right}: rem(8px);
787+
}
771788
}
772789

773790
%igx-button--fab-compact {
774791
padding: map-get($button-floating-padding, 'compact');
775792
min-width: map-get($button-floating-size, 'compact');
776793
min-height: map-get($button-floating-size, 'compact');
794+
795+
* + igx-icon {
796+
margin-#{$right}: rem(4px);
797+
}
777798
}
778799

779800
%igx-button--icon {
@@ -849,4 +870,15 @@
849870
text-align: center;
850871
}
851872
}
873+
874+
%igx-button--fab {
875+
p,
876+
span,
877+
div {
878+
@include igx-type-style($type-scale, $text) {
879+
text-align: center;
880+
margin: 0;
881+
}
882+
}
883+
}
852884
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
////
2+
/// @group components
3+
/// @access private
4+
/// @author <a href="https://github.com/didimmova" target="_blank">Dilyana Dimova</a>
5+
/// @requires {mixin} bem-block
6+
/// @requires {mixin} bem-elem
7+
/// @requires {mixin} bem-mod
8+
////
9+
@include b(category-chart) {
10+
// Register the component in the component registry
11+
$this: bem--selector-to-string(&);
12+
@include register-component(str-slice($this, 2, -1));
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
////
2+
/// @group components
3+
/// @access private
4+
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
5+
/// @requires {mixin} bem-block
6+
/// @requires {mixin} bem-elem
7+
/// @requires {mixin} bem-mod
8+
////
9+
@include b(data-chart) {
10+
// Register the component in the component registry
11+
$this: bem--selector-to-string(&);
12+
@include register-component(str-slice($this, 2, -1));
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
////
2+
/// @group components
3+
/// @access private
4+
/// @author <a href="https://github.com/didimmova" target="_blank">Dilyana Dimova</a>
5+
/// @requires {mixin} bem-block
6+
/// @requires {mixin} bem-elem
7+
/// @requires {mixin} bem-mod
8+
////
9+
@include b(doughnut-chart) {
10+
// Register the component in the component registry
11+
$this: bem--selector-to-string(&);
12+
@include register-component(str-slice($this, 2, -1));
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
////
2+
/// @group components
3+
/// @access private
4+
/// @author <a href="https://github.com/didimmova" target="_blank">Dilyana Dimova</a>
5+
/// @requires {mixin} bem-block
6+
/// @requires {mixin} bem-elem
7+
/// @requires {mixin} bem-mod
8+
////
9+
@include b(financial-chart) {
10+
// Register the component in the component registry
11+
$this: bem--selector-to-string(&);
12+
@include register-component(str-slice($this, 2, -1));
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
////
2+
/// @group components
3+
/// @access private
4+
/// @author <a href="https://github.com/didimmova" target="_blank">Dilyana Dimova</a>
5+
/// @requires {mixin} bem-block
6+
/// @requires {mixin} bem-elem
7+
/// @requires {mixin} bem-mod
8+
////
9+
@include b(funnel-chart) {
10+
// Register the component in the component registry
11+
$this: bem--selector-to-string(&);
12+
@include register-component(str-slice($this, 2, -1));
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
////
2+
/// @group components
3+
/// @access private
4+
/// @author <a href="https://github.com/didimmova" target="_blank">Dilyana Dimova</a>
5+
/// @requires {mixin} bem-block
6+
/// @requires {mixin} bem-elem
7+
/// @requires {mixin} bem-mod
8+
////
9+
@include b(gauge) {
10+
// Register the component in the component registry
11+
$this: bem--selector-to-string(&);
12+
@include register-component(str-slice($this, 2, -1));
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
////
2+
/// @group components
3+
/// @access private
4+
/// @author <a href="https://github.com/didimmova" target="_blank">Dilyana Dimova</a>
5+
/// @requires {mixin} bem-block
6+
/// @requires {mixin} bem-elem
7+
/// @requires {mixin} bem-mod
8+
////
9+
@include b(geo-map) {
10+
// Register the component in the component registry
11+
$this: bem--selector-to-string(&);
12+
@include register-component(str-slice($this, 2, -1));
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
////
2+
/// @group components
3+
/// @access private
4+
/// @author <a href="https://github.com/didimmova" target="_blank">Dilyana Dimova</a>
5+
/// @requires {mixin} bem-block
6+
/// @requires {mixin} bem-elem
7+
/// @requires {mixin} bem-mod
8+
////
9+
@include b(graph) {
10+
// Register the component in the component registry
11+
$this: bem--selector-to-string(&);
12+
@include register-component(str-slice($this, 2, -1));
13+
}

0 commit comments

Comments
 (0)