reload works, navbar too

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

1
.gitignore vendored
View File

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

View File

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

View File

@@ -6,24 +6,40 @@ var gulp = require('gulp'),
var sass = require('gulp-sass');
gulp.task('sass', function () {
gulp.src('scss/*.scss')
.pipe(sass().on('error', sass.logError))
.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
gulp.task('serve', ['sass'], function () {
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', './']
// proxy: 'http://localhost:8888/'
});
gulp.watch(['sass/**/*.scss'], ['sass']);
gulp.watch(['./scss/*.scss'], ['sass']);
gulp.watch(['css/*.css'], reload);
});
gulp.task('sass:watch', function () {
gulp.watch('scss/*.scss', ['sass']);
gulp.watch(['./*.html'], reload);
// gulp.watch(['./*.php'], reload);
// gulp.watch(['js/**/*.js'], [reload]);
});

View File

@@ -20,6 +20,7 @@
<![endif]-->
<!-- Fav and touch icons -->
<link rel="shortcut icon" href="img/favicon.png">
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
<!--[if lt IE 9]>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
@@ -38,38 +39,38 @@
</style>
</head>
<body style="cursor: auto;" class="edit toolbox-reset">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
<div class="nav-collapse collapse">
<ul class="nav" id="menu-layoutit">
<span>test push 2</span>
<li class="divider-vertical"></li>
<li>
<div class="btn-group">
<button onclick="resizeCanvas('lg')" class="btn btn-primary"><i class="fa fa-desktop"></i> </button>
<button onclick="resizeCanvas('md')" class="btn btn-primary"><i class="fa fa-laptop"></i> </button>
<button onclick="resizeCanvas('sm')" class="btn btn-primary"><i class="fa fa-tablet"></i> </button>
<button onclick="resizeCanvas('xs')" class="btn btn-primary"><i class="fa fa-mobile-phone"></i> </button>
</div>
<div class="btn-group">
<a class="btn btn-primary" href="/" target="_blank"><i class="icon-home icon-white"></i>Home</a>
</div>
<div class="btn-group" data-toggle="buttons-radio">
<button type="button" id="edit" class="btn btn-primary active"><i class="icon-edit icon-white"></i>Edit</button>
<button type="button" class="btn btn-primary" id="devpreview"><i class="icon-eye-close icon-white"></i>Developer</button>
<button type="button" class="btn btn-primary" id="sourcepreview"><i class="icon-eye-open icon-white"></i>Preview</button>
</div>
<div class="btn-group">
<button type="button" class="btn btn-primary" data-target="#downloadModal" rel="/build/downloadModal" role="button" data-toggle="modal"><i class="icon-chevron-down icon-white"></i>Download</button>
<button class="btn btn-primary" href="#clear" id="clear"><i class="icon-trash icon-white"></i>Clear</button>
</div>
</li>
</ul>
</div>
</div>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="container">
<ul class="nav" id="menu-layoutit">
<span>test push 2</span>
<li class="divider-vertical"></li>
<li>
<div class="btn-group">
<button onclick="resizeCanvas('lg')" class="btn btn-primary"><i class="fa fa-desktop"></i> </button>
<button onclick="resizeCanvas('md')" class="btn btn-primary"><i class="fa fa-laptop"></i> </button>
<button onclick="resizeCanvas('sm')" class="btn btn-primary"><i class="fa fa-tablet"></i> </button>
<button onclick="resizeCanvas('xs')" class="btn btn-primary"><i class="fa fa-mobile-phone"></i> </button>
</div>
<div class="btn-group">
<a class="btn btn-primary" href="/" target="_blank"><i class="icon-home icon-white"></i>Home</a>
</div>
<div class="btn-group" data-toggle="buttons-radio">
<button type="button" id="edit" class="btn btn-primary active"><i class="icon-edit icon-white"></i>Edit</button>
<button type="button" class="btn btn-primary" id="devpreview"><i class="icon-eye-close icon-white"></i>Developer</button>
<button type="button" class="btn btn-primary" id="sourcepreview"><i class="icon-eye-open icon-white"></i>Preview</button>
</div>
<div class="btn-group">
<button type="button" class="btn btn-primary" data-target="#downloadModal" rel="/build/downloadModal" role="button" data-toggle="modal"><i class="icon-chevron-down icon-white"></i>Download</button>
<button class="btn btn-primary" href="#clear" id="clear"><i class="icon-trash icon-white"></i>Clear</button>
</div>
</li>
</ul>
</div>
</div>
</nav>
<div class="container-fluid">
<div class="changeDimension">
<div class="row-fluid">

View File

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

View File

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