Toggle navigation
Toggle navigation
This project
Loading...
Sign in
asada
/
lifeup.cyber-physical.jp
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
asada
2019-12-06 18:53:01 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
287d3170afefee1bd8efe1fa245400e22255f4b7
287d3170
1 parent
bdc5c3a3
no message
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
39 additions
and
42 deletions
_notes/dwsync.xml
common/css/_notes/dwsync.xml
common/css/common.css
common/img/_notes/dwsync.xml
common/js/_notes/dwsync.xml
img/event/03/_notes/dwsync.xml
img/event/03/list_thumb.jpg
img/event/03/mainimage.jpg
img/interview/secom/_notes/dwsync.xml
img/top/_notes/dwsync.xml
index.html
interview/_notes/dwsync.xml
interview/event03.html
news/_notes/dwsync.xml
_notes/dwsync.xml
View file @
287d317
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<<<<<<
< HEAD
<file
name=
"index191206.html"
server=
"onoff02.source.co.jp"
local=
"132200861293970204"
remote=
"132200860800000000"
Dst=
"0"
/>
=======
<file
name=
"index.html"
server=
"onoff02.source.co.jp"
local=
"132200664923803774"
remote=
"132200776200000000"
Dst=
"0"
/>
>>>>>>> master
<file
name=
"index.html"
server=
"onoff02.source.co.jp"
local=
"132200920010428394"
remote=
"132200919600000000"
Dst=
"0"
/>
</dwsync>
\ No newline at end of file
...
...
common/css/_notes/dwsync.xml
View file @
287d317
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file
name=
"common.css"
server=
"onoff02.source.co.jp"
local=
"132
183521301068082"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"_mixin_common.scss"
server=
"onoff02.source.co.jp"
local=
"1321
83521301048155"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"_mixin_style.scss"
server=
"onoff02.source.co.jp"
local=
"1321
83521301058107"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"common.scss"
server=
"onoff02.source.co.jp"
local=
"1321
83521301068082"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"html5reset-1.6.1.css"
server=
"onoff02.source.co.jp"
local=
"1321
83521301068082"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"common.css"
server=
"onoff02.source.co.jp"
local=
"132
200936557753693"
remote=
"1322009376
00000000"
Dst=
"0"
/>
<file
name=
"_mixin_common.scss"
server=
"onoff02.source.co.jp"
local=
"1321
44626180000000"
remote=
"1322009376
00000000"
Dst=
"0"
/>
<file
name=
"_mixin_style.scss"
server=
"onoff02.source.co.jp"
local=
"1321
44626180000000"
remote=
"1322009376
00000000"
Dst=
"0"
/>
<file
name=
"common.scss"
server=
"onoff02.source.co.jp"
local=
"1321
44626200000000"
remote=
"1322009376
00000000"
Dst=
"0"
/>
<file
name=
"html5reset-1.6.1.css"
server=
"onoff02.source.co.jp"
local=
"1321
44626200000000"
remote=
"1322009376
00000000"
Dst=
"0"
/>
</dwsync>
\ No newline at end of file
...
...
common/css/common.css
View file @
287d317
...
...
@@ -190,4 +190,7 @@ p.copyright{
height
:
auto
;
vertical-align
:
bottom
;
}
#breadcramb
ol
{
flex-wrap
:
wrap
;
}
}
...
...
common/img/_notes/dwsync.xml
View file @
287d317
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file
name=
"hd_cps.png"
server=
"onoff02.source.co.jp"
local=
"1321
83521301088023"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"icon_arrow.png"
server=
"onoff02.source.co.jp"
local=
"1321
83521301088023"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"logo.png"
server=
"onoff02.source.co.jp"
local=
"1321
83521301098023"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"pagetop.png"
server=
"onoff02.source.co.jp"
local=
"1321
83521301098023"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"gfooter_facebook_sp.png"
server=
"onoff02.source.co.jp"
local=
"1321
83521301088023"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"hd_cps.png"
server=
"onoff02.source.co.jp"
local=
"1321
44626200000000"
remote=
"1322009376
00000000"
Dst=
"0"
/>
<file
name=
"icon_arrow.png"
server=
"onoff02.source.co.jp"
local=
"1321
44626200000000"
remote=
"1322009376
00000000"
Dst=
"0"
/>
<file
name=
"logo.png"
server=
"onoff02.source.co.jp"
local=
"1321
44626200000000"
remote=
"1322009376
00000000"
Dst=
"0"
/>
<file
name=
"pagetop.png"
server=
"onoff02.source.co.jp"
local=
"1321
44626200000000"
remote=
"1322009376
00000000"
Dst=
"0"
/>
<file
name=
"gfooter_facebook_sp.png"
server=
"onoff02.source.co.jp"
local=
"1321
44626200000000"
remote=
"1322009376
00000000"
Dst=
"0"
/>
</dwsync>
\ No newline at end of file
...
...
common/js/_notes/dwsync.xml
View file @
287d317
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file
name=
"common.js"
server=
"onoff02.source.co.jp"
local=
"1321
83521301107971"
remote=
"1321851024
00000000"
Dst=
"0"
/>
<file
name=
"common.js"
server=
"onoff02.source.co.jp"
local=
"1321
44626180000000"
remote=
"1322009376
00000000"
Dst=
"0"
/>
</dwsync>
\ No newline at end of file
...
...
img/event/03/_notes/dwsync.xml
View file @
287d317
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file
name=
"list_thumb.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
860771831787"
remote=
"1322008626
00000000"
Dst=
"0"
/>
<file
name=
"mainimage.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
862418121237"
remote=
"1322008626
00000000"
Dst=
"0"
/>
<file
name=
"list_thumb.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
942759243692"
remote=
"1322009430
00000000"
Dst=
"0"
/>
<file
name=
"mainimage.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
942944431673"
remote=
"1322009430
00000000"
Dst=
"0"
/>
</dwsync>
\ No newline at end of file
...
...
img/event/03/list_thumb.jpg
View file @
287d317
2.91 KB
|
W:
|
H:
78 KB
|
W:
|
H:
2-up
Swipe
Onion skin
img/event/03/mainimage.jpg
View file @
287d317
5.33 KB
|
W:
|
H:
203 KB
|
W:
|
H:
2-up
Swipe
Onion skin
img/interview/secom/_notes/dwsync.xml
View file @
287d317
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file
name=
"icon_koizumi.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
633871080235"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"icon_kubo.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
633115768025"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"icon_teramoto.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
630653769846"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"eyecatch.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
629099264383"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"image02.png"
server=
"onoff02.source.co.jp"
local=
"132200
662505432740"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"img_koizumi.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
634312688242"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"image01.png"
server=
"onoff02.source.co.jp"
local=
"132
199161140000000"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"img_kubo.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
657938720944"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"img_mimamori.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
660742434144"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"img_last.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
656286970385"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"img_teramoto.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
630817604881"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"icon_koizumi.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
918501993144"
remote=
"1322009382
00000000"
Dst=
"0"
/>
<file
name=
"icon_kubo.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
918502003121"
remote=
"1322009382
00000000"
Dst=
"0"
/>
<file
name=
"icon_teramoto.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
918502013095"
remote=
"1322009382
00000000"
Dst=
"0"
/>
<file
name=
"eyecatch.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
918501983173"
remote=
"1322009382
00000000"
Dst=
"0"
/>
<file
name=
"image02.png"
server=
"onoff02.source.co.jp"
local=
"132200
918502137868"
remote=
"1322009382
00000000"
Dst=
"0"
/>
<file
name=
"img_koizumi.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
918502157821"
remote=
"1322009382
00000000"
Dst=
"0"
/>
<file
name=
"image01.png"
server=
"onoff02.source.co.jp"
local=
"132
200918502082928"
remote=
"1322009382
00000000"
Dst=
"0"
/>
<file
name=
"img_kubo.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
918502177754"
remote=
"1322009382
00000000"
Dst=
"0"
/>
<file
name=
"img_mimamori.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
918502247573"
remote=
"1322009382
00000000"
Dst=
"0"
/>
<file
name=
"img_last.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
918502217649"
remote=
"1322009382
00000000"
Dst=
"0"
/>
<file
name=
"img_teramoto.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
918502277494"
remote=
"1322009382
00000000"
Dst=
"0"
/>
</dwsync>
\ No newline at end of file
...
...
img/top/_notes/dwsync.xml
View file @
287d317
...
...
@@ -17,5 +17,5 @@
<file
name=
"event_img02.jpg"
server=
"onoff02.source.co.jp"
local=
"132156885861136897"
remote=
"132198880800000000"
Dst=
"0"
/>
<file
name=
"interview_sharp.jpg"
server=
"onoff02.source.co.jp"
local=
"132168949948655893"
remote=
"132198880800000000"
Dst=
"0"
/>
<file
name=
"interview_gk.jpg"
server=
"onoff02.source.co.jp"
local=
"132180886446472084"
remote=
"132198880800000000"
Dst=
"0"
/>
<file
name=
"interview_secom.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
664664554287"
remote=
"1322007774
00000000"
Dst=
"0"
/>
<file
name=
"interview_secom.jpg"
server=
"onoff02.source.co.jp"
local=
"132200
918502317380"
remote=
"1322009382
00000000"
Dst=
"0"
/>
</dwsync>
\ No newline at end of file
...
...
index.html
View file @
287d317
...
...
@@ -78,8 +78,6 @@
<dd><a
href=
"/interview/event01.html"
>
イベント「LIFE UP プロモーション~赤ずきんちゃんのスマートライフな一日~」を開催します。
</a></dd>
<dt>
2019.11.13
</dt>
<dd><a
href=
"/interview/"
>
「イベント・インタビュー」を更新しました。
</a></dd>
<dt>
2019.10.31
</dt>
<dd><a
href=
"/interview/"
>
「イベント・インタビュー」を更新しました。
</a></dd>
</dl>
</div>
<div
class=
"more"
>
...
...
interview/_notes/dwsync.xml
View file @
287d317
...
...
@@ -12,11 +12,8 @@
<file
name=
"gk02.html"
server=
"onoff02.source.co.jp"
local=
"132180886446541900"
remote=
"132198880800000000"
Dst=
"0"
/>
<file
name=
"event01.html"
server=
"onoff02.source.co.jp"
local=
"132198857872061391"
remote=
"132198880800000000"
Dst=
"0"
/>
<file
name=
"event02.html"
server=
"onoff02.source.co.jp"
local=
"132199751619285749"
remote=
"132199752000000000"
Dst=
"0"
/>
<<<<<<
< HEAD
<file
name=
"event03.html"
server=
"onoff02.source.co.jp"
local=
"132200863438053211"
remote=
"132200863200000000"
Dst=
"0"
/>
=======
<file
name=
"secom02.html"
server=
"onoff02.source.co.jp"
local=
"132200877610000000"
remote=
"132200877600000000"
Dst=
"0"
/>
<file
name=
"secom01.html"
server=
"onoff02.source.co.jp"
local=
"132200851220801087"
remote=
"132200851200000000"
Dst=
"0"
/>
<file
name=
"index.html"
server=
"onoff02.source.co.jp"
local=
"132200860466365302"
remote=
"132200860200000000"
Dst=
"0"
/>
>>>>>>> master
<file
name=
"event03.html"
server=
"onoff02.source.co.jp"
local=
"132200961755755962"
remote=
"132200961600000000"
Dst=
"0"
/>
<file
name=
"index.html"
server=
"onoff02.source.co.jp"
local=
"132200918502631640"
remote=
"132200920200000000"
Dst=
"0"
/>
<file
name=
"secom01.html"
server=
"onoff02.source.co.jp"
local=
"132200918502337327"
remote=
"132200938200000000"
Dst=
"0"
/>
<file
name=
"secom02.html"
server=
"onoff02.source.co.jp"
local=
"132200918502347308"
remote=
"132200938200000000"
Dst=
"0"
/>
</dwsync>
\ No newline at end of file
...
...
interview/event03.html
View file @
287d317
...
...
@@ -65,8 +65,7 @@
<figure><img
src=
"/img/event/03/mainimage.jpg"
alt=
""
></figure>
<p>
現在、二子玉川 蔦屋家電にて2019年11月23日(土・祝)〜2020年1月13日(月・祝)まで開催中の働くママや女性たちをサポートするスマートライフのある暮らしをご紹介するイベント「LIFE UP プロモーション~赤ずきんちゃんのスマートライフな一日~」は、新たに2019年12月14日(土)からエディオン蔦屋家電(広島市南区松原町)にて開催することが決定いたしました。
<br>
開催初日には「ママの時短を本気でかなえる スマートライフ活用術」と題し、家電コーディネーターの戸井田園子さんとコンテンツプランナーの小沢あやさんをお招きし、働くママや女性の視点からスマートライフについてのトークイベントを開催いたします。
<br>
イベントは12月19日(木)までの6日間となりますので、お近くにお越しの際にはぜひお立ち寄りください。
当イベントでは、働くママを「赤ずきんちゃん」に見立て、物語性のある演出により、タッチパネルによる映像システムを使用で絵本を読むように楽しみながらスマートライフを体験いただけます。
</p>
<div
class=
"borderBox"
>
<h3>
「LIFE UP プロモーション~赤ずきんちゃんのスマートライフな一日~」概要
</h3>
...
...
@@ -92,6 +91,10 @@
</tr>
</table>
</div>
<p>
イベント初日には「ママの時短を本気でかなえる スマートライフ活用術」と題し、家電コーディネーターの戸井田園子さんとコンテンツプランナーの小沢あやさんをお招きし、働くママや女性の視点からスマートライフについてのトークイベントを開催いたしますので、お近くにお越しの際にはぜひお立ち寄りください。
</p>
<div
class=
"borderBox"
>
<h3>
「トークイベント」概要
</h3>
...
...
news/_notes/dwsync.xml
View file @
287d317
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file
name=
"index.html"
server=
"onoff02.source.co.jp"
local=
"132200
621362069245"
remote=
"1322007762
00000000"
Dst=
"0"
/>
<file
name=
"index.html"
server=
"onoff02.source.co.jp"
local=
"132200
919356121699"
remote=
"1322009196
00000000"
Dst=
"0"
/>
</dwsync>
\ No newline at end of file
...
...
Please
register
or
login
to post a comment