fix merge error

This commit is contained in:
garrettmills
2020-02-08 16:33:31 -06:00
parent 6b023caac6
commit 6594acab1a
11 changed files with 98 additions and 21 deletions

View File

@@ -0,0 +1,34 @@
<ion-list>
<ion-item>
<ion-icon slot="start" name="menu"></ion-icon>
<ion-label>Paragraph</ion-label>
</ion-item>
<ion-item>
<ion-icon slot="start" name="alert"></ion-icon>
<ion-label>Heading 1</ion-label>
</ion-item>
<ion-item>
<ion-icon slot="start" name="alert"></ion-icon>
<ion-label>Heading 2</ion-label>
</ion-item>
<ion-item>
<ion-icon slot="start" name="alert"></ion-icon>
<ion-label>Heading 3</ion-label>
</ion-item>
<ion-item>
<ion-icon slot="start" name="alert"></ion-icon>
<ion-label>Heading 4</ion-label>
</ion-item>
<ion-item>
<ion-icon slot="start" name="code"></ion-icon>
<ion-label>Monospace Block</ion-label>
</ion-item>
<ion-item>
<ion-icon slot="start" name="link"></ion-icon>
<ion-label>Hyperlink</ion-label>
</ion-item>
<ion-item>
<ion-icon slot="start" name="analytics"></ion-icon>
<ion-label>Database</ion-label>
</ion-item>
</ion-list>

View File

@@ -0,0 +1,14 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'editor-node-picker',
templateUrl: './node-picker.component.html',
styleUrls: ['./node-picker.component.scss'],
})
export class NodePickerComponent implements OnInit {
constructor() { }
ngOnInit() {}
}