add link to wiki in toolbar

* adjust margin and size of map-frame
* add link to gitlab wiki
This commit is contained in:
tim-herbst 2020-12-19 13:25:39 +01:00 committed by Tim Herbst
parent f69c999f02
commit 4e46674c07
7 changed files with 55 additions and 24 deletions

View File

@ -7,6 +7,10 @@
# Only exists if Bazel was run # Only exists if Bazel was run
/bazel-out /bazel-out
# exclude generated css-files
/src/app/map/*.css.map
/src/app/map/*.css
# dependencies # dependencies
/node_modules /node_modules

View File

@ -7,6 +7,8 @@ import { MapComponent } from './map/map.component';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {MatToolbarModule} from '@angular/material/toolbar'; import {MatToolbarModule} from '@angular/material/toolbar';
import {FlexLayoutModule} from '@angular/flex-layout'; import {FlexLayoutModule} from '@angular/flex-layout';
import {MatIconModule} from '@angular/material/icon';
import {MatButtonModule} from '@angular/material/button';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -18,9 +20,12 @@ import {FlexLayoutModule} from '@angular/flex-layout';
AppRoutingModule, AppRoutingModule,
BrowserAnimationsModule, BrowserAnimationsModule,
MatToolbarModule, MatToolbarModule,
MatIconModule,
MatButtonModule,
FlexLayoutModule FlexLayoutModule
], ],
providers: [], providers: [],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
export class AppModule { } export class AppModule {
}

View File

@ -1,18 +1,20 @@
.mat-toolbar { .toolbar-spacer {
display: flex; flex: 1 1 auto;
} }
.map-container { .map-container {
margin: 30px; margin: 0;
height: 100%; height: 95%;
} }
.map-frame { .map-frame {
height: 90%; height: 100%;
width: 100%;
} }
#map { #map {
height: 100%; height: 100%;
width: 100%;
} }
/*# sourceMappingURL=map.component.css.map */ /*# sourceMappingURL=map.component.css.map */

View File

@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["map.component.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE","file":"map.component.css"} {"version":3,"sourceRoot":"","sources":["map.component.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA","file":"map.component.css"}

View File

@ -1,5 +1,12 @@
<div class="myApp">
<mat-toolbar class="mat-toolbar" color="primary"> <mat-toolbar class="mat-toolbar" color="primary">
<span>My Application</span> <span>Bike Stations in London</span>
<span class="toolbar-spacer"></span>
<a class="button-wiki" color="primary"
href="https://gitlab.com/marcel.schwarz/geovisualisierung/-/wikis/Projektarbeit%203" mat-flat-button
target="_blank">
<mat-icon>library_books</mat-icon>
Wiki</a>
</mat-toolbar> </mat-toolbar>
<div class="map-container"> <div class="map-container">
@ -7,4 +14,6 @@
<div id="map"></div> <div id="map"></div>
</div> </div>
</div> </div>
</div>

View File

@ -1,16 +1,28 @@
.myApp {
margin: 0;
height: 100vh;
width: 100vw;
}
.toolbar-spacer {
flex: 1 1 auto;
}
.mat-toolbar { .mat-toolbar {
display: flex; height: 4%
} }
.map-container { .map-container {
margin: 30px; margin: 10px;
height: 100%; height: 94%;
} }
.map-frame { .map-frame {
height: 90%; height: 100%;
width: 100%;
} }
#map { #map {
height: 100%; height: 100%;
width: 100%;
} }

View File

@ -8,7 +8,6 @@ import {MapService} from '../service/map.service';
styleUrls: ['./map.component.scss'] styleUrls: ['./map.component.scss']
}) })
export class MapComponent implements AfterViewInit { export class MapComponent implements AfterViewInit {
private map;
constructor(private service: MapService) { constructor(private service: MapService) {
} }