Merge pull request #37 from yasui05821/master

TOPページ、404ページ、お問い合わせページの修正
EC-CUBE · Mar 31, 2017 · f6cc11d · f6cc11d
2 parents 8c47710 + 9bd2484
commit f6cc11d
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 32 deletions.
diff --git a/assets/scss/component/1.3.list.scss b/assets/scss/component/1.3.list.scss
@@ -81,6 +81,7 @@ Styleguide 1.3.2
 .ec-borderedDefs {
   width: 100%;
   border-top: 1px dotted #ccc;
+  margin-bottom:16px;
   dl {
     display: flex;
     border-bottom: 1px dotted #ccc;
@@ -115,6 +116,9 @@ Styleguide 1.3.2
       line-height: 3;
     }
   }
+  p {
+    line-height: 1.4;
+  }
 }
 
 .ec-list-chilled {

diff --git a/assets/scss/component/5.1.grid.scss b/assets/scss/component/5.1.grid.scss
@@ -3,27 +3,21 @@
 @import "../mixins/media";
 
 @mixin row{
+  display: block;
   margin: 0;
-  @include clearfix;
   @include media_desktop {
-    //margin-left:  ceil((30px / -2));
-    //margin-right: floor((30px / -2));
+    display: flex;
   }
 }
 
 @mixin makeSmColumn($columns){
   position: relative;
   min-height: 1px;
-  //padding-left: 0;
-  //padding-right: 0;
 
   @media (min-width: $desktop) {
-    float: left;
     width: percentage(($columns/ 12));
   }
   @include media_desktop{
-    //padding-left:  (30px / 2);
-    //padding-right: (30px / 2);
   }
 
 }

diff --git a/assets/scss/component/7.1.itembanner.scss b/assets/scss/component/7.1.itembanner.scss
@@ -33,6 +33,10 @@ Styleguide 7.1.1
   margin-bottom: 24px;
   display: flex;
   justify-content: space-between;
+  flex-direction:column;
+  @include media_desktop {
+    flex-direction:row;
+  }
   &:hover {
     text-decoration: none;
     img{
@@ -43,7 +47,12 @@ Styleguide 7.1.1
     }
   }
   & &__cell {
-    width: 30%;
+    width: 100%;
+    margin-bottom: 16px;
+    @include media_desktop {
+      width: 32%;
+      margin-bottom: 0;
+    }
   }
   & &__img {
     margin-bottom: 15px;
@@ -154,16 +163,17 @@ Styleguide 7.1.3
 .ec-displayD {
   display:flex;
   justify-content:space-between;
-
+  flex-wrap:wrap-reverse;
   @include media_desktop(){
     box-sizing: border-box;
+    flex-wrap:nowrap;
   }
 
   & &__cell{
-    width: percentage((1/ 3));
+    width: 30%;
     margin-bottom: 8px;
     @include media_desktop(){
-      width: percentage((1/ 6.5));
+      width: 14%;
       margin-bottom: 16px;
     }
     &:hover {

diff --git a/assets/scss/project/11.3.footer.scss b/assets/scss/project/11.3.footer.scss
@@ -59,7 +59,16 @@ Styleguide 11.3.1
     margin: 0 8px 8px;
     a{
       color: inherit;
+      text-decoration: none;
     }
+    &:hover {
+      a {
+        color: #686868;
+        text-decoration: none;
+      }
+
+    }
+
   }
 }
 
@@ -100,6 +109,12 @@ Styleguide 11.3.2
         font-size: 2em;
       }
     }
+    &:hover {
+      a {
+        color: #686868;
+        text-decoration: none;
+      }
+    }
   }
   & &__copyright{
     font-size: 10px;

diff --git a/assets/scss/project/14.1.product.scss b/assets/scss/project/14.1.product.scss
@@ -17,11 +17,19 @@ Styleguide 14.1
 .ec-productRole{
   @include container;
   & &__img {
+    margin-right: 0;
     margin-bottom: 20px;
     @include media_desktop {
+      margin-right: 16px;
       margin-bottom: 0;
     }
   }
+  & &__profile {
+    margin-left: 0;
+    @include media_desktop {
+      margin-left: 16px;
+    }
+  }
   & &__title {
     .ec-headingTitle {
       font-size: 20px;

diff --git a/assets/scss/project/20.1.404.scss b/assets/scss/project/20.1.404.scss
@@ -1,3 +1,6 @@
+@import "../mixins/variables";
+@import "../mixins/media";
+@import "../mixins/animation";
 /*
 404ページ
 
@@ -13,9 +16,19 @@ Styleguide 20.1
 
 */
 .ec-404Role{
+  @include commonStyle();
+  width: 100%;
+  height: 100vh;
+  background-color: #f2f2f2;
   text-align: center;
+  & &__icon{
+    svg{
+      fill: #d4d4d5;
+    }
+  }
   & &__title{
     font-weight: bold;
+    font-size: 25px;
   }
 
 }
diff --git a/assets/scss/style.scss b/assets/scss/style.scss
@@ -5,6 +5,7 @@ body {
   color:#525263;
   transition: z-index 0ms 5.28455ms;
   background: #f6f6f6;
+  margin: 0;
 }
 @import "component/1.1.heading";
 @import "component/1.2.typo";

diff --git a/assets/tmpl/elements/20.1.404.pug b/assets/tmpl/elements/20.1.404.pug
@@ -1,11 +1,12 @@
 mixin ec-404Role
-    .ec-404Role
-        .ec-off3Grid
-            .ec-off3Grid__cell
+    +b.ec-404Role
+        .ec-off4Grid
+            .ec-off4Grid__cell
                 div(style="font-size:100px;text-align:center")
-                    .ec-icon
+                    +e.icon.ec-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')
-                p.ec-404Role__title ページがみつかりません。
-                p.ec-404Role__description URLに間違いがないかご確認ください。
-                p.ec-blockBtn--cancel トップページへ
+                +e.P.title.ec-reportHeading ページがみつかりません。
+                +e.P.description.ec-reportDescription URLに間違いがないかご確認ください。
+            .ec-off4Grid__cell
+                a.ec-blockBtn--cancel(href="/moc/") トップページへ
diff --git a/assets/tmpl/moc/guest/404/index.pug b/assets/tmpl/moc/guest/404/index.pug
@@ -1,15 +1,22 @@
-extends /assets/tmpl/moc/guest/_layout
+include /node_modules/bemto.pug/bemto.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 ./../slick.css
+  body
+    .ec-layoutRole
+      include /assets/tmpl/elements/20.1.404.pug
+      +ec-404Role
 
-block content
-  +b.ec-404Role
-    .ec-off4Grid
-      .ec-off4Grid__cell
-        div(style="font-size:100px;text-align:center")
-          .ec-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.P.__title ページがみつかりません。
-        +e.P.__description URLに間違いがないかご確認ください。
-  .ec-off4Grid__cell
-          p.ec-blockBtn--cancel トップページへ
+      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")