easylinux/BootstrapPageGenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reload works, navbar too

Browse Source
This commit is contained in:
Angel Ordax
2015-12-04 17:17:49 +01:00
parent fb9fa9efcc
commit b1337fdfca
6 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1 +1,2 @@
node_modules/ node_modules/
.sass-cache/

3
css/layoutit.css
View File

@@ -1,8 +1,9 @@
/* compiler is working */ /* compiler is working */
body { body {
background: lightblue !important;
padding-top: 50px; padding-top: 50px;
padding-bottom: 40px; padding-bottom: 40px;
margin-left: 200px; margin-left: 200px !important;
-webkit-transition: margin 500ms ease; -webkit-transition: margin 500ms ease;
-moz-transition: margin 500ms ease; -moz-transition: margin 500ms ease;
-ms-transition: margin 500ms ease; -ms-transition: margin 500ms ease;

30
gulpfile.js
View File

@@ -6,24 +6,40 @@ var gulp = require('gulp'),
var sass = require('gulp-sass'); var sass = require('gulp-sass');
gulp.task('sass', function () { gulp.task('sass', function () {
gulp.src('scss/*.scss') gulp.src('scss/*.scss')
.pipe(sass().on('error', sass.logError)) .pipe(sass().on('error', sass.logError))
.pipe(gulp.dest('css')); .pipe(gulp.dest('css'));
}); });
gulp.task('sass:watch', function () {
gulp.watch('scss/*.scss', ['sass']);
gulp.watch(['css/*.css'], reload);
});
// Start a server with Live Reload // Start a server with Live Reload
gulp.task('serve', ['sass'], function () { gulp.task('serve', ['sass'], function () {
browserSync({ browserSync({
// notify: false,
// Customize the BrowserSync console logging prefix
// logPrefix: 'WSK',
// Run as an https by uncommenting 'https: true'
// Note: this uses an unsigned certificate which on first access
// will present a certificate warning in the browser.
// https: true,
server: ['.tmp', './'] server: ['.tmp', './']
// proxy: 'http://localhost:8888/'
}); });
gulp.watch(['sass/**/*.scss'], ['sass']); gulp.watch(['./scss/*.scss'], ['sass']);
gulp.watch(['css/*.css'], reload); gulp.watch(['css/*.css'], reload);
gulp.watch(['./*.html'], reload);
}); // gulp.watch(['./*.php'], reload);
// gulp.watch(['js/**/*.js'], [reload]);
gulp.task('sass:watch', function () {
gulp.watch('scss/*.scss', ['sass']);
}); });

11
index.html
View File

@@ -20,6 +20,7 @@
<![endif]--> <![endif]-->
<!-- Fav and touch icons --> <!-- Fav and touch icons -->
<link rel="shortcut icon" href="img/favicon.png"> <link rel="shortcut icon" href="img/favicon.png">
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script> <script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script> <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
@@ -38,10 +39,9 @@
</style> </style>
</head> </head>
<body style="cursor: auto;" class="edit toolbox-reset"> <body style="cursor: auto;" class="edit toolbox-reset">
<div class="navbar navbar-inverse navbar-fixed-top"> <nav class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid"> <div class="container-fluid">
<div class="nav-collapse collapse"> <div class="container">
<ul class="nav" id="menu-layoutit"> <ul class="nav" id="menu-layoutit">
<span>test push 2</span> <span>test push 2</span>
<li class="divider-vertical"></li> <li class="divider-vertical"></li>
@@ -68,8 +68,9 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </nav>
</div>
<div class="container-fluid"> <div class="container-fluid">
<div class="changeDimension"> <div class="changeDimension">
<div class="row-fluid"> <div class="row-fluid">

4
package.json
View File

@@ -1,7 +1,9 @@
{ {
"name": "Devex_FE_assets", "name": "Devex_FE_assets",
"version": "0.0.0", "version": "0.0.0",
"dependencies": {}, "dependencies": {
"browser-sync": "^2.10.0"
},
"devDependencies": { "devDependencies": {
"gulp": "~3.9.0", "gulp": "~3.9.0",
"gulp-sass": "^2.0.0", "gulp-sass": "^2.0.0",

3
scss/layoutit.scss
View File

@@ -1,8 +1,9 @@
/* compiler is working */ /* compiler is working */
body { body {
background: lightblue !important;
padding-top:50px; padding-top:50px;
padding-bottom: 40px; padding-bottom: 40px;
margin-left:200px; margin-left:200px !important;
-webkit-transition: margin 500ms ease; -webkit-transition: margin 500ms ease;
-moz-transition: margin 500ms ease; -moz-transition: margin 500ms ease;
-ms-transition: margin 500ms ease; -ms-transition: margin 500ms ease;