-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Conflicts: package.json
- Loading branch information
Showing
21 changed files
with
201 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 33 additions & 30 deletions
63
app/templates/src/app/layout/directives/header.directive.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,36 @@ | ||
| <!-- Fixed navbar --> | ||
| <nav class="navbar navbar-inverse navbar-fixed-top"> | ||
| <div class="container"> | ||
| <div class="navbar-header"> | ||
| <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> | ||
| <span class="sr-only">Toggle navigation</span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </button> | ||
| <a class="navbar-brand" href="#">{{ header.title }}</a> | ||
| </div> | ||
| <div id="navbar" class="navbar-collapse collapse"> | ||
| <ul class="nav navbar-nav"> | ||
| <li class="active"><a href="#">Home</a></li> | ||
| <li><a href="#about">About</a></li> | ||
| <li><a href="#contact">Contact</a></li> | ||
| <li class="dropdown"> | ||
| <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a> | ||
| <ul class="dropdown-menu" role="menu"> | ||
| <li><a href="#">Action</a></li> | ||
| <li><a href="#">Another action</a></li> | ||
| <li><a href="#">Something else here</a></li> | ||
| <li class="divider"></li> | ||
| <li class="dropdown-header">Nav header</li> | ||
| <li><a href="#">Separated link</a></li> | ||
| <li><a href="#">One more separated link</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
| </div><!--/.nav-collapse --> | ||
| <div class="container"> | ||
| <div class="navbar-header"> | ||
| <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" | ||
| aria-expanded="false" aria-controls="navbar"> | ||
| <span class="sr-only">Toggle navigation</span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </button> | ||
| <a class="navbar-brand" href="#">{{ header.title }}</a> | ||
| </div> | ||
| </nav> | ||
| <div id="navbar" class="navbar-collapse collapse"> | ||
| <ul class="nav navbar-nav"> | ||
| <li class="active"><a href="#">Home</a></li> | ||
| <li><a href="#about">About</a></li> | ||
| <li><a href="#contact">Contact</a></li> | ||
| <li class="dropdown"> | ||
| <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span | ||
| class="caret"></span></a> | ||
| <ul class="dropdown-menu" role="menu"> | ||
| <li><a href="#">Action</a></li> | ||
| <li><a href="#">Another action</a></li> | ||
| <li><a href="#">Something else here</a></li> | ||
| <li class="divider"></li> | ||
| <li class="dropdown-header">Nav header</li> | ||
| <li><a href="#">Separated link</a></li> | ||
| <li><a href="#">One more separated link</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <!--/.nav-collapse --> | ||
| </div> | ||
| </nav> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| <div class="container-fluid"> | ||
| <div class="row" ui-view="content"></div> | ||
| </div> | ||
| <div class="row" ui-view="content"></div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| 'use strict'; | ||
|
|
||
| var gulp = require('gulp'); | ||
| var projectConfig = require(process.cwd() + '/project.config.js')(); | ||
| var bootlint = require('gulp-bootlint'); | ||
|
|
||
| /** | ||
| * Boot-Lint | ||
| * Lints all .html files with bootstrap linting rules. | ||
| */ | ||
| gulp.task('bootlint', function() { | ||
| // E001 is DOCTYPE at start of file; E015 is multiple input-addons on one side of input disallowed | ||
| // full list here: https://github.com/twbs/bootlint/wiki | ||
| return gulp.src(projectConfig.path.srcDir + '/' + projectConfig.path.appDir + '/**/*.html') | ||
| .pipe(bootlint({ disabledIds: ['E001', 'E015'] })); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| 'use strict'; | ||
|
|
||
| var gulp = require('gulp'); | ||
| var path = require('path'); | ||
| var projectConfig = require(process.cwd() + '/project.config.js')(); | ||
| var autoprefixer = require('gulp-autoprefixer'); | ||
|
|
||
| gulp.task('css-auto-prefix',[<% if(prompts.useLess) { %>'less'<% } %><% if(prompts.useSass) { %>'sass'<% } %><% if(prompts.useTypescript) { %>, 'ts' <% } %>], function () { | ||
| var mainCssDir = path.join(projectConfig.path.srcDir, projectConfig.path.assets.cssDir); | ||
| var cssFile = projectConfig.pkg.name + '.css'; | ||
|
|
||
| return gulp.src(path.join(mainCssDir, cssFile)) | ||
| .pipe(autoprefixer({ | ||
| browsers: projectConfig.autoprefixer.browsers, | ||
| cascade: false, | ||
| remove: projectConfig.autoprefixer.remove | ||
| })) | ||
| .pipe(gulp.dest(mainCssDir)); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.