- Cleaned up merge artifacts

.gitignore

@@ -3,6 +3,7 @@
 # compiled output
 /dist/release
 /dist/angular
+/dist/**/*.pyz
 /tmp
 /out-tsc
 /app-builds

src/app/app-routing.module.ts

@@ -24,12 +24,7 @@ const routes: Routes = [
 ];
 
 @NgModule({
-<<<<<<< HEAD
-  imports: [RouterModule.forRoot(routes, { useHash: true })],
-  exports: [RouterModule]
-=======
 	imports: [RouterModule.forRoot(routes, { useHash: true })],
 	exports: [RouterModule],
->>>>>>> c8da92906c2b44849a6c4b3c83ce1e6715699a77
 })
 export class AppRoutingModule {}

src/app/components/category-tabs/tabbar.component.html

@@ -1,21 +1,3 @@
-<<<<<<< HEAD
-<mz-tab
-	[fixedTabWidth]="'true'"
-	[swipeable]="'true'"
-	>
-	<mz-tab-item
-		*ngFor="let category of categories"
-		[label]="category.name"
-		[tabItemId]="category.name"
-		[class]="category.icon"
-		[active]="('/' + category.name) === router.url"
-		cdkTrapFocus
-		[cdkTrapFocusAutoCapture]="true"
-	>
-		<app-palette [items]="items[category.name]"></app-palette>
-	</mz-tab-item>
-</mz-tab>
-=======
 <nav mat-tab-nav-bar mat-stretch-tabs class="mat-elevation-z3" color="accent" backgroundColor="primary" tabindex="0">
 	<a mat-tab-link
 		*ngFor="let category of categories"
@@ -28,4 +10,3 @@
 	</a>
 </nav>
 <router-outlet name="category"></router-outlet>
->>>>>>> c8da92906c2b44849a6c4b3c83ce1e6715699a77

src/app/components/category-tabs/tabbar.component.scss

@@ -1,33 +1,3 @@
-<<<<<<< HEAD
-$roboto-font-path: "~roboto-fontface/fonts/roboto/";
-@import "~materialize-css/sass/materialize.scss";
-
-:host ::ng-deep .tabs {
-	position: fixed;
-	z-index: 998;
-}
-
-:host ::ng-deep .tabs,
-:host ::ng-deep .tabs .tab,
-:host ::ng-deep .tabs .tab a {
-	@extend .grey-text, .text-lighten-4;
-	background-color: #333333;
-}
-
-:host ::ng-deep .tabs .tab a:hover {
-	background-color: #FFFFFF22;
-}
-
-:host ::ng-deep .tabs .tab a.active {
-	background-color: #FFFFFF33;
-}
-
-:host ::ng-deep .tabs .tab a img {
-	height: 16px;
-	margin: 0;
-	padding: 0 5px 0 0;
-	filter: invert(0.95);
-=======
 nav {
 	position: fixed;
 	min-width: 100vw;
@@ -52,5 +22,4 @@ a.mat-tab-link {
 			fill: inherit !important;
 		}
 	}
->>>>>>> c8da92906c2b44849a6c4b3c83ce1e6715699a77
 }

src/app/components/category-tabs/tabbar.component.ts

@@ -1,78 +1,22 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-import { Component, OnInit, AfterViewInit, ViewChild, Inject } from "@angular/core";
-import { Router, Event, NavigationEnd } from "@angular/router";
-import { MzTabComponent } from "ngx-materialize";
-import { DataService } from "../../providers/data.service";
-import M from "materialize-css";
-const COMPACT = true;
-=======
-=======
->>>>>>> c8da92906c2b44849a6c4b3c83ce1e6715699a77
 import { Component, OnInit, Inject } from "@angular/core";
 import { Router } from "@angular/router";
 import { DomSanitizer } from "@angular/platform-browser";
 import { MatIconRegistry } from "@angular/material/icon";
 import { DirectoryService, DataService, ICategory, SettingsService } from "../../services";
 
 
-// const COMPACT = true;
-<<<<<<< HEAD
->>>>>>> - Prepared configs for packaging
-=======
->>>>>>> c8da92906c2b44849a6c4b3c83ce1e6715699a77
-
-
 @Component({
 	selector: "app-tabbar",
 	templateUrl: "./tabbar.component.html",
 	styleUrls: [ "./tabbar.component.scss" ],
 })
-<<<<<<< HEAD
-export class TabbarComponent implements OnInit, AfterViewInit {
-	@ViewChild(MzTabComponent) tabbar: MzTabComponent;
-	categories: Array<any>;
-	items: {};
-=======
 export class TabbarComponent implements OnInit {
 	categories: Array<any>;
->>>>>>> c8da92906c2b44849a6c4b3c83ce1e6715699a77
 	compact: boolean;
 	constructor(
 		@Inject(DirectoryService) private dir: DirectoryService,
-		@Inject(DataService) private data: DataService,
-<<<<<<< HEAD
-		@Inject(Router) public router: Router,
-	) {
-		this.categories = data.getCategories();
-		this.items = data.getEmoji();
-		this.compact = COMPACT;
-	}
-
-	ngOnInit() {}
-
-	ngAfterViewInit() {
-		this.router.events.subscribe((event: Event) => {
-			if (event instanceof NavigationEnd) {
-				// this.tabbar.initTabs();
-				M
-			}
-		});
-<<<<<<< HEAD
-		const tabbar = this.tabbar.tabs.nativeElement.querySelectorAll("ul.tabs li.tab a");
-		for (const tabLabel of Array.from(tabbar) as Array<HTMLLinkElement>) {
-			const label = tabLabel.textContent.trim();
-			const iconName = this.categories.find((cat) => cat.name === label).icon;
-			const icon: HTMLImageElement = document.createElement("img");
-			icon.src = `../../../assets/emoji/categories/${iconName}`;
-			if (this.compact) {
-				tabLabel.innerText = "";
-			}
-			(<any> tabLabel).prepend(icon);
-			tabLabel.title = label;
-=======
-=======
 		@Inject(SettingsService) private prefs: SettingsService,
+		@Inject(DataService) private data: DataService,
 		@Inject(Router) public router: Router,
 		@Inject(DomSanitizer) private sanitizer: DomSanitizer,
 		@Inject(MatIconRegistry) private registry: MatIconRegistry,
@@ -85,22 +29,15 @@ export class TabbarComponent implements OnInit {
 				this.compact = change.value;
 			}
 		});
->>>>>>> c8da92906c2b44849a6c4b3c83ce1e6715699a77
 		for (const category of this.categories as ICategory[]) {
 			registry.addSvgIcon(
 				category.icon,
 				sanitizer.bypassSecurityTrustResourceUrl(
 					this.dir.getAsset(`emoji/categories/${category.icon}`)
 				)
 			);
-<<<<<<< HEAD
->>>>>>> - Prepared configs for packaging
-		}
-	}
-=======
 		}
 	}
 
 	ngOnInit() {}
->>>>>>> c8da92906c2b44849a6c4b3c83ce1e6715699a77
 }

src/app/components/search/search.component.html

@@ -1,16 +1,8 @@
-<<<<<<< HEAD
-<div class="search-bar" cdkTrapFocus [cdkTrapFocusAutoCapture]="true">
-	<input #search type="text" class="search-input" autofocus>
-</div>
-<div class="search-results">
-	<app-palette [items]="results"></app-palette>
-=======
 <div class="search-bar mat-elevation-z3" cdkTrapFocus [cdkTrapFocusAutoCapture]="true">
 	<mat-form-field appearance="standard" color="accent" backgroundColor="primary">
 		<input matInput #search placeholder="Search..." autofocus>
 	</mat-form-field>
 </div>
 <div class="search-results">
 	<app-palette [query]="query"></app-palette>
->>>>>>> c8da92906c2b44849a6c4b3c83ce1e6715699a77
 </div>

src/app/components/search/search.component.scss

@@ -1,15 +1,4 @@
 .search-bar {
-<<<<<<< HEAD
-	position: fixed;
-	width: 100vw;
-	background-color: #333333;
-	padding: 0 45px;
-	.search-input{
-		height: 2.5rem;
-		font-size: 1.5rem;
-		color: #FFFFFFF2;
-		margin: 10px 0;
-=======
 	background-color: var(--primary);
 	color: var(--accent-lighter);
 	position: fixed;
@@ -24,6 +13,5 @@
 		:host ::ng-deep & .mat-form-field-infix {
 			padding: 0;
 		}
->>>>>>> c8da92906c2b44849a6c4b3c83ce1e6715699a77
 	}
 }