Skip to content

Commit 5c34b12

Browse files
authored
chore: merge with master
2 parents 7db2f13 + 07d70ab commit 5c34b12

File tree

65 files changed

+340
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+340
-92
lines changed

.releaserc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"docs/environments/version.ts",
4949
"docs/assets/archived-versions.json"
5050
],
51-
"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
51+
"message": ":fire: chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
5252
}
5353
]
5454
],

README.md

Lines changed: 10 additions & 2 deletions

docs/app/app.component.html

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,55 @@
1-
<div class="hero bg-white mb-3">
1+
<div class="hero bg-alt mb-3">
2+
<div class="hero-bg"></div>
23
<div class="container">
34
<div class="row">
4-
<div class="col-md-8 mx-auto">
5-
<div class="brand d-flex flex-column justify-center align-items-center mt-5">
6-
<img src="./assets/toppy-logo.png" alt="Toppy" width="100" />
7-
<p class="text-center mt-3">
8-
Toppy is a tiny library to create overlays for Angular applications. Overlays are used in
9-
<span>tooltip</span>, <span>modal</span>, <span>sidemenu</span>, <span>dropdowns</span>, <span>popup</span>,
10-
<span>context menu</span>, <span>toaster</span>, <span>alerts</span>, <span>datepicker</span>,
11-
<span>popovers</span> etc
12-
</p>
5+
<div class="col-md-8 mx-auto my-4">
6+
<div class="brand d-flex flex-column justify-center align-items-center my-5">
7+
<img src="./assets/toppy-logo-white.png" alt="Toppy" width="150" />
8+
<div class="text-center mt-3 desc">
9+
<div class="mb-2">Tiny Overlay library for Angular apps. Easy and simple API</div>
10+
<div class="tags px-5">
11+
<span>tooltip</span>, <span>modal</span>, <span>sidemenu</span>, <span>dropdowns</span>,
12+
<span>popup</span>, <span>menu</span>, <span>toaster</span>, <span>alerts</span>, <span>datepicker</span>,
13+
<span>popovers</span>
14+
</div>
15+
</div>
1316
</div>
14-
<div class="badges d-flex align-items-center mb-3 justify-content-center">
17+
<div class="badges d-flex align-items-center my-0 justify-content-center">
1518
<!-- <div class="badge"><img src="https://badgen.net/badge/Angular/7.x/1b95e0" alt="" /></div> -->
1619
<div class="badge">
1720
<a href="https://www.npmjs.com/package/toppy" target="_blank">
1821
<img
19-
src="https://img.shields.io/npm/v/toppy.svg?style=popout-square&colorA=585c6d&colorB=585c6d&label=&logo=data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHJvbGU9ImltZyIgdmlld0JveD0iMCAwIDI0IDI0IiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiPjxwYXRoIGQ9Ik0wIDcuMzM0djhoNi42NjZ2MS4zMzJIMTJ2LTEuMzMyaDEydi04SDB6bTYuNjY2IDYuNjY0SDUuMzM0di00SDMuOTk5djRIMS4zMzVWOC42NjdoNS4zMzF2NS4zMzF6bTQgMHYxLjMzNkg4LjAwMVY4LjY2N2g1LjMzNHY1LjMzMmgtMi42Njl2LS4wMDF6bTEyLjAwMSAwaC0xLjMzdi00aC0xLjMzNnY0aC0xLjMzNXYtNGgtMS4zM3Y0aC0yLjY3MVY4LjY2N2g4LjAwMnY1LjMzMXoiIGZpbGw9IndoaXRlIi8+PHBhdGggZD0iTTEwLjY2NSAxMEgxMnYyLjY2N2gtMS4zMzVWMTB6IiBmaWxsPSJ3aGl0ZSIvPjwvc3ZnPg=="
22+
src="https://img.shields.io/npm/v/toppy.svg?style=popout-square&colorA=00738c&colorB=00738c&label=&logo=data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHJvbGU9ImltZyIgdmlld0JveD0iMCAwIDI0IDI0IiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiPjxwYXRoIGQ9Ik0wIDcuMzM0djhoNi42NjZ2MS4zMzJIMTJ2LTEuMzMyaDEydi04SDB6bTYuNjY2IDYuNjY0SDUuMzM0di00SDMuOTk5djRIMS4zMzVWOC42NjdoNS4zMzF2NS4zMzF6bTQgMHYxLjMzNkg4LjAwMVY4LjY2N2g1LjMzNHY1LjMzMmgtMi42Njl2LS4wMDF6bTEyLjAwMSAwaC0xLjMzdi00aC0xLjMzNnY0aC0xLjMzNXYtNGgtMS4zM3Y0aC0yLjY3MVY4LjY2N2g4LjAwMnY1LjMzMXoiIGZpbGw9IndoaXRlIi8+PHBhdGggZD0iTTEwLjY2NSAxMEgxMnYyLjY2N2gtMS4zMzVWMTB6IiBmaWxsPSJ3aGl0ZSIvPjwvc3ZnPg=="
2023
alt=""
2124
/></a>
2225
</div>
2326
<div class="badge">
2427
<a href="https://www.npmtrends.com/toppy" target="_blank">
2528
<img
26-
src="https://img.shields.io/npm/dt/toppy.svg?style=flat&colorA=585c6d&colorB=585c6d&logo=data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgY2xhc3M9ImZlYXRoZXIgZmVhdGhlci1kb3dubG9hZCI+PHBhdGggZD0iTTIxIDE1djRhMiAyIDAgMCAxLTIgMkg1YTIgMiAwIDAgMS0yLTJ2LTQiPjwvcGF0aD48cG9seWxpbmUgcG9pbnRzPSI3IDEwIDEyIDE1IDE3IDEwIj48L3BvbHlsaW5lPjxsaW5lIHgxPSIxMiIgeTE9IjE1IiB4Mj0iMTIiIHkyPSIzIj48L2xpbmU+PC9zdmc+&label="
29+
src="https://img.shields.io/npm/dt/toppy.svg?style=flat-square&colorA=00738c&colorB=00738c&logo=data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgY2xhc3M9ImZlYXRoZXIgZmVhdGhlci1kb3dubG9hZCI+PHBhdGggZD0iTTIxIDE1djRhMiAyIDAgMCAxLTIgMkg1YTIgMiAwIDAgMS0yLTJ2LTQiPjwvcGF0aD48cG9seWxpbmUgcG9pbnRzPSI3IDEwIDEyIDE1IDE3IDEwIj48L3BvbHlsaW5lPjxsaW5lIHgxPSIxMiIgeTE9IjE1IiB4Mj0iMTIiIHkyPSIzIj48L2xpbmU+PC9zdmc+&label="
2730
alt=""
2831
/>
2932
</a>
3033
</div>
3134
<div class="badge">
3235
<a href="https://github.com/lokesh-coder/toppy" target="_blank">
3336
<img
34-
src="https://img.shields.io/github/stars/lokesh-coder/toppy.svg?style=flat&colorA=585c6d&colorB=585c6d&label=&logo=github&logoColor=fff"
37+
src="https://img.shields.io/github/stars/lokesh-coder/toppy.svg?style=flat-square&colorA=00738c&colorB=00738c&label=&logo=github&logoColor=fff"
3538
alt=""
3639
/>
3740
</a>
3841
</div>
3942
<div class="badge">
4043
<a href="https://codecov.io/gh/lokesh-coder/toppy" target="_blank">
4144
<img
42-
src="https://img.shields.io/codecov/c/github/lokesh-coder/toppy/master.svg?style=flat&colorA=585c6d&colorB=585c6d&label=&logo=codecov&logoColor=fff"
45+
src="https://img.shields.io/codecov/c/github/lokesh-coder/toppy/master.svg?style=flat-square&colorA=00738c&colorB=00738c&label=&logo=codecov&logoColor=fff"
4346
alt=""
4447
/>
4548
</a>
4649
</div>
4750
<div class="badge">
4851
<img
49-
src="https://img.shields.io/badge/share-tweet-aaa.svg?style=flat&colorA=585c6d&colorB=585c6d&label=&logo=twitter&logoColor=fff"
52+
src="https://img.shields.io/badge/share-tweet-aaa.svg?style=flat-square&colorA=00738c&colorB=00738c&label=&logo=twitter&logoColor=fff"
5053
(click)="tweet($event)"
5154
alt=""
5255
/>

