diff --git a/client/app/app.css b/client/app/app.css index 01c3373..f8b1350 100644 --- a/client/app/app.css +++ b/client/app/app.css @@ -34,6 +34,12 @@ * App-wide Styles */ +@font-face{ + font-family: "ExpletusSans-Regular"; + src: url('/assets/fonts/ExpletusSans-Regular.ttf'), + url('/assets/fonts/ExpletusSans-Regular.ttf'); /* IE */ +} + .browserupgrade { margin: 0.2em 0; background: #ccc; @@ -72,7 +78,7 @@ } .navbar-default .navbar-brand { - color: white; + color:#ffa800; } .navbar-default .navbar-nav > li > a { diff --git a/client/app/app.js b/client/app/app.js index c0c45e2..560e3c9 100644 --- a/client/app/app.js +++ b/client/app/app.js @@ -1,7 +1,7 @@ 'use strict'; import angular from 'angular'; -// import ngAnimate from 'angular-animate'; +import ngAnimate from 'angular-animate'; import ngCookies from 'angular-cookies'; import ngResource from 'angular-resource'; import ngSanitize from 'angular-sanitize'; @@ -90,7 +90,7 @@ import editor from './services/editor/editor.service'; import './app.css'; angular.module('app2App', [ngCookies, ngResource, ngSanitize, uiRouter, uiBootstrap, _Auth, account, - admin, 'validation.match', 'ui.ace', navbar, footer, main, constants, util, ansi2html, + admin, 'validation.match', 'ui.ace', navbar, footer, main, constants, util, ansi2html, ngAnimate, // Components DesignerComponent, ProjectComponent, InventoryComponent, PlaybookComponent, FileBrowserComponent, RolesComponent, RunsComponent, CustomModulesComponent, // Services diff --git a/client/app/main/main.css b/client/app/main/main.css index 959d765..a26237a 100644 --- a/client/app/main/main.css +++ b/client/app/main/main.css @@ -24,4 +24,11 @@ .navbar-text { margin-left: 15px; + +} + + + +div { + font-family: 'ExpletusSans-Regular'; } diff --git a/client/app/main/main.html b/client/app/main/main.html index cd4fb40..0972085 100644 --- a/client/app/main/main.html +++ b/client/app/main/main.html @@ -1,6 +1,6 @@