Skip to content

Commit

Permalink
# This is a combination of 4 commits.
Browse files Browse the repository at this point in the history
# This is the 1st commit message:

add lib files for sticky-header

add chose parent

add support to 'optional 'cdkStickyRegion' input '

add app-demo for sticky-header

fix bugs and deleted unused tag id in HTML files

modify

fix some code according to PR review comments

change some format to pass TSlint check

add '_' before private elements

delete @Injectable for StickyHeaderDirective. Because we do not need @Injectable

refine code

encapsulate 'set style for element'

change @input()

Delete 'Observable.fromEvent(this.upperScrollableContainer, 'scroll')'

add const STICK_START_CLASS and STICK_END_CLASS

Add doc for [cdkStickyRegion] and 'unstuckElement()'. Delete 'detach()' function, add its content into 'ngOnDestroy()'.

change 'MdStickyHeaderModule' to 'CdkStickyHeaderModule';

encapsulate reset css style operation for sticky header.

delete unnecessary gloable variables

sticky-header-rebased

add one test &&

fixed bug 'sticky-header not working on iPhone', and bug 'reshape too obviously when being sticked'. &&

made some change according to the design doc('md-stick --> cdkSticky')

make the sticky element being scrolled up smoothly when being unsticked

Add code to support  optional parentRegion input

add

add unit test for sticky-header

add e2e/sticky-header files

e2e test

clear code

master

sticky-header-rebased

Add code to support  optional parentRegion input

add e2e/sticky-header files

e2e test

clear code

fix

encapsulate reset css style operation for sticky header.

sticky-header-rebased

Add code to support  optional parentRegion input

add e2e/sticky-header files

e2e test

clear code

master

sticky-header-rebased

Add code to support  optional parentRegion input

add e2e/sticky-header files

e2e test

clear code

fix

delete unused files

encapsulate reset css style operation for sticky header.

sticky-header-rebased

Add code to support  optional parentRegion input

add unit test for sticky-header

add e2e/sticky-header files

e2e test

clear code

master

sticky-header-rebased

Add code to support  optional parentRegion input

add e2e/sticky-header files

e2e test

clear code

fix

encapsulate reset css style operation for sticky header.

sticky-header-rebased

Add code to support  optional parentRegion input

add e2e/sticky-header files

e2e test

clear code

master

sticky-header-rebased

Add code to support  optional parentRegion input

add e2e/sticky-header files

e2e test

clear code

fix

clean unused files

delete sticky-header

delete styicky-heade demo

delete sticky-header lib

revert public_api

delete sticky-header e2e files

delete.firebasesrc

revert

revert

revert

revert

add css styles for selection-list

add selection-list structures in list.ts

initial version of selection-list all src/lib code

fix tslint error

fix tslint error

applied '[class.mat-list-item-content-reverse]="checkboxPosition == 'after'"', deleted comments in code

Deleted 'MdSelectionListCssMatStyler' class

Added doc for 'md-selection-option'

Added binding expression for 'attr.aria-selected' and 'attr.aria-disabled'

Added a value and a disabled @input() property

Changed 'isSelected' to 'selected'. And added '@input(selected)' for it.(Using 'coerceBooleanProperty')

changed '_slist' to 'selectionList' and deleted 'MdSelectionListCheckboxer' class

Deleted navList in selection-list-option

changed 'onchange()' to toggle(). And added doc for it

checkedItems -> selectedOptions

deleted 'pCheckbox' and store 'this' instead of HTMLelement in 'optionlist'

optimized toggle() with 'this._selected = !this._selected'

Added 'Tab' moves focus on selection-list, 'UP_ARROW' and 'DOWN_ARROW' moves focus within selection-list. And use 'SPACE' to select checkbox

Added another empty line at the end of each file

remove comment line in CSS file

Deleted 'webkit-justify-content' in CSS file

Deleted 'mat-list-item-content-reverse' to these existing styles; the 'mat-list-item-content-reverse' class should only have the extra styles you need to reverse the display

Deleted 'mat-list-item-content' and 'mat-list-item-content-reverse' and '<a>' styles in '.mat-selection-list'

Deleted unused 'mat-checkbox' class

add ".mat-list-option" class in css file

added 'mat-list-option' class

fix toggle() disabled

Deleted empty class

Deleted unused import

Removed 'if (this.selectable)' check

moved styles in '.mat-selection-list .mat-list-item' to '.mat-list-option'.

Deleted position, box-sizing, and height in '.mat-list-item-content-reverse' in list.scss file

put md-selection-list and md-list-option in separate files(selection-list.ts and list-option.ts)

# This is the commit message angular#2:

nit
# This is the commit message angular#3:

correct imports in index.ts


# This is the commit message angular#4:

use ' @ContentChildren(MdListOption) options;' instead of QueryList
  • Loading branch information
sllethe committed Aug 10, 2017
1 parent 0754320 commit 114cbd9
Show file tree
Hide file tree
Showing 9 changed files with 609 additions and 16 deletions.
148 changes: 141 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"highlight.js": "^9.11.0",
"http-rewrite-middleware": "^0.1.6",
"image-diff": "^1.6.3",
"jasmine-core": "^2.6.2",
"jasmine-core": "^2.6.3",
"jsonwebtoken": "^7.4.1",
"karma": "^1.7.0",
"karma-browserstack-launcher": "^1.2.0",
Expand Down
32 changes: 29 additions & 3 deletions src/lib/list/_list-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@
$background: map-get($theme, background);
$foreground: map-get($theme, foreground);

.mat-list, .mat-nav-list {
.mat-list, .mat-nav-list, .mat-selection-list {
.mat-list-item {
color: mat-color($foreground, text);
}

.mat-list-option {
color: mat-color($foreground, text);
}

.mat-subheader {
color: mat-color($foreground, secondary-text);
}
Expand All @@ -29,6 +33,14 @@
background: mat-color($background, 'hover');
}
}

.mat-list-option {
outline: none;

&:hover, &.mat-list-item-focus {
background: mat-color($background, 'hover');
}
}
}

@mixin mat-list-typography($config) {
Expand All @@ -38,13 +50,22 @@
font-family: $font-family;
}

.mat-list-option {
font-family: $font-family;
}

// Default list
.mat-list, .mat-nav-list {
.mat-list, .mat-nav-list, .mat-selection-list {
.mat-list-item {
font-size: mat-font-size($config, subheading-2);
@include mat-line-base(mat-font-size($config, body-1));
}

.mat-list-option {
font-size: mat-font-size($config, subheading-2);
@include mat-line-base(mat-font-size($config, body-1));
}

.mat-subheader {
font-family: mat-font-family($config, body-2);
font-size: mat-font-size($config, body-2);
Expand All @@ -53,12 +74,17 @@
}

// Dense list
.mat-list[dense], .mat-nav-list[dense] {
.mat-list[dense], .mat-nav-list[dense], .mat-selection-list[dense] {
.mat-list-item {
font-size: mat-font-size($config, caption);
@include mat-line-base(mat-font-size($config, caption));
}

.mat-list-option {
font-size: mat-font-size($config, caption);
@include mat-line-base(mat-font-size($config, caption));
}

.mat-subheader {
font-family: $font-family;
font-size: mat-font-size($config, caption);
Expand Down
Loading

0 comments on commit 114cbd9

Please sign in to comment.