docs/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export class AppComponent {
8484
return ['resizable,scrollbars,status', 'height=' + height, 'width=' + width, 'left=' + left, 'top=' + top].join();
8585
};
8686
// const text = encodeURIComponent('Hey everyone, come & see how good I look!');
87-
const shareUrl = `https://twitter.com/intent/tweet?hashtags=angular&original_referer=http%3A%2F%2Flocalhost%3A4200%2F&ref_src=twsrc%5Etfw&text=Cute%20overlay%20library%20for%20Angular%20-%20tooltips%2C%20modals%2C%20toastr%2C%20menu%2C%20dropdowns%2C%20alerts%2C%20popovers%2C%20sidebar%20and%20more...%20&tw_p=tweetbutton&url=https%3A%2F%2Flokesh-coder.github.io%2Ftoppy%2F&via=lokesh-coder`;
87+
const shareUrl = `https://twitter.com/intent/tweet?hashtags=angular&original_referer=http%3A%2F%2Flocalhost%3A4200%2F&ref_src=twsrc%5Etfw&text=Cute%20overlay%20library%20for%20Angular%20-%20tooltips%2C%20modals%2C%20toastr%2C%20menu%2C%20dropdowns%2C%20alerts%2C%20popovers%2C%20sidebar%20and%20more...%20&tw_p=tweetbutton&url=https%3A%2F%2Flokesh-coder.github.io%2Ftoppy%2F&via=lokesh_coder`;
8888

