Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
whb
2016-01-14 13:40:25 +0800
Commit
663c9f816ed27140f531e212b1846d7fd5c83944
2 parents
d14ab331
81a96ecd
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
static/sass/product/_detail.scss
template/www.yohobuy.com/partials/layout/footer.phtml
web-static/gulpfile.js
static/sass/product/_detail.scss
View file @
663c9f8
...
...
@@ -303,6 +303,7 @@ $basicBtnC:#eb0313;
font-size
:
pxToRem
(
24px
);
float
:
right
;
color
:
#d0021b
;
margin-right
:
1
.4rem
;
h1
{
display
:
inline-block
;
line-height
:
pxToRem
(
88px
);
...
...
template/www.yohobuy.com/partials/layout/footer.phtml
View file @
663c9f8
...
...
@@ -12,10 +12,10 @@
<script
src=
"http://static.buy.test.yoho.cn/dist/yohobuy/{{version}}/index-debug.js"
></script>
{
{/if
}
}
{
{#if
devEnv
}
}
<script
src=
"http://localhost:800
0
/static/js/sea.js?nowrap"
></script>
<script
src=
"http://localhost:800
1
/static/js/sea.js?nowrap"
></script>
<script>
seajs.config(
{
base:
'http://localhost:800
0
/'
base:
'http://localhost:800
1
/'
}
);
</script>
{
{/if
}
}
...
...
web-static/gulpfile.js
View file @
663c9f8
...
...
@@ -56,7 +56,7 @@ gulp.task('compass-watch', function() {
// start spm server
gulp
.
task
(
'spm-doc'
,
function
()
{
var
sd
=
cp
.
exec
(
'spm doc
'
);
var
sd
=
cp
.
exec
(
'spm doc
watch --port 8001'
);
// pc用8001,h5用8000, 跑两个服务器,不冲突
// sd.stdout.on('data', function(data) {
// console.log(data);
...
...
Please
register
or
login
to post a comment