From 1f96b47edd162efe750d8f10fd90e6400f5f6b98 Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Mon, 1 May 2017 12:46:11 +0900 Subject: [PATCH 01/12] =?UTF-8?q?issue=20#8=20=E3=82=B9=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=AC=E3=82=A4=E3=83=89=E3=81=AB=E3=82=B0=E3=83=AA?= =?UTF-8?q?=E3=83=83=E3=83=89=E3=82=BB=E3=83=AB=E5=8F=B3=E5=AF=84=E3=81=9B?= =?UTF-8?q?=E5=B7=A6=E5=AF=84=E3=81=9B=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/scss/component/5.1.grid.scss | 61 +++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/assets/scss/component/5.1.grid.scss b/assets/scss/component/5.1.grid.scss index 8d60f6a..04a06ae 100644 --- a/assets/scss/component/5.1.grid.scss +++ b/assets/scss/component/5.1.grid.scss @@ -247,3 +247,64 @@ Styleguide 5.1.8 } } } + +/* +グリッドオプション + +グリッドのセルに対して「左寄せ」「中央寄せ」「右寄せ」のオプションを付与することができます。 + +sg-wrapper: +
+ + +Styleguide 5.1.9 +*/ + +/* +グリッドセルの左寄せ + +.ec-gridに.ec-grid--leftを付与すると内包してるセルを左寄せにすることができます。 + +Markup: +.ec-grid4.ec-grid--left + .ec-grid4__cell(style="background-color: rgba(86,61,124,.15);border: 1px solid rgba(86,61,124,.2);height:50px;") ec-grid4__cell + .ec-grid4__cell(style="background-color: rgba(86,61,124,.15);border: 1px solid rgba(86,61,124,.2);height:50px;") ec-grid4__cell + .ec-grid4__cell(style="background-color: rgba(86,61,124,.15);border: 1px solid rgba(86,61,124,.2);height:50px;") ec-grid4__cell + +Styleguide 5.1.10 +*/ +.ec-grid--left { + justify-content: flex-start; +} +/* +グリッドセルの右寄せ + +.ec-gridに.ec-grid--leftを付与すると内包してるセルを左寄せにすることができます。 + +Markup: +.ec-grid4.ec-grid--right + .ec-grid4__cell(style="background-color: rgba(86,61,124,.15);border: 1px solid rgba(86,61,124,.2);height:50px;") ec-grid4__cell + .ec-grid4__cell(style="background-color: rgba(86,61,124,.15);border: 1px solid rgba(86,61,124,.2);height:50px;") ec-grid4__cell + .ec-grid4__cell(style="background-color: rgba(86,61,124,.15);border: 1px solid rgba(86,61,124,.2);height:50px;") ec-grid4__cell + +Styleguide 5.1.11 +*/ +.ec-grid--right { + justify-content: flex-end; +} +/* +グリッドセルの中央寄せ + +.ec-gridに.ec-grid--leftを付与すると内包してるセルを左寄せにすることができます。 + +Markup: +.ec-grid4.ec-grid--center + .ec-grid4__cell(style="background-color: rgba(86,61,124,.15);border: 1px solid rgba(86,61,124,.2);height:50px;") ec-grid4__cell + .ec-grid4__cell(style="background-color: rgba(86,61,124,.15);border: 1px solid rgba(86,61,124,.2);height:50px;") ec-grid4__cell + .ec-grid4__cell(style="background-color: rgba(86,61,124,.15);border: 1px solid rgba(86,61,124,.2);height:50px;") ec-grid4__cell + +Styleguide 5.1.12 +*/ +.ec-grid--center { + justify-content: center +} \ No newline at end of file From 8b8e381c22916c99e6af337ae9ca0f384d0539fa Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Mon, 1 May 2017 16:58:55 +0900 Subject: [PATCH 02/12] =?UTF-8?q?issue=20#92=E3=80=80=E3=82=AB=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=81=AE=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97(=E5=95=86=E5=93=81=E3=81=82=E3=82=8A)=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=80=81js=E5=AE=9F=E8=A3=85=20=E3=83=9D?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=82=A2=E3=83=83=E3=83=97(=E5=95=86?= =?UTF-8?q?=E5=93=81=E3=81=AA=E3=81=97)=E3=81=AF=E3=82=B5=E3=82=A4?= =?UTF-8?q?=E3=83=88=E3=83=9E=E3=83=83=E3=83=97=E3=81=AE=E6=96=B9=E3=81=AB?= =?UTF-8?q?=E5=86=8D=E7=8F=BE=E3=83=9A=E3=83=BC=E3=82=B8=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/js/script.js | 6 +- assets/scss/component/7.3.cart.scss | 56 +++++++++++++++++++ assets/tmpl/elements/11.2.header.pug | 42 ++++++++++++++ assets/tmpl/moc/layout/cartNavi_popupNull.pug | 54 ++++++++++++++++++ assets/tmpl/moc/sitemap.pug | 2 + 5 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 assets/tmpl/moc/layout/cartNavi_popupNull.pug diff --git a/assets/js/script.js b/assets/js/script.js index d4b6b34..03d8a22 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -17,7 +17,11 @@ $(function(){ $(".ec-cartNavi").on("click",function(){ $(".ec-headerRole__cart").toggleClass("is_active") }) - +}) +$(function(){ + $(".ec-cartNavi--cancel").on("click",function(){ + $(".ec-headerRole__cart").toggleClass("is_active") + }) }) $(function(){ diff --git a/assets/scss/component/7.3.cart.scss b/assets/scss/component/7.3.cart.scss index d4b030a..24b5647 100644 --- a/assets/scss/component/7.3.cart.scss +++ b/assets/scss/component/7.3.cart.scss @@ -227,8 +227,64 @@ Styleguide 7.3.5 @include fadeIn; display: block; } + .ec-cartNaviIsset { + @include fadeIn; + display: block; + } } + +.ec-cartNaviIsset { + display: none; + min-width: 256px; + text-align: center; + background: #f3f3f3; + box-sizing: border-box; + padding: 16px; + z-index: 3; + position: absolute; + @include fadeOut; + & &__cart { + @include clearfix; + border-bottom: 1px solid #E8E8E8; + margin-bottom: 16px; + padding-bottom: 32px; + } + & &__cartImage { + float: left; + width: 50%; + img { + width: 100%; + } + } + & &__cartContent { + float: right; + width: 50%; + padding-left: 16px; + text-align:left; + box-sizing:border-box; + } + & &__action { + .ec-blockBtn--action { + color:#fff; + } + } + & &__cartContentTitle { + margin-bottom: 8px; + } + & &__cartContentPrice { + font-weight: bold; + } + & &__cartContentTax { + display: inline-block; + font-size: 12px; + font-weight: normal; + margin-left: 5px; + } + & &__cartContentNumber { + font-size: 14px; + } +} /* 総計 diff --git a/assets/tmpl/elements/11.2.header.pug b/assets/tmpl/elements/11.2.header.pug index 8f69211..d62450c 100644 --- a/assets/tmpl/elements/11.2.header.pug +++ b/assets/tmpl/elements/11.2.header.pug @@ -15,6 +15,36 @@ mixin ec-headerTitle +e.title: h1: a(href="/moc/") EC-CUBE3 STYLEGUIDE mixin ec-headerCart + .ec-cartNavi + .ec-cartNavi__icon + svg(viewbox="0 0 360 360") + path(d="M345,78.032v101.817c0,3.183-1.06,6-3.173,8.452c-2.116,2.455-4.828,3.877-8.132,4.275l-207.043,24.261 c0.13,0.93,0.427,2.355,0.893,4.275c0.461,1.925,0.858,3.68,1.189,5.271c0.329,1.591,0.496,3.051,0.496,4.375 c0,2.121-1.586,6.362-4.759,12.727h182.452c3.437,0,6.411,1.262,8.924,3.778c2.51,2.52,3.768,5.503,3.768,8.948 c0,3.45-1.258,6.433-3.768,8.949c-2.513,2.52-5.487,3.778-8.924,3.778H103.847c-3.44,0-6.416-1.259-8.925-3.778 c-2.513-2.517-3.768-5.499-3.768-8.949c0-1.854,0.724-4.475,2.181-7.854c1.453-3.381,3.402-7.325,5.85-11.833 c2.445-4.506,3.798-7.026,4.065-7.557L68.149,65.305H27.693c-3.44,0-6.415-1.26-8.924-3.779C16.255,59.008,15,56.026,15,52.577 c0-3.445,1.254-6.428,3.768-8.949c2.51-2.516,5.484-3.777,8.924-3.777h50.77c2.113,0,3.997,0.432,5.651,1.291 c1.651,0.864,2.975,1.891,3.966,3.082c0.993,1.195,1.851,2.82,2.58,4.873c0.724,2.058,1.22,3.813,1.486,5.27 c0.264,1.463,0.626,3.416,1.091,5.867c0.461,2.455,0.759,4.146,0.893,5.072h238.179c3.437,0,6.41,1.262,8.924,3.777 C343.742,71.602,345,74.586,345,78.032z M134.487,276.397c4.957,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.958,4.972-10.942,7.458-17.949,7.458c-7.008,0-12.989-2.486-17.947-7.458 c-4.959-4.972-7.437-10.972-7.437-17.997c0-7.026,2.478-13.026,7.437-17.998c4.958-4.971,10.938-7.457,17.947-7.457 C123.544,268.94,129.529,271.426,134.487,276.397z M312.178,276.397c4.958,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.957,4.972-10.941,7.458-17.947,7.458c-7.009,0-12.99-2.486-17.947-7.458 c-4.958-4.972-7.437-10.972-7.437-17.997c0-7.026,2.479-13.026,7.437-17.998c4.957-4.971,10.938-7.457,17.947-7.457 C301.237,268.94,307.221,271.426,312.178,276.397z") + .ec-cartNavi__iconClose + svg(viewbox="0 0 360 360") + path(d="M337.572,293.77L223.65,179.85L337.572,65.928c3.547-3.546,3.163-9.678-0.855-13.7l-29.095-29.093 c-4.022-4.021-10.153-4.402-13.7-0.856L180,136.199L66.08,22.279c-3.547-3.547-9.681-3.165-13.702,0.856L23.286,52.228 c-4.02,4.022-4.404,10.154-0.857,13.7L136.35,179.85L22.429,293.77c-3.547,3.545-3.163,9.678,0.857,13.701l29.093,29.092 c4.021,4.023,10.155,4.406,13.702,0.857L180,223.499L293.92,337.42c3.548,3.549,9.679,3.166,13.701-0.857l29.095-29.092 C340.735,303.448,341.121,297.315,337.572,293.77z") + .ec-cartNavi__badge 1 + .ec-cartNavi__label + | 合計 + .ec-cartNavi__price ¥1920 + //.ec-cartNaviNull + // .ec-cartNaviNull__message + // p 現在カート内に + // br + // | 商品がございません。 + +b.ec-cartNaviIsset + +e.cart + +e.cartImage + img(src='http://demo3.ec-cube.net/upload/save_image/0701104933_5593472d8d179.jpeg') + +e.cartContent + +e.cartContentTitle ミニテーブル + +e.cartContentPrice ¥ 12,960 + +e.cartContentTax 税込 + +e.cartContentNumber 数量：1 + +e.action + a.ec-blockBtn--action(href="/moc/guest/cart1") カートへ進む + a.ec-blockBtn.ec-cartNavi--cancel キャンセル + +mixin ec-headerCartNull .ec-cartNavi .ec-cartNavi__icon svg(viewbox="0 0 360 360") @@ -31,6 +61,18 @@ mixin ec-headerCart p 現在カート内に br | 商品がございません。 + //+b.ec-cartNaviIsset + // +e.cart + // +e.cartImage + // img(src='http://demo3.ec-cube.net/upload/save_image/0701104933_5593472d8d179.jpeg') + // +e.cartContent + // +e.cartContentTitle ミニテーブル + // +e.cartContentPrice ¥ 12,960 + // +e.cartContentTax 税込 + // +e.cartContentNumber 数量：1 + // +e.action + // a.ec-blockBtn--action(href="/moc/guest/cart1") カートへ進む + // a.ec-blockBtn キャンセル mixin ec-headerSearch diff --git a/assets/tmpl/moc/layout/cartNavi_popupNull.pug b/assets/tmpl/moc/layout/cartNavi_popupNull.pug new file mode 100644 index 0000000..23f0c67 --- /dev/null +++ b/assets/tmpl/moc/layout/cartNavi_popupNull.pug @@ -0,0 +1,54 @@ +include /node_modules/bemto.pug/bemto.pug +include /assets/tmpl/elements/11.2.header.pug +include /assets/tmpl/elements/11.3.headerNavi.pug +include /assets/tmpl/elements/11.4.categoryNavi.pug +include /assets/tmpl/elements/11.8.footer.pug +include /assets/tmpl/elements/7.1.itembanner.pug +include /assets/tmpl/elements/8.1.info.pug +include /assets/tmpl/elements/12.1.slider.pug +include /assets/tmpl/elements/12.2.eyecatch.pug + +doctype html +html(lang="ja") + head + meta(charset="utf-8") + meta(name="viewport", content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=no") + title= pageTitle + link(rel="stylesheet", href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css") + link(rel="stylesheet", href="//cdn.jsdelivr.net/jquery.slick/1.6.0/slick.css") + link(rel="stylesheet", href="/assets/css/style.css") + style + include ../guest/slick.css + body + +b.ec-layoutRole + +e.header + +b.ec-headerRole + +e.title: +ec-headerTitle + +e.cart: +ec-headerCartNull + +e.navSP: +ec-headerNavSP + +ec-headerNaviRole + +ec-cateoryNaviRole + +e.contents + +e.main + +ec-sliderRole + +ec-eyecatchRole + .ec-role + +ec-displayB + +ec-displayC + .ec-role + +b.ec-grid3 + +e.cell3: +ec-news + +e.cell + +ec-banner + .ec-role + +ec-displayD + +ec-displayD + +e.contentBottom + +e.footer + +ec-footerRole + .ec-overlayRole + .ec-drawerRole + script(src="https://code.jquery.com/jquery-2.2.4.min.js") + script(src="//cdn.jsdelivr.net/jquery.slick/1.6.0/slick.min.js") + script(src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js") + script(src="/assets/js/script.js") diff --git a/assets/tmpl/moc/sitemap.pug b/assets/tmpl/moc/sitemap.pug index 3fd59a9..36331c9 100644 --- a/assets/tmpl/moc/sitemap.pug +++ b/assets/tmpl/moc/sitemap.pug @@ -11,6 +11,8 @@ block content li: a(href="/moc/layout/leftmenu.html") 左メニューレイアウト li: a(href="/moc/layout/rightmenu.html") 右メニューレイアウト li: a(href="/moc/layout/bothmenu.html") 両メニューレイアウト + li: a(href="/moc/layout/cartNavi_popupNull.html") ナビカートのポップアップ(カート内商品が０の時) + ul li: a(href="https://github.com/EC-CUBE/Eccube-Styleguide") Github リポジトリ From 8e3195b4afd7d14f3722c52e64be97389d5741c4 Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Wed, 10 May 2017 12:05:20 +0900 Subject: [PATCH 03/12] =?UTF-8?q?Issue#98=E5=AF=BE=E5=BF=9C=20(#102)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * issue #99　7.3.6と7 カートナビゲーションのポップアップの項目を追加 * issue #98　カート内のアラートのコンポーネント追加・修正 --- assets/scss/component/7.3.cart.scss | 83 ++++++++++++++++++++- assets/scss/project/15.1.cart.scss | 29 ++++++- assets/tmpl/elements/15.1.cart.pug | 38 +++++----- assets/tmpl/moc/guest/cart1/empty/index.pug | 4 +- assets/tmpl/moc/user/cart1/empty/index.pug | 4 +- 5 files changed, 136 insertions(+), 22 deletions(-) diff --git a/assets/scss/component/7.3.cart.scss b/assets/scss/component/7.3.cart.scss index 24b5647..ffbbaae 100644 --- a/assets/scss/component/7.3.cart.scss +++ b/assets/scss/component/7.3.cart.scss @@ -233,10 +233,43 @@ Styleguide 7.3.5 } } +/* +カートナビゲーションのポップアップ(商品詳細) + +ex [カートページ　ナビゲーション部分](http://demo3.ec-cube.net/cart) +Markup: +.is_active + .ec-cartNavi + .ec-cartNavi__icon + svg(viewbox="0 0 360 360") + path(d="M345,78.032v101.817c0,3.183-1.06,6-3.173,8.452c-2.116,2.455-4.828,3.877-8.132,4.275l-207.043,24.261 c0.13,0.93,0.427,2.355,0.893,4.275c0.461,1.925,0.858,3.68,1.189,5.271c0.329,1.591,0.496,3.051,0.496,4.375 c0,2.121-1.586,6.362-4.759,12.727h182.452c3.437,0,6.411,1.262,8.924,3.778c2.51,2.52,3.768,5.503,3.768,8.948 c0,3.45-1.258,6.433-3.768,8.949c-2.513,2.52-5.487,3.778-8.924,3.778H103.847c-3.44,0-6.416-1.259-8.925-3.778 c-2.513-2.517-3.768-5.499-3.768-8.949c0-1.854,0.724-4.475,2.181-7.854c1.453-3.381,3.402-7.325,5.85-11.833 c2.445-4.506,3.798-7.026,4.065-7.557L68.149,65.305H27.693c-3.44,0-6.415-1.26-8.924-3.779C16.255,59.008,15,56.026,15,52.577 c0-3.445,1.254-6.428,3.768-8.949c2.51-2.516,5.484-3.777,8.924-3.777h50.77c2.113,0,3.997,0.432,5.651,1.291 c1.651,0.864,2.975,1.891,3.966,3.082c0.993,1.195,1.851,2.82,2.58,4.873c0.724,2.058,1.22,3.813,1.486,5.27 c0.264,1.463,0.626,3.416,1.091,5.867c0.461,2.455,0.759,4.146,0.893,5.072h238.179c3.437,0,6.41,1.262,8.924,3.777 C343.742,71.602,345,74.586,345,78.032z M134.487,276.397c4.957,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.958,4.972-10.942,7.458-17.949,7.458c-7.008,0-12.989-2.486-17.947-7.458 c-4.959-4.972-7.437-10.972-7.437-17.997c0-7.026,2.478-13.026,7.437-17.998c4.958-4.971,10.938-7.457,17.947-7.457 C123.544,268.94,129.529,271.426,134.487,276.397z M312.178,276.397c4.958,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.957,4.972-10.941,7.458-17.947,7.458c-7.009,0-12.99-2.486-17.947-7.458 c-4.958-4.972-7.437-10.972-7.437-17.997c0-7.026,2.479-13.026,7.437-17.998c4.957-4.971,10.938-7.457,17.947-7.457 C301.237,268.94,307.221,271.426,312.178,276.397z") + .ec-cartNavi__iconClose + svg(viewbox="0 0 360 360") + path(d="M337.572,293.77L223.65,179.85L337.572,65.928c3.547-3.546,3.163-9.678-0.855-13.7l-29.095-29.093 c-4.022-4.021-10.153-4.402-13.7-0.856L180,136.199L66.08,22.279c-3.547-3.547-9.681-3.165-13.702,0.856L23.286,52.228 c-4.02,4.022-4.404,10.154-0.857,13.7L136.35,179.85L22.429,293.77c-3.547,3.545-3.163,9.678,0.857,13.701l29.093,29.092 c4.021,4.023,10.155,4.406,13.702,0.857L180,223.499L293.92,337.42c3.548,3.549,9.679,3.166,13.701-0.857l29.095-29.092 C340.735,303.448,341.121,297.315,337.572,293.77z") + .ec-cartNavi__badge 1 + .ec-cartNavi__label + | 合計 + .ec-cartNavi__price ¥1920 + +b.ec-cartNaviIsset + +e.cart + +e.cartImage + img(src='http://demo3.ec-cube.net/upload/save_image/0701104933_5593472d8d179.jpeg') + +e.cartContent + +e.cartContentTitle ミニテーブル + +e.cartContentPrice ¥ 12,960 + +e.cartContentTax 税込 + +e.cartContentNumber 数量：1 + +e.action + a.ec-blockBtn--action(href="/moc/guest/cart1") カートへ進む + a.ec-blockBtn.ec-cartNavi--cancel キャンセル + +Styleguide 7.3.6 +*/ .ec-cartNaviIsset { display: none; min-width: 256px; + max-width:256px; text-align: center; background: #f3f3f3; box-sizing: border-box; @@ -285,6 +318,54 @@ Styleguide 7.3.5 font-size: 14px; } } + + + +/* +カートナビゲーションのポップアップ(商品なし) + +ex [カートページ　ナビゲーション部分](http://demo3.ec-cube.net/cart) + +Markup: +.is_active + .ec-cartNavi + .ec-cartNavi__icon + svg(viewbox="0 0 360 360") + path(d="M345,78.032v101.817c0,3.183-1.06,6-3.173,8.452c-2.116,2.455-4.828,3.877-8.132,4.275l-207.043,24.261 c0.13,0.93,0.427,2.355,0.893,4.275c0.461,1.925,0.858,3.68,1.189,5.271c0.329,1.591,0.496,3.051,0.496,4.375 c0,2.121-1.586,6.362-4.759,12.727h182.452c3.437,0,6.411,1.262,8.924,3.778c2.51,2.52,3.768,5.503,3.768,8.948 c0,3.45-1.258,6.433-3.768,8.949c-2.513,2.52-5.487,3.778-8.924,3.778H103.847c-3.44,0-6.416-1.259-8.925-3.778 c-2.513-2.517-3.768-5.499-3.768-8.949c0-1.854,0.724-4.475,2.181-7.854c1.453-3.381,3.402-7.325,5.85-11.833 c2.445-4.506,3.798-7.026,4.065-7.557L68.149,65.305H27.693c-3.44,0-6.415-1.26-8.924-3.779C16.255,59.008,15,56.026,15,52.577 c0-3.445,1.254-6.428,3.768-8.949c2.51-2.516,5.484-3.777,8.924-3.777h50.77c2.113,0,3.997,0.432,5.651,1.291 c1.651,0.864,2.975,1.891,3.966,3.082c0.993,1.195,1.851,2.82,2.58,4.873c0.724,2.058,1.22,3.813,1.486,5.27 c0.264,1.463,0.626,3.416,1.091,5.867c0.461,2.455,0.759,4.146,0.893,5.072h238.179c3.437,0,6.41,1.262,8.924,3.777 C343.742,71.602,345,74.586,345,78.032z M134.487,276.397c4.957,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.958,4.972-10.942,7.458-17.949,7.458c-7.008,0-12.989-2.486-17.947-7.458 c-4.959-4.972-7.437-10.972-7.437-17.997c0-7.026,2.478-13.026,7.437-17.998c4.958-4.971,10.938-7.457,17.947-7.457 C123.544,268.94,129.529,271.426,134.487,276.397z M312.178,276.397c4.958,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.957,4.972-10.941,7.458-17.947,7.458c-7.009,0-12.99-2.486-17.947-7.458 c-4.958-4.972-7.437-10.972-7.437-17.997c0-7.026,2.479-13.026,7.437-17.998c4.957-4.971,10.938-7.457,17.947-7.457 C301.237,268.94,307.221,271.426,312.178,276.397z") + .ec-cartNavi__iconClose + svg(viewbox="0 0 360 360") + path(d="M337.572,293.77L223.65,179.85L337.572,65.928c3.547-3.546,3.163-9.678-0.855-13.7l-29.095-29.093 c-4.022-4.021-10.153-4.402-13.7-0.856L180,136.199L66.08,22.279c-3.547-3.547-9.681-3.165-13.702,0.856L23.286,52.228 c-4.02,4.022-4.404,10.154-0.857,13.7L136.35,179.85L22.429,293.77c-3.547,3.545-3.163,9.678,0.857,13.701l29.093,29.092 c4.021,4.023,10.155,4.406,13.702,0.857L180,223.499L293.92,337.42c3.548,3.549,9.679,3.166,13.701-0.857l29.095-29.092 C340.735,303.448,341.121,297.315,337.572,293.77z") + .ec-cartNavi__badge 1 + .ec-cartNavi__label + | 合計 + .ec-cartNavi__price ¥1920 + .ec-cartNaviNull + .ec-cartNaviNull__message + p 現在カート内に + br + | 商品がございません。 + //+b.ec-cartNaviIsset + // +e.cart + // +e.cartImage + // img(src='http://demo3.ec-cube.net/upload/save_image/0701104933_5593472d8d179.jpeg') + // +e.cartContent + // +e.cartContentTitle ミニテーブル + // +e.cartContentPrice ¥ 12,960 + // +e.cartContentTax 税込 + // +e.cartContentNumber 数量：1 + // +e.action + // a.ec-blockBtn--action(href="/moc/guest/cart1") カートへ進む + // a.ec-blockBtn キャンセル + +sg-wrapper: +
+ +
+ + +Styleguide 7.3.7 +*/ + /* 総計 @@ -294,7 +375,7 @@ Markup: include /assets/tmpl/elements/7.3.cart.pug +ec-totalBox -Styleguide 7.3.6 +Styleguide 7.3.8 */ .ec-totalBox{ background:#F3F3F3; diff --git a/assets/scss/project/15.1.cart.scss b/assets/scss/project/15.1.cart.scss index 03241af..39b1e08 100644 --- a/assets/scss/project/15.1.cart.scss +++ b/assets/scss/project/15.1.cart.scss @@ -335,21 +335,26 @@ Styleguide 15.1.4 /* アラート -カートが空であることを示す警告メッセージです。 +カート内の商品に問題があることを示す警告メッセージです。 ex [マイページ　カート](http://demo3.ec-cube.net/cart) Markup: include /assets/tmpl/elements/15.1.cart.pug -+ec-alert-warning +.ec-cartRole + .ec-cartRole__cart + +ec-alert-warning Styleguide 15.1.5 */ .ec-alert-warning { + width: 100%; padding: 10px; text-align: center; background: #F99; + margin-bottom: 20px; + & &__icon { display: inline-block; @@ -357,13 +362,33 @@ Styleguide 15.1.5 height: 20px; color: #fff; fill: #fff; + position: absolute; + left: -30px; } & &__text { display: inline-block; font-size: 16px; font-weight: bold; color: #fff; + position: relative; } } + + +/* +アラート(空) + +カートが空であることを示す警告メッセージです。 + +ex [マイページ　カート](http://demo3.ec-cube.net/cart) + +Markup: +include /assets/tmpl/elements/15.1.cart.pug +.ec-off3Grid + .ec-off3Grid__cell + +ec-alert-warningEnpty + +Styleguide 15.1.6 +*/ \ No newline at end of file diff --git a/assets/tmpl/elements/15.1.cart.pug b/assets/tmpl/elements/15.1.cart.pug index 095cb1f..7660203 100644 --- a/assets/tmpl/elements/15.1.cart.pug +++ b/assets/tmpl/elements/15.1.cart.pug @@ -1,14 +1,31 @@ include ./7.3.cart.pug +mixin ec-alert-warning + +b.ec-alert-warning + +e.text + +e.icon + svg(viewbox="0 0 360 360") + path(d="M201.227,34.574l145.551,267.386c4.42,7.975,4.293,15.952-0.379,23.927c-2.151,3.671-5.089,6.582-8.814,8.735 c-3.728,2.152-7.74,3.229-12.033,3.229H34.45c-4.296,0-8.309-1.076-12.035-3.229c-3.728-2.153-6.666-5.064-8.813-8.735 c-4.673-7.975-4.8-15.952-0.379-23.927l145.55-267.386c2.146-3.922,5.117-7.026,8.907-9.305c3.79-2.279,7.895-3.418,12.319-3.418 c4.421,0,8.528,1.14,12.317,3.418C196.11,27.547,199.077,30.651,201.227,34.574z M203.88,211.945l3.41-87.167 c0-1.519-0.633-2.72-1.895-3.608c-1.644-1.392-3.159-2.089-4.548-2.089h-41.695c-1.392,0-2.908,0.697-4.549,2.089 c-1.264,0.888-1.895,2.217-1.895,3.988l3.222,86.787c0,1.266,0.631,2.311,1.895,3.132c1.262,0.826,2.778,1.236,4.548,1.236h35.061 c1.769,0,3.251-0.41,4.454-1.236C203.089,214.255,203.752,213.21,203.88,211.945z M204.258,282.968v-36.082 c0-1.772-0.601-3.259-1.8-4.462c-1.203-1.203-2.623-1.806-4.265-1.806h-36.387c-1.644,0-3.065,0.603-4.265,1.806 c-1.203,1.203-1.801,2.689-1.801,4.462v36.082c0,1.775,0.598,3.261,1.801,4.463c1.199,1.205,2.621,1.804,4.265,1.804h36.387 c1.642,0,3.062-0.599,4.265-1.804C203.658,286.229,204.258,284.744,204.258,282.968z") + | 選択された商品(ガラステーブル)の在庫が不足しております。 + br + | 一度に在庫数を超える購入はできません。 + +mixin ec-alert-warningEnpty + +b.ec-alert-warning + +e.text + +e.icon + svg(viewbox="0 0 360 360") + path(d="M201.227,34.574l145.551,267.386c4.42,7.975,4.293,15.952-0.379,23.927c-2.151,3.671-5.089,6.582-8.814,8.735 c-3.728,2.152-7.74,3.229-12.033,3.229H34.45c-4.296,0-8.309-1.076-12.035-3.229c-3.728-2.153-6.666-5.064-8.813-8.735 c-4.673-7.975-4.8-15.952-0.379-23.927l145.55-267.386c2.146-3.922,5.117-7.026,8.907-9.305c3.79-2.279,7.895-3.418,12.319-3.418 c4.421,0,8.528,1.14,12.317,3.418C196.11,27.547,199.077,30.651,201.227,34.574z M203.88,211.945l3.41-87.167 c0-1.519-0.633-2.72-1.895-3.608c-1.644-1.392-3.159-2.089-4.548-2.089h-41.695c-1.392,0-2.908,0.697-4.549,2.089 c-1.264,0.888-1.895,2.217-1.895,3.988l3.222,86.787c0,1.266,0.631,2.311,1.895,3.132c1.262,0.826,2.778,1.236,4.548,1.236h35.061 c1.769,0,3.251-0.41,4.454-1.236C203.089,214.255,203.752,213.21,203.88,211.945z M204.258,282.968v-36.082 c0-1.772-0.601-3.259-1.8-4.462c-1.203-1.203-2.623-1.806-4.265-1.806h-36.387c-1.644,0-3.065,0.603-4.265,1.806 c-1.203,1.203-1.801,2.689-1.801,4.462v36.082c0,1.775,0.598,3.261,1.801,4.463c1.199,1.205,2.621,1.804,4.265,1.804h36.387 c1.642,0,3.062-0.599,4.265-1.804C203.658,286.229,204.258,284.744,204.258,282.968z") + | 現在カート内に商品はございません。 mixin ec-cartRole +b.ec-cartRole +e.progress +ec-progress - +e.totalText - p 商品の合計金額は「 - span.ec-font-bold ¥ 1,296 - | 」です。 +e.cart + +e.totalText + p 商品の合計金額は「 + span.ec-font-bold ¥ 1,296 + | 」です。 +ec-cartTable +e.actions +e.total 合計： @@ -82,16 +99,3 @@ mixin ec-cartRow path(d='M339.635,157.1v43.638c0,6.062-2.123,11.214-6.364,15.454c-4.243,4.243-9.396,6.363-15.454,6.363h-94.545 v94.546c0,6.062-2.124,11.215-6.363,15.454c-4.244,4.243-9.396,6.363-15.455,6.363h-43.637c-6.061,0-11.214-2.12-15.455-6.363 c-4.243-4.239-6.363-9.393-6.363-15.454v-94.546H41.453c-6.062,0-11.215-2.12-15.455-6.363c-4.243-4.24-6.363-9.393-6.363-15.454 V157.1c0-6.058,2.12-11.211,6.363-15.454c4.24-4.24,9.394-6.363,15.455-6.363h94.545V40.738c0-6.06,2.12-11.211,6.363-15.455 c4.241-4.239,9.395-6.364,15.455-6.364h43.637c6.059,0,11.211,2.125,15.455,6.364c4.239,4.244,6.363,9.396,6.363,15.455v94.545 h94.545c6.059,0,11.211,2.123,15.454,6.363C337.512,145.889,339.635,151.042,339.635,157.1z') li.ec-cartRow__subtotalColumn .ec-cartRow__sutbtotal ¥ 4,320 - - -mixin ec-alert-warning - .ec-off3Grid - .ec-off3Grid__cell - +b.ec-alert-warning - +e.icon - svg(viewbox="0 0 360 360") - path(d="M201.227,34.574l145.551,267.386c4.42,7.975,4.293,15.952-0.379,23.927c-2.151,3.671-5.089,6.582-8.814,8.735 c-3.728,2.152-7.74,3.229-12.033,3.229H34.45c-4.296,0-8.309-1.076-12.035-3.229c-3.728-2.153-6.666-5.064-8.813-8.735 c-4.673-7.975-4.8-15.952-0.379-23.927l145.55-267.386c2.146-3.922,5.117-7.026,8.907-9.305c3.79-2.279,7.895-3.418,12.319-3.418 c4.421,0,8.528,1.14,12.317,3.418C196.11,27.547,199.077,30.651,201.227,34.574z M203.88,211.945l3.41-87.167 c0-1.519-0.633-2.72-1.895-3.608c-1.644-1.392-3.159-2.089-4.548-2.089h-41.695c-1.392,0-2.908,0.697-4.549,2.089 c-1.264,0.888-1.895,2.217-1.895,3.988l3.222,86.787c0,1.266,0.631,2.311,1.895,3.132c1.262,0.826,2.778,1.236,4.548,1.236h35.061 c1.769,0,3.251-0.41,4.454-1.236C203.089,214.255,203.752,213.21,203.88,211.945z M204.258,282.968v-36.082 c0-1.772-0.601-3.259-1.8-4.462c-1.203-1.203-2.623-1.806-4.265-1.806h-36.387c-1.644,0-3.065,0.603-4.265,1.806 c-1.203,1.203-1.801,2.689-1.801,4.462v36.082c0,1.775,0.598,3.261,1.801,4.463c1.199,1.205,2.621,1.804,4.265,1.804h36.387 c1.642,0,3.062-0.599,4.265-1.804C203.658,286.229,204.258,284.744,204.258,282.968z") - +e.text 現在カート内に商品はございません。 - - - diff --git a/assets/tmpl/moc/guest/cart1/empty/index.pug b/assets/tmpl/moc/guest/cart1/empty/index.pug index b0ecbe6..075cb3b 100644 --- a/assets/tmpl/moc/guest/cart1/empty/index.pug +++ b/assets/tmpl/moc/guest/cart1/empty/index.pug @@ -10,4 +10,6 @@ block content h1 ショッピングカート +ec-cartEmptyRole .ec-role - +ec-alert-warning \ No newline at end of file + .ec-off3Grid + .ec-off3Grid__cell + +ec-alert-warningEnpty \ No newline at end of file diff --git a/assets/tmpl/moc/user/cart1/empty/index.pug b/assets/tmpl/moc/user/cart1/empty/index.pug index 2638dfc..daa46f6 100644 --- a/assets/tmpl/moc/user/cart1/empty/index.pug +++ b/assets/tmpl/moc/user/cart1/empty/index.pug @@ -9,4 +9,6 @@ block content .ec-pageHeader h1 ショッピングカート +ec-cartUserEmptyRole - +ec-alert-warning \ No newline at end of file + .ec-off3Grid + .ec-off3Grid__cell + +ec-alert-warningEnpty \ No newline at end of file From c63ee868ebe5e725a23923ee1a5a28c56dc6e343 Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Wed, 10 May 2017 12:36:56 +0900 Subject: [PATCH 04/12] =?UTF-8?q?Issue#99=E5=AF=BE=E5=BF=9C=20(#103)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * issue #99　7.3.6と7 カートナビゲーションのポップアップの項目を追加 * スタイルガイド上でカートのpopが全体見えるように調整 --- assets/scss/component/7.3.cart.scss | 109 ++++++++++++++-------------- 1 file changed, 56 insertions(+), 53 deletions(-) diff --git a/assets/scss/component/7.3.cart.scss b/assets/scss/component/7.3.cart.scss index ffbbaae..ead3639 100644 --- a/assets/scss/component/7.3.cart.scss +++ b/assets/scss/component/7.3.cart.scss @@ -239,30 +239,32 @@ Styleguide 7.3.5 ex [カートページ　ナビゲーション部分](http://demo3.ec-cube.net/cart) Markup: -.is_active - .ec-cartNavi - .ec-cartNavi__icon - svg(viewbox="0 0 360 360") - path(d="M345,78.032v101.817c0,3.183-1.06,6-3.173,8.452c-2.116,2.455-4.828,3.877-8.132,4.275l-207.043,24.261 c0.13,0.93,0.427,2.355,0.893,4.275c0.461,1.925,0.858,3.68,1.189,5.271c0.329,1.591,0.496,3.051,0.496,4.375 c0,2.121-1.586,6.362-4.759,12.727h182.452c3.437,0,6.411,1.262,8.924,3.778c2.51,2.52,3.768,5.503,3.768,8.948 c0,3.45-1.258,6.433-3.768,8.949c-2.513,2.52-5.487,3.778-8.924,3.778H103.847c-3.44,0-6.416-1.259-8.925-3.778 c-2.513-2.517-3.768-5.499-3.768-8.949c0-1.854,0.724-4.475,2.181-7.854c1.453-3.381,3.402-7.325,5.85-11.833 c2.445-4.506,3.798-7.026,4.065-7.557L68.149,65.305H27.693c-3.44,0-6.415-1.26-8.924-3.779C16.255,59.008,15,56.026,15,52.577 c0-3.445,1.254-6.428,3.768-8.949c2.51-2.516,5.484-3.777,8.924-3.777h50.77c2.113,0,3.997,0.432,5.651,1.291 c1.651,0.864,2.975,1.891,3.966,3.082c0.993,1.195,1.851,2.82,2.58,4.873c0.724,2.058,1.22,3.813,1.486,5.27 c0.264,1.463,0.626,3.416,1.091,5.867c0.461,2.455,0.759,4.146,0.893,5.072h238.179c3.437,0,6.41,1.262,8.924,3.777 C343.742,71.602,345,74.586,345,78.032z M134.487,276.397c4.957,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.958,4.972-10.942,7.458-17.949,7.458c-7.008,0-12.989-2.486-17.947-7.458 c-4.959-4.972-7.437-10.972-7.437-17.997c0-7.026,2.478-13.026,7.437-17.998c4.958-4.971,10.938-7.457,17.947-7.457 C123.544,268.94,129.529,271.426,134.487,276.397z M312.178,276.397c4.958,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.957,4.972-10.941,7.458-17.947,7.458c-7.009,0-12.99-2.486-17.947-7.458 c-4.958-4.972-7.437-10.972-7.437-17.997c0-7.026,2.479-13.026,7.437-17.998c4.957-4.971,10.938-7.457,17.947-7.457 C301.237,268.94,307.221,271.426,312.178,276.397z") - .ec-cartNavi__iconClose - svg(viewbox="0 0 360 360") - path(d="M337.572,293.77L223.65,179.85L337.572,65.928c3.547-3.546,3.163-9.678-0.855-13.7l-29.095-29.093 c-4.022-4.021-10.153-4.402-13.7-0.856L180,136.199L66.08,22.279c-3.547-3.547-9.681-3.165-13.702,0.856L23.286,52.228 c-4.02,4.022-4.404,10.154-0.857,13.7L136.35,179.85L22.429,293.77c-3.547,3.545-3.163,9.678,0.857,13.701l29.093,29.092 c4.021,4.023,10.155,4.406,13.702,0.857L180,223.499L293.92,337.42c3.548,3.549,9.679,3.166,13.701-0.857l29.095-29.092 C340.735,303.448,341.121,297.315,337.572,293.77z") - .ec-cartNavi__badge 1 - .ec-cartNavi__label - | 合計 - .ec-cartNavi__price ¥1920 - +b.ec-cartNaviIsset - +e.cart - +e.cartImage - img(src='http://demo3.ec-cube.net/upload/save_image/0701104933_5593472d8d179.jpeg') - +e.cartContent - +e.cartContentTitle ミニテーブル - +e.cartContentPrice ¥ 12,960 - +e.cartContentTax 税込 - +e.cartContentNumber 数量：1 - +e.action - a.ec-blockBtn--action(href="/moc/guest/cart1") カートへ進む - a.ec-blockBtn.ec-cartNavi--cancel キャンセル + +div(style="height:350px;") + .is_active + .ec-cartNavi + .ec-cartNavi__icon + svg(viewbox="0 0 360 360") + path(d="M345,78.032v101.817c0,3.183-1.06,6-3.173,8.452c-2.116,2.455-4.828,3.877-8.132,4.275l-207.043,24.261 c0.13,0.93,0.427,2.355,0.893,4.275c0.461,1.925,0.858,3.68,1.189,5.271c0.329,1.591,0.496,3.051,0.496,4.375 c0,2.121-1.586,6.362-4.759,12.727h182.452c3.437,0,6.411,1.262,8.924,3.778c2.51,2.52,3.768,5.503,3.768,8.948 c0,3.45-1.258,6.433-3.768,8.949c-2.513,2.52-5.487,3.778-8.924,3.778H103.847c-3.44,0-6.416-1.259-8.925-3.778 c-2.513-2.517-3.768-5.499-3.768-8.949c0-1.854,0.724-4.475,2.181-7.854c1.453-3.381,3.402-7.325,5.85-11.833 c2.445-4.506,3.798-7.026,4.065-7.557L68.149,65.305H27.693c-3.44,0-6.415-1.26-8.924-3.779C16.255,59.008,15,56.026,15,52.577 c0-3.445,1.254-6.428,3.768-8.949c2.51-2.516,5.484-3.777,8.924-3.777h50.77c2.113,0,3.997,0.432,5.651,1.291 c1.651,0.864,2.975,1.891,3.966,3.082c0.993,1.195,1.851,2.82,2.58,4.873c0.724,2.058,1.22,3.813,1.486,5.27 c0.264,1.463,0.626,3.416,1.091,5.867c0.461,2.455,0.759,4.146,0.893,5.072h238.179c3.437,0,6.41,1.262,8.924,3.777 C343.742,71.602,345,74.586,345,78.032z M134.487,276.397c4.957,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.958,4.972-10.942,7.458-17.949,7.458c-7.008,0-12.989-2.486-17.947-7.458 c-4.959-4.972-7.437-10.972-7.437-17.997c0-7.026,2.478-13.026,7.437-17.998c4.958-4.971,10.938-7.457,17.947-7.457 C123.544,268.94,129.529,271.426,134.487,276.397z M312.178,276.397c4.958,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.957,4.972-10.941,7.458-17.947,7.458c-7.009,0-12.99-2.486-17.947-7.458 c-4.958-4.972-7.437-10.972-7.437-17.997c0-7.026,2.479-13.026,7.437-17.998c4.957-4.971,10.938-7.457,17.947-7.457 C301.237,268.94,307.221,271.426,312.178,276.397z") + .ec-cartNavi__iconClose + svg(viewbox="0 0 360 360") + path(d="M337.572,293.77L223.65,179.85L337.572,65.928c3.547-3.546,3.163-9.678-0.855-13.7l-29.095-29.093 c-4.022-4.021-10.153-4.402-13.7-0.856L180,136.199L66.08,22.279c-3.547-3.547-9.681-3.165-13.702,0.856L23.286,52.228 c-4.02,4.022-4.404,10.154-0.857,13.7L136.35,179.85L22.429,293.77c-3.547,3.545-3.163,9.678,0.857,13.701l29.093,29.092 c4.021,4.023,10.155,4.406,13.702,0.857L180,223.499L293.92,337.42c3.548,3.549,9.679,3.166,13.701-0.857l29.095-29.092 C340.735,303.448,341.121,297.315,337.572,293.77z") + .ec-cartNavi__badge 1 + .ec-cartNavi__label + | 合計 + .ec-cartNavi__price ¥1920 + +b.ec-cartNaviIsset + +e.cart + +e.cartImage + img(src='http://demo3.ec-cube.net/upload/save_image/0701104933_5593472d8d179.jpeg') + +e.cartContent + +e.cartContentTitle ミニテーブル + +e.cartContentPrice ¥ 12,960 + +e.cartContentTax 税込 + +e.cartContentNumber 数量：1 + +e.action + a.ec-blockBtn--action(href="/moc/guest/cart1") カートへ進む + a.ec-blockBtn.ec-cartNavi--cancel キャンセル Styleguide 7.3.6 */ @@ -327,35 +329,36 @@ Styleguide 7.3.6 ex [カートページ　ナビゲーション部分](http://demo3.ec-cube.net/cart) Markup: -.is_active - .ec-cartNavi - .ec-cartNavi__icon - svg(viewbox="0 0 360 360") - path(d="M345,78.032v101.817c0,3.183-1.06,6-3.173,8.452c-2.116,2.455-4.828,3.877-8.132,4.275l-207.043,24.261 c0.13,0.93,0.427,2.355,0.893,4.275c0.461,1.925,0.858,3.68,1.189,5.271c0.329,1.591,0.496,3.051,0.496,4.375 c0,2.121-1.586,6.362-4.759,12.727h182.452c3.437,0,6.411,1.262,8.924,3.778c2.51,2.52,3.768,5.503,3.768,8.948 c0,3.45-1.258,6.433-3.768,8.949c-2.513,2.52-5.487,3.778-8.924,3.778H103.847c-3.44,0-6.416-1.259-8.925-3.778 c-2.513-2.517-3.768-5.499-3.768-8.949c0-1.854,0.724-4.475,2.181-7.854c1.453-3.381,3.402-7.325,5.85-11.833 c2.445-4.506,3.798-7.026,4.065-7.557L68.149,65.305H27.693c-3.44,0-6.415-1.26-8.924-3.779C16.255,59.008,15,56.026,15,52.577 c0-3.445,1.254-6.428,3.768-8.949c2.51-2.516,5.484-3.777,8.924-3.777h50.77c2.113,0,3.997,0.432,5.651,1.291 c1.651,0.864,2.975,1.891,3.966,3.082c0.993,1.195,1.851,2.82,2.58,4.873c0.724,2.058,1.22,3.813,1.486,5.27 c0.264,1.463,0.626,3.416,1.091,5.867c0.461,2.455,0.759,4.146,0.893,5.072h238.179c3.437,0,6.41,1.262,8.924,3.777 C343.742,71.602,345,74.586,345,78.032z M134.487,276.397c4.957,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.958,4.972-10.942,7.458-17.949,7.458c-7.008,0-12.989-2.486-17.947-7.458 c-4.959-4.972-7.437-10.972-7.437-17.997c0-7.026,2.478-13.026,7.437-17.998c4.958-4.971,10.938-7.457,17.947-7.457 C123.544,268.94,129.529,271.426,134.487,276.397z M312.178,276.397c4.958,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.957,4.972-10.941,7.458-17.947,7.458c-7.009,0-12.99-2.486-17.947-7.458 c-4.958-4.972-7.437-10.972-7.437-17.997c0-7.026,2.479-13.026,7.437-17.998c4.957-4.971,10.938-7.457,17.947-7.457 C301.237,268.94,307.221,271.426,312.178,276.397z") - .ec-cartNavi__iconClose - svg(viewbox="0 0 360 360") - path(d="M337.572,293.77L223.65,179.85L337.572,65.928c3.547-3.546,3.163-9.678-0.855-13.7l-29.095-29.093 c-4.022-4.021-10.153-4.402-13.7-0.856L180,136.199L66.08,22.279c-3.547-3.547-9.681-3.165-13.702,0.856L23.286,52.228 c-4.02,4.022-4.404,10.154-0.857,13.7L136.35,179.85L22.429,293.77c-3.547,3.545-3.163,9.678,0.857,13.701l29.093,29.092 c4.021,4.023,10.155,4.406,13.702,0.857L180,223.499L293.92,337.42c3.548,3.549,9.679,3.166,13.701-0.857l29.095-29.092 C340.735,303.448,341.121,297.315,337.572,293.77z") - .ec-cartNavi__badge 1 - .ec-cartNavi__label - | 合計 - .ec-cartNavi__price ¥1920 - .ec-cartNaviNull - .ec-cartNaviNull__message - p 現在カート内に - br - | 商品がございません。 - //+b.ec-cartNaviIsset - // +e.cart - // +e.cartImage - // img(src='http://demo3.ec-cube.net/upload/save_image/0701104933_5593472d8d179.jpeg') - // +e.cartContent - // +e.cartContentTitle ミニテーブル - // +e.cartContentPrice ¥ 12,960 - // +e.cartContentTax 税込 - // +e.cartContentNumber 数量：1 - // +e.action - // a.ec-blockBtn--action(href="/moc/guest/cart1") カートへ進む - // a.ec-blockBtn キャンセル +div(style="height:170px;") + .is_active + .ec-cartNavi + .ec-cartNavi__icon + svg(viewbox="0 0 360 360") + path(d="M345,78.032v101.817c0,3.183-1.06,6-3.173,8.452c-2.116,2.455-4.828,3.877-8.132,4.275l-207.043,24.261 c0.13,0.93,0.427,2.355,0.893,4.275c0.461,1.925,0.858,3.68,1.189,5.271c0.329,1.591,0.496,3.051,0.496,4.375 c0,2.121-1.586,6.362-4.759,12.727h182.452c3.437,0,6.411,1.262,8.924,3.778c2.51,2.52,3.768,5.503,3.768,8.948 c0,3.45-1.258,6.433-3.768,8.949c-2.513,2.52-5.487,3.778-8.924,3.778H103.847c-3.44,0-6.416-1.259-8.925-3.778 c-2.513-2.517-3.768-5.499-3.768-8.949c0-1.854,0.724-4.475,2.181-7.854c1.453-3.381,3.402-7.325,5.85-11.833 c2.445-4.506,3.798-7.026,4.065-7.557L68.149,65.305H27.693c-3.44,0-6.415-1.26-8.924-3.779C16.255,59.008,15,56.026,15,52.577 c0-3.445,1.254-6.428,3.768-8.949c2.51-2.516,5.484-3.777,8.924-3.777h50.77c2.113,0,3.997,0.432,5.651,1.291 c1.651,0.864,2.975,1.891,3.966,3.082c0.993,1.195,1.851,2.82,2.58,4.873c0.724,2.058,1.22,3.813,1.486,5.27 c0.264,1.463,0.626,3.416,1.091,5.867c0.461,2.455,0.759,4.146,0.893,5.072h238.179c3.437,0,6.41,1.262,8.924,3.777 C343.742,71.602,345,74.586,345,78.032z M134.487,276.397c4.957,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.958,4.972-10.942,7.458-17.949,7.458c-7.008,0-12.989-2.486-17.947-7.458 c-4.959-4.972-7.437-10.972-7.437-17.997c0-7.026,2.478-13.026,7.437-17.998c4.958-4.971,10.938-7.457,17.947-7.457 C123.544,268.94,129.529,271.426,134.487,276.397z M312.178,276.397c4.958,4.972,7.437,10.972,7.437,17.998 c0,7.025-2.479,13.025-7.437,17.997c-4.957,4.972-10.941,7.458-17.947,7.458c-7.009,0-12.99-2.486-17.947-7.458 c-4.958-4.972-7.437-10.972-7.437-17.997c0-7.026,2.479-13.026,7.437-17.998c4.957-4.971,10.938-7.457,17.947-7.457 C301.237,268.94,307.221,271.426,312.178,276.397z") + .ec-cartNavi__iconClose + svg(viewbox="0 0 360 360") + path(d="M337.572,293.77L223.65,179.85L337.572,65.928c3.547-3.546,3.163-9.678-0.855-13.7l-29.095-29.093 c-4.022-4.021-10.153-4.402-13.7-0.856L180,136.199L66.08,22.279c-3.547-3.547-9.681-3.165-13.702,0.856L23.286,52.228 c-4.02,4.022-4.404,10.154-0.857,13.7L136.35,179.85L22.429,293.77c-3.547,3.545-3.163,9.678,0.857,13.701l29.093,29.092 c4.021,4.023,10.155,4.406,13.702,0.857L180,223.499L293.92,337.42c3.548,3.549,9.679,3.166,13.701-0.857l29.095-29.092 C340.735,303.448,341.121,297.315,337.572,293.77z") + .ec-cartNavi__badge 1 + .ec-cartNavi__label + | 合計 + .ec-cartNavi__price ¥1920 + .ec-cartNaviNull + .ec-cartNaviNull__message + p 現在カート内に + br + | 商品がございません。 + //+b.ec-cartNaviIsset + // +e.cart + // +e.cartImage + // img(src='http://demo3.ec-cube.net/upload/save_image/0701104933_5593472d8d179.jpeg') + // +e.cartContent + // +e.cartContentTitle ミニテーブル + // +e.cartContentPrice ¥ 12,960 + // +e.cartContentTax 税込 + // +e.cartContentNumber 数量：1 + // +e.action + // a.ec-blockBtn--action(href="/moc/guest/cart1") カートへ進む + // a.ec-blockBtn キャンセル sg-wrapper:
From 425741c2799cb18af1261b9f448b5af7c95e5974 Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Wed, 10 May 2017 12:41:28 +0900 Subject: [PATCH 05/12] =?UTF-8?q?Issue=20#97=20=E5=AF=BE=E5=BF=9C=20(#104)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * issue #99　7.3.6と7 カートナビゲーションのポップアップの項目を追加 * issue #98　カート内のアラートのコンポーネント追加・修正 * issue #97　お届け先の複数指定のページ作成・スタイルガイドに追加 --- assets/scss/component/7.3.cart.scss | 1 - assets/scss/project/15.2.order.scss | 89 +++++++++++++++++++ assets/scss/style.scss | 3 + assets/tmpl/elements/15.2.order.pug | 37 +++++++- .../moc/guest/cart4/add_address/index.pug | 14 +++ 5 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 assets/tmpl/moc/guest/cart4/add_address/index.pug diff --git a/assets/scss/component/7.3.cart.scss b/assets/scss/component/7.3.cart.scss index ead3639..8efb723 100644 --- a/assets/scss/component/7.3.cart.scss +++ b/assets/scss/component/7.3.cart.scss @@ -239,7 +239,6 @@ Styleguide 7.3.5 ex [カートページ　ナビゲーション部分](http://demo3.ec-cube.net/cart) Markup: - div(style="height:350px;") .is_active .ec-cartNavi diff --git a/assets/scss/project/15.2.order.scss b/assets/scss/project/15.2.order.scss index 9dedd20..ffe59ee 100644 --- a/assets/scss/project/15.2.order.scss +++ b/assets/scss/project/15.2.order.scss @@ -200,3 +200,92 @@ Styleguide 15.2.5 } + +/* +お届け先の複数指定 + +お届け先の複数指定に関するコンポーネントを定義します。 + +ex [マイページ　お届け先の複数指定](http://demo3.ec-cube.net/shopping/shipping_multiple) +(商品購入画面 → 「お届け先を追加する」を押下) + +Markup: +include /assets/tmpl/elements/15.2.order.pug ++ec-orderAddAddress + +Styleguide 15.2.6 +*/ +.ec-AddAddress { + margin: 0; + @include media_desktop { + margin: 0 10%; + } + + & &__info { + margin-bottom: 32px; + text-align: center; + font-size: 16px; + } + & &__add { + border-top: 1px solid #f4f4f4; + padding-top: 20px; + margin-bottom: 20px; + } + & &__item { + display: table; + padding:16px; + background: #f4f4f4; + margin-bottom: 16px; + } + & &__itemThumb { + display: table-cell; + min-width: 160px; + width: 20%; + img { + width: 100%; + } + } + & &__itemtContent { + display: table-cell; + vertical-align: middle; + padding-left: 16px; + font-size:16px; + } + & &__itemtTitle { + font-weight: bold; + margin-bottom: 10px; + } + & &__itemtSize { + margin-bottom: 10px; + } + & &__itemtPrice { + + } + & &__itemtNumber { + + } + & &__select { + + } + & &__selectAddress { + display: inline-block; + label { + font-size: 16px; + font-weight: normal; + } + } + & &__selectNumber { + display: inline-block; + margin-left: 30px; + label { + font-size: 16px; + font-weight: normal; + } + input { + display: inline-block; + margin-left: 10px; + width: 80px; + } + } +} + diff --git a/assets/scss/style.scss b/assets/scss/style.scss index 5194800..00016dc 100755 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -7,6 +7,9 @@ body { background: #f6f6f6; margin: 0; } +a { + text-decoration: none; +} @import "component/1.1.heading"; @import "component/1.2.typo"; @import "component/1.3.list"; diff --git a/assets/tmpl/elements/15.2.order.pug b/assets/tmpl/elements/15.2.order.pug index bf28146..c9058d2 100644 --- a/assets/tmpl/elements/15.2.order.pug +++ b/assets/tmpl/elements/15.2.order.pug @@ -68,7 +68,7 @@ mixin ec-orderRole select option 指定なし .ec-orderDelivery__edit - a.ec-inlineBtn お届け先を追加する + a.ec-inlineBtn(href="/moc/guest/cart4/add_address/") お届け先を追加する .ec-orderPayment .ec-rectHeading h2 お支払方法 @@ -113,6 +113,7 @@ mixin ec-orderAccount p 後藤 知宏 様 p 〒541-0057　大阪府大阪市中央区北久宝寺町1-4-11 p 090-0090-0090 + mixin ec-orderDelivery .ec-orderRole .ec-orderDelivery @@ -142,3 +143,37 @@ mixin ec-orderDelivery dt お届け時間： dd 指定なし .ec-cart + +mixin ec-orderAddAddress + +b.ec-AddAddress + +e.info + p 各商品のお届け先を選択してください。(※数量の合計は、カゴの中の数量と合わせてください。) + +e.add + +e.item + +e.itemThumb + img(src="http://demo3.ec-cube.net/upload/save_image/0701121841_55935c114e715.jpeg") + +e.itemtContent + +e.itemtTitle 木製食器 + +e.itemtSize 120mm + +e.itemtPrice 小計：¥14,400 + +e.itemtNumber 数量：1 + +e.select + +e.selectAddress + .ec-select + label お届け先 + select + option 球部　東京都千代田区神田神保町1-3-5 + option 球部　大阪府大阪市 + + +e.selectNumber + .ec-input + label 数量 + input(type='number') + + +e.btn + a.ec-inlineBtn(href="#") お届け先追加 + +e.actions + .ec-off4Grid + .ec-off4Grid__cell + a.ec-blockBtn--action(href="/moc/guest/cart4/") 選択したお届け先に送る + a.ec-blockBtn--cancel(href="/moc/guest/cart3/") 戻る \ No newline at end of file diff --git a/assets/tmpl/moc/guest/cart4/add_address/index.pug b/assets/tmpl/moc/guest/cart4/add_address/index.pug new file mode 100644 index 0000000..914ebc6 --- /dev/null +++ b/assets/tmpl/moc/guest/cart4/add_address/index.pug @@ -0,0 +1,14 @@ +extends /assets/tmpl/moc/guest/_layout.pug + +include /assets/tmpl/elements/6.3.login.pug +include /assets/tmpl/elements/15.1.cart.pug +include /assets/tmpl/elements/15.2.order.pug + + +block content + .ec-role + .ec-pageHeader + h1 お届け先の複数指定 + +ec-orderAddAddress + + From 583c471bed8e2cd609fb25cf88b3e8a359cece0f Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Wed, 10 May 2017 12:45:30 +0900 Subject: [PATCH 06/12] =?UTF-8?q?header=E3=81=AE=E6=A4=9C=E7=B4=A2?= =?UTF-8?q?=E3=83=9C=E3=83=83=E3=82=AF=E3=82=B9=E3=81=8C=E3=82=AB=E3=83=A9?= =?UTF-8?q?=E3=83=A0=E8=90=BD=E3=81=A1=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#105)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * headerの検索ボックスがカラム落ちしていたのを修正 --- assets/scss/project/11.3.headerNavi.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scss/project/11.3.headerNavi.scss b/assets/scss/project/11.3.headerNavi.scss index 63c0dcc..5b7287e 100644 --- a/assets/scss/project/11.3.headerNavi.scss +++ b/assets/scss/project/11.3.headerNavi.scss @@ -73,7 +73,7 @@ Styleguide 11.3.1 & &__keyword{ float: none; height: 50px; - padding: 0 40px 0 18px; + padding: 0 35px 0 18px; border-bottom: 1px solid #ccc; position: relative; margin-left: 2%; From 0ea3587102d16c145a261df86dd9385878041bfd Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Wed, 10 May 2017 13:05:48 +0900 Subject: [PATCH 07/12] Issue #96 (#106) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * issue #96対応　タグ、通常価格、バリエーション選択、下部説明文 * issue #96対応　スライド実装　途中 * スライダーのdotsがPCの際、表示されないように修正 * 商品詳細　スタイルガイドでは項目が最小の状態になるように修正 --- assets/js/script.js | 26 ++++++++++++++ assets/scss/project/12.1.slider.scss | 29 ++++++++++++++++ assets/scss/project/14.1.product.scss | 44 +++++++++++++++++++++-- assets/scss/project/19.3.customer.scss | 11 +++--- assets/tmpl/elements/12.1.slider.pug | 26 ++++++++++++++ assets/tmpl/elements/14.1.product.pug | 48 +++++++++++++++++++++++++- 6 files changed, 175 insertions(+), 9 deletions(-) diff --git a/assets/js/script.js b/assets/js/script.js index 03d8a22..8a8a47c 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -46,4 +46,30 @@ $(function(){ autoplay: true, speed: 300 }); +}); + + +// Slick Slide +// TODO FIX CLASS NAME +$(function(){ + $('.item_visual').slick({ + dots: false, + arrows: false, + responsive: [ + { + breakpoint: 768, + settings: { + dots: true + } + }] + }) +}); +$(function(){ + $('.item_nav').slick({//サムネイル画像 + dots: false, + arrows:false, + slidesToShow: 3, + focusOnSelect: true, + asNavFor: '.item_visual',//スライダー部分の要素を記述 + }) }); \ No newline at end of file diff --git a/assets/scss/project/12.1.slider.scss b/assets/scss/project/12.1.slider.scss index e2b9f00..e5df932 100644 --- a/assets/scss/project/12.1.slider.scss +++ b/assets/scss/project/12.1.slider.scss @@ -19,5 +19,34 @@ Styleguide 12.1 padding: 0; list-style: none; } +} +.ec-sliderItemRole{ + @include container; + margin-bottom: 24px; + ul{ + padding: 0; + list-style: none; + } + .item_nav { + display: none; + @include media_desktop { + display: flex; + justify-content: space-between; + margin-bottom: 0; + } + } + .slideThumb{ + margin-bottom: 25px; + opacity: .8; + &:focus { + outline: none; + } + &:hover { + opacity: 1; + } + img { + width: 80%; + } + } } \ No newline at end of file diff --git a/assets/scss/project/14.1.product.scss b/assets/scss/project/14.1.product.scss index 661efc5..8fa0198 100644 --- a/assets/scss/project/14.1.product.scss +++ b/assets/scss/project/14.1.product.scss @@ -9,8 +9,7 @@ ex [商品詳細ページ](http://demo3.ec-cube.net/products/detail/18) Markup: include /assets/tmpl/elements/14.1.product.pug -+ec-productRole -p hogedd ++ec-productSimpleRole Styleguide 14.1 */ @@ -38,6 +37,29 @@ Styleguide 14.1 } } } + & &__tags { + margin-top: 16px; + padding: 0; + padding-bottom:16px; + border-bottom: 1px dotted #ccc; + } + & &__tag { + display: inline-block; + padding: 2px 5px; + list-style: none; + font-size: 80%; + color: #525263; + border: solid 1px #D7DADD; + border-radius: 3px; + background-color: #F5F7F8; + } + & &__priceRegular{ + padding-top: 14px + } + & &__priceRegularTax { + margin-left: 5px; + font-size: 12px; + } & &__price{ color: #DE5D50; font-size: 28px; @@ -63,14 +85,30 @@ Styleguide 14.1 } & &__actions{ padding: 14px 0; + .ec-select { + select { + height: 40px; + max-width: 100%; + min-width: 100%; + @include media_desktop { + min-width: 350px; + max-width: 350px; + } + } + } } & &__btn{ width: 100%; - padding: 10px 0; + margin-bottom: 10px; @include media_desktop { width: 60%; + margin-bottom: 16px; + min-width: 350px; } } + & &__description { + margin-bottom: 16px; + } } diff --git a/assets/scss/project/19.3.customer.scss b/assets/scss/project/19.3.customer.scss index a6fae5d..1aa7427 100644 --- a/assets/scss/project/19.3.customer.scss +++ b/assets/scss/project/19.3.customer.scss @@ -19,13 +19,14 @@ Styleguide 19.3 & &__actions { padding-top:20px; } -} -.ec-blockBtn--action { - margin-bottom: 10px; - @include media_desktop { - margin-bottom: 16px; + .ec-blockBtn--action { + margin-bottom: 10px; + @include media_desktop { + margin-bottom: 16px; + } } } + .ec-contactConfirmRole { @include container; & &__actions { diff --git a/assets/tmpl/elements/12.1.slider.pug b/assets/tmpl/elements/12.1.slider.pug index 433cd82..e30b638 100644 --- a/assets/tmpl/elements/12.1.slider.pug +++ b/assets/tmpl/elements/12.1.slider.pug @@ -7,3 +7,29 @@ mixin ec-sliderRole img(src='http://demo3.ec-cube.net//template/default/img/top/mv02.jpg') .item img(src='http://demo3.ec-cube.net//template/default/img/top/mv03.jpg') + +mixin ec-sliderItemRole + .ec-sliderItemRole + .item_visual + .item + img(src='http://demo3.ec-cube.net/upload/save_image/0424103828_58fd571479bf5.jpeg') + .item + img(src='http://demo3.ec-cube.net/upload/save_image/0424103828_58fd57147dfac.jpeg') + .item + img(src='http://demo3.ec-cube.net/upload/save_image/0424103828_58fd571483cad.jpeg') + .item + img(src='http://demo3.ec-cube.net/upload/save_image/0424103828_58fd5714889ef.jpeg') + .item_nav + .slideThumb + img(src='http://demo3.ec-cube.net/upload/save_image/0424103828_58fd571479bf5.jpeg') + .slideThumb + img(src='http://demo3.ec-cube.net/upload/save_image/0424103828_58fd57147dfac.jpeg') + .slideThumb + img(src='http://demo3.ec-cube.net/upload/save_image/0424103828_58fd571483cad.jpeg') + .item_nav + .slideThumb + img(src='http://demo3.ec-cube.net/upload/save_image/0424103828_58fd5714889ef.jpeg') + .slideThumb + img(src='http://demo3.ec-cube.net/upload/save_image/0424103828_58fd571483cad.jpeg') + .slideThumb + img(src='http://demo3.ec-cube.net/upload/save_image/0424103828_58fd5714889ef.jpeg') diff --git a/assets/tmpl/elements/14.1.product.pug b/assets/tmpl/elements/14.1.product.pug index e1bfa32..543b3a7 100644 --- a/assets/tmpl/elements/14.1.product.pug +++ b/assets/tmpl/elements/14.1.product.pug @@ -1,4 +1,5 @@ -mixin ec-productRole +include 12.1.slider.pug +mixin ec-productSimpleRole +b.ec-productRole .ec-grid2 .ec-grid2__cell @@ -30,3 +31,48 @@ mixin ec-productRole +e.btn: a(href="/moc/guest/login").ec-blockBtn--cancel お気に入りに追加 +e.description 匂いにも菌にも強い、天然の木を使ったカッティングボード。 + +mixin ec-productRole + +b.ec-productRole + .ec-grid2 + .ec-grid2__cell + +ec-sliderItemRole + .ec-grid2__cell + +e.profile + +e.title + h2.ec-headingTitle カッティングボード + +e.UL.tags + +e.LI.tag 新商品 + +e.LI.tag 限定品 + +e.priceRegular + +e.SPAN.priceRegularPrice 通常価格：¥ 21,600 ～ ¥ 32,400 + +e.SPAN.priceRegularTax 税込 + + +e.price + +b.ec-price + +e.SPAN.unit ¥ + +e.SPAN.price 4,860 + +e.SPAN.tax 税込 + +e.code 商品コード： s_0009 + +e.category + div 関連カテゴリ + ul + li: a(href="") キッチンツール + li + a(href="") キッチンツール + span ＞ + a(href="") 調理器具 + +e.actions + .ec-select + select + option 選択して下さい + option 120mm + option 170mm + .ec-numberInput + span 数量 + input(type="number",value="1") + +e.btn: a(href="/moc/guest/cart1").ec-blockBtn--action カートに入れる + +e.btn: a(href="/moc/guest/login").ec-blockBtn--cancel お気に入りに追加 + +e.description 匂いにも菌にも強い、天然の木を使ったカッティングボード。 + + +e.description 温かみのある商品です。 青色が美しい職人が仕上げた吹きガラスのガラス瓶。 温かみのある商品です。 青色が美しい職人が仕上げた吹きガラスのガラス瓶。 温かみのある商品です。 青色が美しい職人が仕上げた吹きガラスのガラス瓶。 温かみのある商品です。 青色が美しい職人が仕上げた吹きガラスのガラス瓶。 温かみのある商品です。 青色が美しい職人が仕上げた吹きガラスのガラス瓶。 温かみのある商品です。 青色が美しい職人が仕上げた吹きガラスのガラス瓶。 温かみのある商品です。 青色が美しい職人が仕上げた吹きガラスのガラス瓶。 \ No newline at end of file From 702fbc9a11d01b1257b08dc63d32cc9ebf217eb3 Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Wed, 10 May 2017 14:03:26 +0900 Subject: [PATCH 08/12] =?UTF-8?q?Issue=20#100=20=E5=AF=BE=E5=BF=9C=20(#108?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * issue #100 スタイルガイド9マイページ　「お気に入り一覧」なしver作成 --- assets/scss/component/9.1.mypage.scss | 20 ++++++++++++++++++-- assets/tmpl/elements/9.1.mypage.pug | 8 ++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/assets/scss/component/9.1.mypage.scss b/assets/scss/component/9.1.mypage.scss index 59ceeae..7afdd46 100644 --- a/assets/scss/component/9.1.mypage.scss +++ b/assets/scss/component/9.1.mypage.scss @@ -65,6 +65,22 @@ Styleguide 9.1.1 } } +/* +マイページ（お気に入り機能無効） + +マイページで表示するメニューリストです。 + +ul を利用したリスト要素で記述します。 + +ex [マイページ　メニューリスト部分](http://demo3.ec-cube.net/mypage) + +Markup: +include /assets/tmpl/elements/9.1.mypage.pug ++ec-navlist_noFavorite + +Styleguide 9.1.2 +*/ + /* Welcome メッセージ @@ -76,7 +92,7 @@ Markup: include /assets/tmpl/elements/9.1.mypage.pug +ec-welcomeMsg -Styleguide 9.1.2 +Styleguide 9.1.3 */ .ec-welcomeMsg{ @include mypageContainer; @@ -98,7 +114,7 @@ Markup: include /assets/tmpl/elements/9.1.mypage.pug +ec-favorite -Styleguide 9.1.3 +Styleguide 9.1.4 */ .ec-favoriteRole{ & &__header { diff --git a/assets/tmpl/elements/9.1.mypage.pug b/assets/tmpl/elements/9.1.mypage.pug index 5358770..21a1c68 100644 --- a/assets/tmpl/elements/9.1.mypage.pug +++ b/assets/tmpl/elements/9.1.mypage.pug @@ -7,6 +7,14 @@ mixin ec-navlist +e.LI.__item: a(href="/moc/user/address/addresses/") お届け先編集 +e.LI.__item: a(href="/moc/user/withdraw/") 退会手続き +mixin ec-navlist_noFavorite + +b.ec-navlistRole + +e.UL.navlist + +e.LI.__item.active: a(href="/moc/user/mypage/") ご注文履歴 + +e.LI.__item: a(href="/moc/user/edit/") 会員情報編集 + +e.LI.__item: a(href="/moc/user/address/addresses/") お届け先編集 + +e.LI.__item: a(href="/moc/user/withdraw/") 退会手続き + mixin ec-welcomeMsg .ec-welcomeMsg ようこそ ／ 球部 太郎 様 From 8f51ca45193bbeacc9622257e39c7071f5926c4a Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Wed, 10 May 2017 14:23:06 +0900 Subject: [PATCH 09/12] =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=AC=E3=82=A4=E3=83=89=E3=81=AE=E3=83=90=E3=82=B0=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20(#109)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * スタイルガイドのバグ修正　ボタンの下線をなくす、カートナビのポップアップ修正、一部コメント付与 * .gitignore add .idea/ --- .gitignore | 3 ++- assets/scss/component/7.3.cart.scss | 5 +++-- assets/scss/mixins/btn.scss | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a79418c..75bbe03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /node_modules /public -!/public/assets/js/script.js \ No newline at end of file +!/public/assets/js/script.js +.idea/ \ No newline at end of file diff --git a/assets/scss/component/7.3.cart.scss b/assets/scss/component/7.3.cart.scss index 8efb723..b71f7b7 100644 --- a/assets/scss/component/7.3.cart.scss +++ b/assets/scss/component/7.3.cart.scss @@ -239,7 +239,7 @@ Styleguide 7.3.5 ex [カートページ　ナビゲーション部分](http://demo3.ec-cube.net/cart) Markup: -div(style="height:350px;") +div(style="height:350px;")//スタイルガイド都合上、高さをもたせるため設置(mocでは不要) .is_active .ec-cartNavi .ec-cartNavi__icon @@ -301,6 +301,7 @@ Styleguide 7.3.6 & &__action { .ec-blockBtn--action { color:#fff; + margin-bottom: 8px; } } & &__cartContentTitle { @@ -328,7 +329,7 @@ Styleguide 7.3.6 ex [カートページ　ナビゲーション部分](http://demo3.ec-cube.net/cart) Markup: -div(style="height:170px;") +div(style="height:170px;")//スタイルガイド都合上、高さをもたせるため設置(mocでは不要) .is_active .ec-cartNavi .ec-cartNavi__icon diff --git a/assets/scss/mixins/btn.scss b/assets/scss/mixins/btn.scss index cba12a1..7d35d0c 100644 --- a/assets/scss/mixins/btn.scss +++ b/assets/scss/mixins/btn.scss @@ -33,6 +33,7 @@ $btn-border-radius-base: 0px; @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base); @include user-select(none); padding: 10px 16px; + text-decoration: none; &, &:active, From 2617147cf47823a86eb05f0bb1d3cba0c9764dec Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Wed, 10 May 2017 19:17:38 +0900 Subject: [PATCH 10/12] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d7833bc..f5959d7 100644 --- a/README.md +++ b/README.md @@ -30,11 +30,11 @@ dev ブランチは開発作業中の内容を取り込む ブランチです。 Styleguide On Heorku -[http://eccube3-styleguide-dev.herokuapp.com/](http://eccube3-styleguide.herokuapp.com/) +[http://eccube3-styleguide-dev.herokuapp.com/](http://eccube3-styleguide-dev.herokuapp.com/) HTML Moc On Heroku -[http://eccube3-styleguide-dev.herokuapp.com/moc/](http://eccube3-styleguide.herokuapp.com/moc/) +[http://eccube3-styleguide-dev.herokuapp.com/moc/](http://eccube3-styleguide-dev.herokuapp.com/moc/) モックページの実装状況等は、Project ページを確認してください。 @@ -84,4 +84,4 @@ $ npm start ```` $ npm i $ npm run dev -```` \ No newline at end of file +```` From 9a421113e818a56fe5a45b802ee3f3e65ec663e8 Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Wed, 10 May 2017 19:40:05 +0900 Subject: [PATCH 11/12] fix_issue99 --- assets/scss/component/7.3.cart.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/scss/component/7.3.cart.scss b/assets/scss/component/7.3.cart.scss index b71f7b7..26f93f3 100644 --- a/assets/scss/component/7.3.cart.scss +++ b/assets/scss/component/7.3.cart.scss @@ -239,7 +239,8 @@ Styleguide 7.3.5 ex [カートページ　ナビゲーション部分](http://demo3.ec-cube.net/cart) Markup: -div(style="height:350px;")//スタイルガイド都合上、高さをもたせるため設置(mocでは不要) +div(style="height:350px;") + // 上記のdivはスタイルガイド都合上、高さをもたせるため設置(mocでは不要) .is_active .ec-cartNavi .ec-cartNavi__icon @@ -329,7 +330,8 @@ Styleguide 7.3.6 ex [カートページ　ナビゲーション部分](http://demo3.ec-cube.net/cart) Markup: -div(style="height:170px;")//スタイルガイド都合上、高さをもたせるため設置(mocでは不要) +div(style="height:170px;") + // 上記のdivはスタイルガイド都合上、高さをもたせるため設置(mocでは不要) .is_active .ec-cartNavi .ec-cartNavi__icon From 5a391c9b3d982d3016450c9162eca59ddfd50f64 Mon Sep 17 00:00:00 2001 From: yasui05821 Date: Wed, 10 May 2017 23:15:37 +0900 Subject: [PATCH 12/12] =?UTF-8?q?styleguide=E3=81=AEversion=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 428b07b..edec173 100755 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "normalize.css": "^5.0.0", "npm-run-all": "^4.0.1", "run-sequence": "^1.2.1", - "sc5-styleguide": "^1.5.0", + "sc5-styleguide": "1.5.0", "webpack": "^2.3.2" } }