8989
e.preventDefault();
9090
const win = window.open(shareUrl, 'ShareOnTwitter', getWindowOptions());

docs/app/examples/drag-example/drag-example.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<div class="drag-element-holder">
99
<img
10-
src="./assets/img/fly.png"
10+
src="./assets/icons/icons8-scooter-50.png"
1111
draggable="true"
1212
#el
1313
class="drag-element"
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div class="dropdown-field" #el (click)="open()" [ngClass]="{ open: isOpen }">
2-
<img src="./assets/img/{{ selectedData.icon }}.png" alt="" /> {{ selectedData.name }}
2+
<img src="./assets/icons/{{ selectedData.icon }}.png" alt="" /> {{ selectedData.name }}
33
</div>
44

55
<div class="text-selection" #el2 (click)="open2()">
6-
Do you like it? <span>{{ selectedEatable.name }}</span>
6+
I like <span>{{ selectedEatable.name }}</span>
77
</div>
88

99
<ng-template #tpl let-toppy>
1010
<ul class="dropdown-ist">
1111
<li (click)="select(item)" *ngFor="let item of items" [ngClass]="{ selected: item.name == selectedData.name }">
12-
<img src="./assets/img/{{ item.icon }}.png" alt="" /> {{ item.name }}
12+
<img src="./assets/icons/{{ item.icon }}.png" alt="" /> {{ item.name }}
1313
</li>
1414
</ul>
1515
</ng-template>
@@ -21,7 +21,7 @@
2121
*ngFor="let item of eatables"
2222
[ngClass]="{ selected: item.name == selectedEatable.name }"
2323
>
24-
<img src="./assets/img/{{ item.icon }}.png" alt="" />
24+
<img src="./assets/icons/{{ item.icon }}.png" alt="" />
2525
</li>
2626
</ul>
2727
</ng-template>

