-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #110 from wrike/release-1.9
Release 1.9
- Loading branch information
Showing
28 changed files
with
565 additions
and
288 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 0 additions & 120 deletions
120
lib/src/components/containers/lectures_container/lectures_container.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <layout | ||
| [title]="'Map'" | ||
| [title]="'Карта'" | ||
| [state]="state"> | ||
|
|
||
| <div | ||
|
|
||
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 49 additions & 14 deletions
63
lib/src/components/containers/rating_container/rating_container.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,53 @@ | ||
| <layout | ||
| [title]="'Рейтинг докладов'" | ||
| [state]="state"> | ||
| <loader | ||
| [isReady]="isReady"> | ||
| <layout | ||
| [title]="'Рейтинг докладов'" | ||
| [state]="state"> | ||
|
|
||
| <div | ||
| content> | ||
| <div class="events__list" | ||
| content> | ||
| <event-card | ||
| *ngFor="let lecture of lectures" | ||
| class="rating_event" | ||
| [clickable]="true" | ||
| [standOut]="true" | ||
| [title]="lecture.title" | ||
| [speakers]="lecture.speakers" | ||
| (onClick)="onLectureSelect(lecture)"> | ||
| <div | ||
| class="like-count" | ||
| side> | ||
| <svg | ||
| aria-hidden="true" | ||
| xmlns="http://www.w3.org/2000/svg" fill="currentColor" width="24" height="24" viewBox="0 0 24 24" | ||
| class="icon"> | ||
| <path d="M15.4 7H20l-7.08 7.06-2.3-2.29L15.41 7zm-6.8 4.04l3.67 3.67L9.97 17 4 11.04h4.6z" fill-rule="evenodd"/> | ||
| </svg> | ||
|
|
||
| <div | ||
| *ngFor="let lecture of lectures"> | ||
| {{ lecture.likesCount }} | ||
| </div> | ||
| <span meta> | ||
|
|
||
| {{ lecture.title }} | ||
| </div> | ||
| <!-- Location --> | ||
| <span | ||
| class="event__meta-item"> | ||
| {{ lecture.location.title }} | ||
| </span> | ||
|
|
||
| &ngsp;•&ngsp; | ||
|
|
||
| <!-- Section --> | ||
| <span | ||
| class="event__meta-item" | ||
| [style.color]="lecture.section.color"> | ||
| {{ lecture.section.title }} | ||
| </span> | ||
| </span> | ||
| </event-card> | ||
|
|
||
| <rating-empty-state | ||
| *ngIf="lectures.isEmpty"> | ||
| </rating-empty-state> | ||
| </div> | ||
| </layout> | ||
| <rating-empty-state | ||
| *ngIf="lectures.isEmpty"> | ||
| </rating-empty-state> | ||
| </div> | ||
| </layout> | ||
| </loader> |
25 changes: 25 additions & 0 deletions
25
lib/src/components/containers/rating_container/rating_container.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| @import "../../../../../web/assets/styles/variables.scss"; | ||
|
|
||
| :host { | ||
| .like-count { | ||
| flex-shrink: 0; | ||
| margin-left: -8px; | ||
| margin-right: 16px; | ||
| width: 5ch; | ||
| padding-top: 16px; | ||
| color: $fg-color-primary; | ||
| @include font-title; | ||
|
|
||
| .icon { | ||
| color: $fg-color-secondary; | ||
| vertical-align: top; | ||
| transform: translate(0, -3px); | ||
| } | ||
| } | ||
|
|
||
| .events__list { | ||
| display: grid; | ||
| grid-gap: 8px; | ||
| margin: 12px 0; | ||
| } | ||
| } |
Oops, something went wrong.