fe / yohobuy-frontend · Commits

Go to a project

Authored by 2586703@qq.com
Commit 51373fda58decc3fe9478cdad319009d6751604c 1 parent 9105db56

2015-03-30 pull

Inline Side-by-side
Showing 12 changed files with 35 additions and 9 deletions
... ... @@ -10,12 +10,13 @@ javascripts_dir = "./public/js"
# You can select your preferred output style here (can be overridden via the command line):
# output_style = :expanded or :nested or :compact or :compressed
output_style = :compressed
# To enable relative paths to assets via compass helper functions. Uncomment:
relative_assets = true
relative_assets = true
# To disable debugging comments that display the original location of your selectors. Uncomment:
line_comments = false
line_comments = false
# If you prefer the indented syntax, you might want to regenerate this
... ... @@ -23,4 +24,5 @@ line_comments = false
# preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
Encoding.default_external = "utf-8";
\ No newline at end of file
Encoding.default_external = "utf-8"
\ No newline at end of file
... ...
... ... @@ -10,7 +10,7 @@ var gulp = require('gulp'),
server = require('gulp-develop-server');
// 启动
gulp.task('default', ['server', 'server:restart', 'compass-watch', 'compass']);
gulp.task('default', ['server', 'server:restart', 'compass-watch']);
// start express server
gulp.task('server', function() {
... ...
<!DOCTYPE html>
<html>
<head>
<title>Hello</title>
<title></title>
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0 user-scalable=no">
<meta content="telephone=no" name="format-detection">
... ...
@import "compass";
@include global-reset();
/**
* 闭合浮动
* @Doc: http://nicolasgallagher.com/micro-clearfix-hack/
*/
.clearfix:before,
.clearfix:after {
content: "";
display: table;
}
.clearfix:after {
clear: both;
}
.clearfix {
*zoom: 1; /* IE6-7 触发 hasLayout */
}
\ No newline at end of file
... ...
... ... @@ -3,8 +3,8 @@
* author: xuqi(qi.xu@yoho.cn)
* date: 2015/3/27
*/
var page = require('./views/controller/page');
var detail = require('./views/controller/detail');
module.exports = function(app) {
app.get('/', page.show);
app.get('/detail', detail.show);
};
\ No newline at end of file
... ...
exports.show = function(req, res) {
res.render('index', {
res.render('detail', {
layout: '../layouts/layout'
});
}
\ No newline at end of file
... ...
{{> detail_author}}
\ No newline at end of file
... ...
Hello, success
\ No newline at end of file
<div class="detail-author clearfix">
<div class="detail-avater"></div>
</div>
\ No newline at end of file
... ...