docs/app/examples/dropdown-example/dropdown-example.component.ts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,20 @@ export class DropdownExampleComponent implements OnInit {
1414
private _toppyControl2: ToppyControl;
1515
@ViewChild('tpl', { read: TemplateRef }) tpl: TemplateRef<any>;
1616
@ViewChild('tpl2', { read: TemplateRef }) tpl2: TemplateRef<any>;
17-
items = [{ name: 'Cow', icon: 'cow' }, { name: 'Goat', icon: 'goat' }, { name: 'Snake', icon: 'snake' }];
17+
items = [
18+
{ name: 'Beer', icon: 'icons8-beer-50' },
19+
{ name: 'Coffee', icon: 'icons8-cafe-50' },
20+
{ name: 'Cocktail', icon: 'icons8-cocktail-50' },
21+
{ name: 'Cola', icon: 'icons8-cola-50' },
22+
{ name: 'Tequila', icon: 'icons8-tequila-shot-50' },
23+
{ name: 'Whiskey', icon: 'icons8-whiskey-50' }
24+
];
1825
eatables = [
19-
{ name: 'Nah!', icon: 'one' },
20-
{ name: 'Not so much', icon: 'two' },
21-
{ name: 'Okay', icon: 'three' },
22-
{ name: 'looks good!', icon: 'four' },
23-
{ name: 'Yes, it is cool!!', icon: 'five' }
26+
{ name: 'French fries', icon: 'icons8-french-fries-50' },
27+
{ name: 'Fried chicken', icon: 'icons8-fried-chicken-50' },
28+
{ name: 'Hamburger', icon: 'icons8-hamburger-50' },
29+
{ name: 'Pizza', icon: 'icons8-pizza-50' },
30+
{ name: 'Sandwich', icon: 'icons8-sandwich-50' }
2431
];
2532
selectedData;
2633
selectedEatable;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div class="drag-element-holder">
2-
<img src="./assets/img/clock.png" #el (mouseenter)="onMouseOver()" (mouseleave)="onMouseLeave()" />
2+
<img src="./assets/icons/icons8-watch-50.png" #el (mouseenter)="onMouseOver()" (mouseleave)="onMouseLeave()" />
33
</div>

docs/app/examples/fullscreen-position-example/fullscreen-position-example.component.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ import { HeroScreenComponent } from '../../host-components/hero-screen/hero-scre
44

55
@Component({
66
selector: 'app-fullscreen-position-example',
7-
templateUrl: './fullscreen-position-example.component.html',
8-
styles: []
7+
templateUrl: './fullscreen-position-example.component.html'
98
})
109
export class FullscreenPositionExampleComponent implements OnInit {
11-
selectedPlacement = null;
1210
private _toppyControl: ToppyControl;
1311
constructor(private toppy: Toppy) {}
1412

@@ -20,13 +18,12 @@ export class FullscreenPositionExampleComponent implements OnInit {
2018
})
2119
.content(HeroScreenComponent)
2220
.create();
21+
this._toppyControl.listen('t_compins').subscribe(d => {
22+
console.log('HeroScreenComponent initiated', d);
23+
});
2324
}
2425

2526
open() {
2627
this._toppyControl.open();
2728
}
28-
29-
onOptionChange() {
30-
console.log('option changed');
31-
}
3229
}

docs/app/examples/global-position-example/global-position-example.component.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ import { SimpleModalComponent } from '../../host-components/simple-modal/simple-
99
styles: [
1010
`
1111
.global-content-wrapper {
12-
background: #ff5722;
12+
background: #e91e63;
1313
padding: 1rem 2rem;
14-
border: 2px solid #c4532f;
14+
border: 2px solid #cc1a57;
1515
border-radius: 3px;
1616
color: #fff;
17-
text-transform: uppercase;
18-
font-weight: 700;
17+
font-weight: 500;
1918
}
2019
`
2120
]

0 commit comments

Comments
 (0)