Added awesome-font

parent 7708d784
......@@ -18,32 +18,34 @@
</head>
<body>
<div class="container-fluid">
<nav class="navbar navbar-static-top navbar-inverse">
<div class="navbar-header">
<a class="navbar-brand" href="#/">Archiving Portal</a>
</div>
<nav class="navbar navbar-static-top navbar-inverse">
<div class="navbar-header">
<a class="navbar-brand" href="#/">Archiving Portal</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li><a ng-href="#/">Home</a></li>
<li><a ng-href="#/project">Project</a></li>
</ul>
</div>
</nav>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li><a ng-href="#/"><i class="fa fa-home fa-2x"></i></a></li>
<li><a ng-href="#/project">Project</a></li>
</ul>
</div>
</nav>
<!-- Angular application -->
<div class="container-fluid">
<div ng-view></div>
</div>
<hr/>
<div class="footer">
<p>Archiving Portal | NSD © 2014</p>
<!-- Static bottom navbar -->
<div class="navbar navbar-default navbar-fixed-bottom">
<div class="container">
<div class="navbar-header">
NSD <i class="fa fa-copyright"></i> 2014 <br />
<a href="mailto:post@example.org">Contact</a>
</div>
</div>
</div>
<!-- build:js scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
......@@ -57,6 +59,8 @@
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="bower_components/ng-file-upload/angular-file-upload.js"></script>
<script src="bower_components/ng-file-upload-shim/angular-file-upload-shim.js"></script>
<!-- endbower -->
<!-- endbuild -->
......
......@@ -7,12 +7,13 @@
<input ng-model="login.username" class="form-control" type="text" placeholder="Username" required autofocus>
<input ng-model="login.password" class="form-control" type="password" placeholder="Password"required>
<button class="btn btn-lg btn-info btn-block" type="submit" ng-click="doLogin()">
Sign in</button>
<i class="fa fa-sign-in fa-2x"></i></button>
</form>
</div>
<div class="col-sm-6 col-md-4 col-md-offset-4">
<div class="alert alert-warning" role="alert"><span class="glyphicon glyphicon-info-sign"></span>
Username and password are filled in by default.
<div class="alert alert-warning" role="alert">
<i class="fa fa-info-circle fa-3x"></i>
Default credentials filled in during dev.
</div>
</div>
</div>
......
$icon-font-path: "../bower_components/bootstrap/fonts/";
//$icon-font-path: "../bower_components/bootstrap/fonts/";
$fa-font-path:"../bower_components/font-awesome/fonts/";
@import '../bower_components/bootswatch/flatly/bootstrap.css';
@import '../bower_components/bootswatch/superhero/bootstrap.css';
@import '../bower_components/font-awesome/scss/font-awesome.scss';
{
"name": "archivingPortalClient",
"version": "0.0.0",
"dependencies": {
"modernizr": "2.8.x",
"moment": "2.8.x",
"angular": "1.3.x",
"jquery": "2.x.x",
"angular-animate": "1.3.x",
"angular-cookies": "1.3.x",
"angular-touch": "1.3.x",
"angular-sanitize": "1.3.x",
"angular-resource": "1.3.x",
"angular-route": "1.3.x",
"bootstrap": "3.3.x",
"bootswatch": "3.3.x",
"angular-bootstrap": "0.12.x"
},
"devDependencies": {
"angular-mocks": "1.3.x"
}
"name": "archivingPortalClient",
"version": "0.0.0",
"dependencies": {
"modernizr": "2.8.x",
"moment": "2.8.x",
"angular": "1.3.x",
"jquery": "2.x.x",
"angular-animate": "1.3.x",
"angular-cookies": "1.3.x",
"angular-touch": "1.3.x",
"angular-sanitize": "1.3.x",
"angular-resource": "1.3.x",
"angular-route": "1.3.x",
"bootstrap": "3.3.x",
"bootswatch": "3.3.x",
"font-awesome": "4.2.x",
"angular-bootstrap": "0.12.x",
"ng-file-upload": "2.x.x",
"ng-file-upload-shim": "2.x.x"
},
"devDependencies": {
"angular-mocks": "1.3.x"
}
}
......@@ -55,7 +55,7 @@ gulp.task('html', ['styles', 'scripts', 'partials'], function () {
.pipe($.uglify({preserveComments: $.uglifySaveLicense}))
.pipe(jsFilter.restore())
.pipe(cssFilter)
.pipe($.replace('bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap','fonts'))
.pipe($.replace('/bower_components/font-awesome/fonts/','fonts'))
.pipe($.csso())
.pipe(cssFilter.restore())
.pipe($.useref.restore())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment