Commit 72038222 by o.kimura

Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement

# Conflicts:
#	achievement-official.conohawing.com/assets/js/functions.js
#	achievement-official.conohawing.com/assets/js/functions.min.js
parents 1516b42c 9d1e9718
...@@ -249,79 +249,6 @@ sup { ...@@ -249,79 +249,6 @@ sup {
breadcrumb breadcrumb
------------------------------------------------------------*/ ------------------------------------------------------------*/
.c-breadcrumb {
background: transparent;
position: absolute;
z-index: 10;
width: 100%;
top: 114px;
left: 0;
}
@media screen and (max-width: 767px) {
.c-breadcrumb {
top: 1px;
}
}
.c-breadcrumb__inner {
max-width: 1200px;
margin: 0 auto;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
overflow: hidden;
}
.c-breadcrumb__item {
position: relative;
margin: 0 2px 0 0;
}
@media screen and (max-width: 767px) {
.c-breadcrumb__item {
margin: 0 3px 0 0;
}
}
.c-breadcrumb__item:first-child {
margin: 0 3px 0 -6px;
}
@media screen and (max-width: 767px) {
.c-breadcrumb__item:first-child {
margin: 0 3px 0 -4px;
}
}
.c-breadcrumb__item::after {
content: '';
width: 100%;
height: 100%;
background: rgba(190, 172, 86, 0.6);
position: absolute;
top: 0;
left: 0;
-webkit-transform: skew(-20deg);
transform: skew(-20deg);
}
.c-breadcrumb a, .c-breadcrumb span {
font-size: 1.2rem;
line-height: 1.5;
color: #fff;
position: relative;
z-index: 2;
display: block;
}
@media screen and (max-width: 767px) {
.c-breadcrumb a, .c-breadcrumb span {
font-size: 1rem;
}
}
.c-breadcrumb span {
padding: 6px 16px;
}
@media screen and (max-width: 767px) {
.c-breadcrumb span {
padding: 3px 10px;
}
}
/* /*
------------------------------------------------------------*/ ------------------------------------------------------------*/
...@@ -1001,108 +928,6 @@ header ...@@ -1001,108 +928,6 @@ header
height: 26px; height: 26px;
} }
.fixed-nav.is-show {
min-width: 1440px;
background-color: #fff;
}
.fixed-nav.is-show .c-header1-logo {
padding: 0 0 0 12px;
}
.fixed-nav.is-show .c-header1-logoLink {
max-width: 220px;
display: inline-block;
}
.fixed-nav.is-show .c-header1-logoLink img {
width: 100%;
}
.fixed-nav.is-show .c-header1-btn1 {
width: 138px;
height: 50px;
}
.fixed-nav.is-show .c-header1-btn1--red {
width: 108px;
}
.fixed-nav.is-show .c-header1-btn1--red .c-header1-btn1-text {
padding: 0;
padding-left: 11px;
}
.fixed-nav.is-show .c-header1-btn1 .c-header1-btn1-text {
padding-left: 6px;
}
.fixed-nav.is-show .c-header1-link {
padding-right: 10px;
}
.fixed-nav.is-show .c-header1-link1 {
padding: 10px 13px;
margin-left: 12px;
}
.fixed-nav.is-show .c-nav {
position: absolute;
top: 0;
left: 50%;
transform: translateX(-470px);
margin-top: 10px;
}
.fixed-nav.is-show .c-nav-link1 {
padding: 5px 20px;
width: auto;
color: #1b1b1b;
}
.page-top .fixed-nav.is-show .c-header1-link1 {
color: #093d6e;
border: 2px solid #093d6e;
}
@media screen and (max-width: 767px) { @media screen and (max-width: 767px) {
.c-header2 { .c-header2 {
padding: 0 14px; padding: 0 14px;
...@@ -5742,7 +5567,6 @@ body { ...@@ -5742,7 +5567,6 @@ body {
/* /*
------------------------------------------------------------*/ ------------------------------------------------------------*/
/*
.p-company .c-breadcrumb { .p-company .c-breadcrumb {
background: transparent; background: transparent;
position: absolute; position: absolute;
...@@ -5800,7 +5624,6 @@ body { ...@@ -5800,7 +5624,6 @@ body {
.p-company .c-breadcrumb span { .p-company .c-breadcrumb span {
padding: 6px 16px; padding: 6px 16px;
} }
*/
.p-company .c-mainvisual { .p-company .c-mainvisual {
width: 100%; width: 100%;
height: 500px; height: 500px;
...@@ -9368,4 +9191,76 @@ body { ...@@ -9368,4 +9191,76 @@ body {
height: auto; height: auto;
} }
.c-breadcrumb {
background: transparent;
position: absolute;
z-index: 10;
width: 100%;
top: 113px;
left: 0;
}
@media screen and (max-width: 767px) {
.c-breadcrumb {
top: 1px;
}
}
.c-breadcrumb__inner {
max-width: 1200px;
margin: 0 auto;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
overflow: hidden;
}
.c-breadcrumb__item {
position: relative;
margin: 0 2px 0 0;
}
@media screen and (max-width: 767px) {
.c-breadcrumb__item {
margin: 0 3px 0 0;
}
}
.c-breadcrumb__item:first-child {
margin: 0 3px 0 -6px;
}
@media screen and (max-width: 767px) {
.c-breadcrumb__item:first-child {
margin: 0 3px 0 -4px;
}
}
.c-breadcrumb__item::after {
content: '';
width: 100%;
height: 100%;
background: rgba(190, 172, 86, 0.3);
position: absolute;
top: 0;
left: 0;
-webkit-transform: skew(-20deg);
transform: skew(-20deg);
}
.c-breadcrumb a, .c-breadcrumb span {
font-size: 1.2rem;
line-height: 1.5;
color: #fff;
position: relative;
z-index: 2;
display: block;
}
@media screen and (max-width: 767px) {
.c-breadcrumb a, .c-breadcrumb span {
font-size: 1rem;
}
}
.c-breadcrumb span {
padding: 6px 16px;
}
@media screen and (max-width: 767px) {
.c-breadcrumb span {
padding: 3px 10px;
}
}
...@@ -135,10 +135,12 @@ ...@@ -135,10 +135,12 @@
<?php } ?> <?php } ?>
<?php if($pageid == "other" || $pageid == "faq" || $pageid == "marc" || $pageid == "privacy" || $pageid == "policy" || $pageid == "member" || $pageid == "trademark" || $pageid == "sitemap" || $pageid == "business_partner") { ?> <?php if($pageid == "other" || $pageid == "faq" || $pageid == "marc" || $pageid == "privacy" || $pageid == "policy" || $pageid == "member" || $pageid == "trademark" || $pageid == "sitemap" || $pageid == "business_partner") { ?>
<link rel="stylesheet" href="/common_previous/css/trainer.css">
<link rel="stylesheet" href="/common_previous/css/other.css"> <link rel="stylesheet" href="/common_previous/css/other.css">
<?php } ?> <?php } ?>
<?php if($pageid == "contact" || $pageid == "catalogue") { ?> <?php if($pageid == "contact" || $pageid == "catalogue") { ?>
<link rel="stylesheet" href="/common_previous/css/trainer.css">
<link rel="stylesheet" href="/common_previous/css/other.css"> <link rel="stylesheet" href="/common_previous/css/other.css">
<link rel="stylesheet" href="/common_previous/css/contact.css"> <link rel="stylesheet" href="/common_previous/css/contact.css">
<?php } ?> <?php } ?>
...@@ -194,6 +196,7 @@ ...@@ -194,6 +196,7 @@
<a href="/catalogue/" class="c-header2-link3">資料請求</a> <a href="/catalogue/" class="c-header2-link3">資料請求</a>
</div> </div>
<nav class="c-nav nav-sp"> <nav class="c-nav nav-sp">
<ul class="c-nav-menu1"> <ul class="c-nav-menu1">
<li><a href="/" class="c-nav-link1">トップ</a></li> <li><a href="/" class="c-nav-link1">トップ</a></li>
<li><a href="/schedule/" class="c-nav-link1">公開講座 日程一覧</a></li> <li><a href="/schedule/" class="c-nav-link1">公開講座 日程一覧</a></li>
...@@ -296,32 +299,23 @@ ...@@ -296,32 +299,23 @@
</nav> </nav>
<nav class="c-nav"> <nav class="c-nav">
<ul class="c-nav-menu1"> <ul class="c-nav-menu1">
<li data-target="home1" class="sv"> <li data-target="home1">
<a href="/service/" class="c-nav-link1"><span class="c-nav-text">サービス</span></a> <a href="/service/" class="c-nav-link1">サービス</a>
<div class="c-navService">
<ul class="c-nav-sab">
<li><a href="/service/top/" class="c-nav-sab-link1"><span class="c-nav-sab-img"><img src="/assets/img/common/img_top_tmb.jpg" alt=""></span><span class="c-nav-sab-text">『頂点への道』講座</span></a></li>
<li><a href="/service/penetration/" class="c-nav-sab-link1"><span class="c-nav-sab-img"><img src="/assets/img/common/img_penetration_tmb.jpg" alt=""></span><span class="c-nav-sab-text">理念浸透・組織変革</span></a></li>
<li><a href="/service/management/" class="c-nav-sab-link1"><span class="c-nav-sab-img"><img src="/assets/img/common/img_management_tmb.jpg" alt=""></span><span class="c-nav-sab-text">マネジメント</span></a></li>
<li><a href="/service/sales/" class="c-nav-sab-link1"><span class="c-nav-sab-img"><img src="/assets/img/common/img_sales_tmb.jpg" alt=""></span><span class="c-nav-sab-text">営業力強化</span></a></li>
<li><a href="/service/rt/" class="c-nav-sab-link1"><span class="c-nav-sab-img"><img src="/assets/img/common/img_rt_tmb.jpg" alt=""></span><span class="c-nav-sab-text">人間関係</span></a></li>
</ul>
</div>
</li> </li>
<li data-target="home2"> <li data-target="home2">
<a href="/pub/schedule#seminar" class="c-nav-link1"><span class="c-nav-text">体験セミナー</span></a> <a href="/pub/schedule#seminar" class="c-nav-link1">体験セミナー</a>
</li> </li>
<li data-target="home3"> <li data-target="home3">
<a href="/beginner/" class="c-nav-link1"><span class="c-nav-text">初めての方へ</span></a> <a href="/beginner/" class="c-nav-link1">初めての方へ</a>
</li> </li>
<li data-target="home4"> <li data-target="home4">
<a href="/case/" class="c-nav-link1"><span class="c-nav-text">お客様事例</span></a> <a href="/case/" class="c-nav-link1">お客様事例</a>
</li> </li>
<li data-target="home5"> <li data-target="home5">
<a href="/company/" class="c-nav-link1"><span class="c-nav-text">会社情報</span></a> <a href="/company/" class="c-nav-link1">会社情報</a>
</li> </li>
<li data-target="home6"> <li data-target="home6">
<a href="/company/access/" class="c-nav-link1"><span class="c-nav-text">アクセス</span></a> <a href="/company/access/" class="c-nav-link1">アクセス</a>
</li> </li>
</ul> </ul>
</nav> </nav>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment