Skip to content

Commit

Permalink
Merge pull request #18 from kreuzerk/feature/adjustDemo
Browse files Browse the repository at this point in the history
Feature/adjust demo
  • Loading branch information
nivekcode authored Oct 6, 2019
2 parents 3be9f50 + 36e1ba1 commit 0b28ba9
Show file tree
Hide file tree
Showing 12 changed files with 59 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Ng-sortgrid

![Logo](https://raw.githubusercontent.com/kreuzerk/ng-sortgrid/master/projects/ng-sortgrid-demo/src/assets/logo-new.png)
![Logo](https://raw.githubusercontent.com/kreuzerk/ng-sortgrid/master/projects/ng-sortgrid-demo/src/assets/ng-sortgrid-logo.png)

![Grid demo](https://raw.githubusercontent.com/kreuzerk/ng-sortgrid/master/projects/ng-sortgrid-demo/src/assets/grid-demo.gif)

Expand Down
15 changes: 15 additions & 0 deletions projects/ng-sortgrid-demo/src/app/app.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,18 @@
justify-content: center;
}

.btn {
background: #c30230;
font-size: 20px;
border: 1px solid white;
}

.btn:hover {
color: #c30230;
background: white;
border: 1px solid #c30230;
}

.border-primary {
border-color: #c30230 !important;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.header {
background: #c30230;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<header class="bg-primary py-5 mb-5">
<header class="header py-5 mb-5">
<div class="container h-100">
<div class="row h-100 align-items-center">
<div class="col-lg-12">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import {Component} from '@angular/core';

@Component({
selector: 'ngsg-demo-header',
templateUrl: 'header.component.html'
templateUrl: 'header.component.html',
styleUrls: ['./header.component.css']
})
export class HeaderComponent {
}
22 changes: 22 additions & 0 deletions projects/ng-sortgrid-demo/src/app/shared/nav/nav.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.navbar {
background: white;
border-bottom: 1px solid #c30230;
}

.logo {
margin-top: 30px;
width: 250px;
height: 80px;
}

.icon {
color: #c30230;
font-size: 40px;
}

.subtitle {
color: darkgray;
display: block;
margin-left: 50px;
font-style: italic;
}
16 changes: 10 additions & 6 deletions projects/ng-sortgrid-demo/src/app/shared/nav/nav.component.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
<nav class="navbar navbar-expand-lg navbar-dark bg-primary"
<nav class="navbar navbar-expand-lg navbar-dark"
[ngStyle]="{'height': height}"
[ngClass]="{'fixed-top': fixed}">
<div class="container">
<a class="navbar-brand" href="#" style="font-size: 30px">ng-sortgrid <small *ngIf="subtitle">{{subtitle}}</small></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<a class="navbar-brand" href="#" style="font-size: 30px">
<img class="logo" src="assets/ng-sortgrid-logo.png"/>
<small class="subtitle" *ngIf="subtitle">{{subtitle}}</small>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive"
aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ml-auto">
<li class="nav-item active">
<a class="nav-link" href="https://twitter.com/KevinKreuzer90" target="_blank">
<i class="fab fa-twitter fa-2x"></i>
<a class="nav-link" href="https://twitter.com/kreuzercode" target="_blank">
<i class="icon fab fa-twitter fa-2x"></i>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://github.com/kreuzerk/ng-sortgrid" target="_blank">
<i class="fab fa-github fa-2x"></i>
<i class="icon fab fa-github fa-2x"></i>
</a>
</li>
</ul>
Expand Down
5 changes: 3 additions & 2 deletions projects/ng-sortgrid-demo/src/app/shared/nav/nav.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import {Component, Input} from '@angular/core';

@Component({
selector: 'ngsg-demo-nav',
templateUrl: './nav.component.html'
templateUrl: './nav.component.html',
styleUrls: ['./nav.component.css']
})
export class NavComponent {
@Input() fixed = false;
@Input() height = '60px';
@Input() height = '140px';
@Input() subtitle;
}
Binary file removed projects/ng-sortgrid-demo/src/assets/logo-new.png
Binary file not shown.
Binary file removed projects/ng-sortgrid-demo/src/assets/logo.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions projects/ng-sortgrid/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Ng-sortgrid

![Logo](https://raw.githubusercontent.com/kreuzerk/ng-sortgrid/master/projects/ng-sortgrid-demo/src/assets/logo-new.png)
![Logo](https://raw.githubusercontent.com/kreuzerk/ng-sortgrid/master/projects/ng-sortgrid-demo/src/assets/ng-sortgrid-logo.png)

![Grid demo](https://raw.githubusercontent.com/kreuzerk/ng-sortgrid/master/projects/ng-sortgrid-demo/src/assets/grid-demo.gif)

Expand Down Expand Up @@ -97,4 +97,4 @@ at the top of your page. In this case you need to scroll once you drag an elemen
## Scroll speed (*default 50*)
The *scrollSpeed* property accepts a number and allows you to specify the scrolling speed.


[Check out the scroll demo](https://kreuzerk.github.io/ng-sortgrid/scrolling)

0 comments on commit 0b28ba9

Please sign in to comment.