pull/1350/head^2
Jamie.Rees 8 years ago
parent e0250921a4
commit 767c69e137

@ -121,12 +121,17 @@ legend {
.navbar-default { .navbar-default {
background-color: #0a0a0a; background-color: #0a0a0a;
border-color: #0a0a0a;
} }
.navbar-default .navbar-brand { .navbar-default .navbar-brand {
color: #DF691A; color: #DF691A;
} }
.nav-tabs {
border-bottom: 1px solid $bg-colour-disabled;
}
.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:hover,
.navbar-default .navbar-nav > li > a:focus { .navbar-default .navbar-nav > li > a:focus {
color: #F0ad4e; color: #F0ad4e;

@ -1,4 +1,4 @@
@import "./lib/bootstrap.css"; @import "./bootstrap.css";
//@import "./lib/tether.css"; //@import "./lib/tether.css";
@import "../node_modules/primeng/resources/themes/omega/theme.scss"; @import "../node_modules/primeng/resources/themes/omega/theme.scss";
@import "./lib/primeng.css"; @import "./lib/primeng.css";

@ -679,7 +679,6 @@ $border-radius: 10px;
.navbar-brand { .navbar-brand {
float: left; float: left;
padding: 4.5px 15px;
font-size: 19px; font-size: 19px;
line-height: 21px; line-height: 21px;
height: 40px; height: 40px;
@ -688,3 +687,18 @@ $border-radius: 10px;
.gravatar{ .gravatar{
border-radius:1em; border-radius:1em;
} }
// Bootstrap overrides
html {
font-size: 10px;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
line-height: 1.42857143;
color: #333;
background-color: #fff;
}

File diff suppressed because it is too large Load Diff

@ -1,14 +0,0 @@
@{
ViewData["Title"] = "Error";
}
<h1 class="text-danger">Error.</h1>
<h2 class="text-danger">An error occurred while processing your request.</h2>
<h3>Development Mode</h3>
<p>
Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
</p>
<p>
<strong>Development environment should not be enabled in deployed applications</strong>, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>, and restarting the application.
</p>

@ -19,7 +19,32 @@
</div> </div>
</nav> </nav>
<!--<nav class="navbar navbar-toggleable-md navbar-light bg-faded">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" [routerLink]="['/']">Ombi</a>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Features</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Pricing</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Disabled</a>
</li>
</ul>
</div>
</nav>-->
<div class="container" style="padding-top: 5%"> <div class="container" style="padding-top: 5%">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>

@ -10,6 +10,7 @@ import { SearchComponent } from './search/search.component';
import { PageNotFoundComponent } from './errors/not-found.component'; import { PageNotFoundComponent } from './errors/not-found.component';
import { ButtonModule } from 'primeng/primeng';
import { MenubarModule } from 'primeng/components/menubar/menubar'; import { MenubarModule } from 'primeng/components/menubar/menubar';
import { GrowlModule } from 'primeng/components/growl/growl'; import { GrowlModule } from 'primeng/components/growl/growl';
@ -26,7 +27,7 @@ const routes: Routes = [
HttpModule, HttpModule,
MenubarModule, MenubarModule,
GrowlModule, GrowlModule,
//ITAdminModule ButtonModule
], ],
declarations: [ declarations: [
AppComponent, AppComponent,
@ -34,8 +35,7 @@ const routes: Routes = [
SearchComponent SearchComponent
], ],
providers: [ providers: [
//MessageService, //Services
//UtilService
], ],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })

@ -7,22 +7,22 @@
<ul id="nav-tabs" class="nav nav-tabs" role="tablist"> <ul id="nav-tabs" class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"> <li role="presentation" class="active">
<a id="movieTabButton" href="#MoviesTab" aria-controls="home" role="tab" data-toggle="tab"><i class="fa fa-film"></i> @UI.Search_Movies</a> <a id="movieTabButton" href="#MoviesTab" aria-controls="home" role="tab" data-toggle="tab"><i class="fa fa-film"></i> Movies</a>
</li> </li>
<li role="presentation"> <li role="presentation">
<a id="actorTabButton" href="#ActorsTab" aria-controls="profile" role="tab" data-toggle="tab"><i class="fa fa-users"></i> @UI.Search_Actors</a> <a id="actorTabButton" href="#ActorsTab" aria-controls="profile" role="tab" data-toggle="tab"><i class="fa fa-users"></i> Actors</a>
</li> </li>
<li role="presentation"> <li role="presentation">
<a id="tvTabButton" href="#TvShowTab" aria-controls="profile" role="tab" data-toggle="tab"><i class="fa fa-television"></i> @UI.Search_TvShows</a> <a id="tvTabButton" href="#TvShowTab" aria-controls="profile" role="tab" data-toggle="tab"><i class="fa fa-television"></i> TV Shows</a>
</li> </li>
<li role="presentation"> <li role="presentation">
<a href="#MusicTab" aria-controls="profile" role="tab" data-toggle="tab"><i class="fa fa-music"></i>@UI.Search_Albums</a> <a href="#MusicTab" aria-controls="profile" role="tab" data-toggle="tab"><i class="fa fa-music"></i> Albums</a>
</li> </li>
</ul> </ul>

@ -62,7 +62,6 @@ var paths = {
{ {
src: [ src: [
'./bower_components/PACE/themes/purple/pace-theme-minimal.css', './bower_components/PACE/themes/purple/pace-theme-minimal.css',
'./node_modules/bootstrap/dist/css/bootstrap.css',
'./bower_components/font-awesome/css/font-awesome.css', './bower_components/font-awesome/css/font-awesome.css',
'./node_modules/primeng/resources/primeng.css', './node_modules/primeng/resources/primeng.css',
'./node_modules/tether/dist/css/tether.css' './node_modules/tether/dist/css/tether.css'

@ -16,7 +16,6 @@
"@angular/router": "^4.0.0", "@angular/router": "^4.0.0",
"@types/jquery": "^2.0.33", "@types/jquery": "^2.0.33",
"@types/systemjs": "^0.20.2", "@types/systemjs": "^0.20.2",
"bootstrap": "4.0.0-alpha.6",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"del": "^2.2.2", "del": "^2.2.2",
"gulp": "~3.9.1", "gulp": "~3.9.1",
@ -30,7 +29,7 @@
"gulp-sourcemaps": "^1.9.0", "gulp-sourcemaps": "^1.9.0",
"gulp-systemjs-builder": "^0.15.0", "gulp-systemjs-builder": "^0.15.0",
"gulp-uglify": "^1.5.4", "gulp-uglify": "^1.5.4",
"jquery": "3.2.1", "jquery": "2.2.1",
"merge-stream": "^1.0.1", "merge-stream": "^1.0.1",
"nanoscroller": "^0.8.7", "nanoscroller": "^0.8.7",
"primeng": "^2.0.5", "primeng": "^2.0.5",

Loading…
Cancel
Save