홈 탐색 도움말
로그인
hnm
/
hazmat-suite
8
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

update

tomekk 4 년 전
부모
7c766fa70e
커밋
ce71b02138
7개의 변경된 파일과 53개의 추가작업 그리고 32개의 파일을 삭제
분할 보기 변경상태 보기
  1. 1 0
      _inc/_footer-suite-start.php
  2. 2 1
      _inc/_header-suite-start.php
  3. 14 12
      assets/css/style.css
  4. 0 0
      assets/css/style.css.map
  5. 17 3
      assets/js/functions-new-landing.js
  6. 11 10
      assets/scss/_project.scss
  7. 8 6
      index.php

+ 1 - 0
_inc/_footer-suite-start.php
파일 보기 

@@ -46,6 +46,7 @@
 
 		<script src="assets/js/jquery/jquery-3.3.1.min.js"></script>

         <script src="assets/js/popper/popper.1.16.0.min.js"></script>

         <script src="assets/js/bootstrap/util.js"></script> 

+        <script src="assets/js/bootstrap/scrollspy.js"></script> 

         <script src="assets/js/bootstrap/tab.js"></script> 

         <script src="assets/js/bootstrap/collapse.js"></script>

         <script src="assets/js/bootstrap/dropdown.js"></script>

+ 2 - 1
_inc/_header-suite-start.php
파일 보기 

@@ -19,12 +19,13 @@
 
 		<link href="assets/js/aos/aos.css" rel="stylesheet">

         <link rel="stylesheet" href="assets/css/style.css?v=<?php echo  $assets_version ?>">

     </head>

-    <body>

+    <body data-spy="scroll" data-target="#navbar-spy-sections" data-offset="1">

         <!--[if lte IE 9]>

             <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/">upgrade your browser</a> to improve your experience and security.</p>

         <![endif]-->

 

         <!-- Add your site or application content here -->

+        <div id="ch-ggs-web-suite-landing-nav-trigger" class="ch-ggs-web-suite-landing-nav-trigger"></div>

         <header id="ch-ggs-web-suite-header">

         	<h2 class="sr-only">HazmatSuite</h2>

         	<div class="container">

+ 14 - 12
assets/css/style.css
파일 보기 

@@ -7,8 +7,8 @@
 
  */
 
 @font-face {
 
   font-family: "icomoon";
 
-  src: url("../fonts/icomoon.eot?u6kkyr5");
 
-  src: url("../fonts/icomoon.eot?u6kkyr5#iefix") format("embedded-opentype"), url("../fonts/icomoon.ttf?u6kkyr5") format("truetype"), url("../fonts/icomoon.woff?u6kkyr5") format("woff"), url("../fonts/icomoon.svg?u6kkyr5#icomoon") format("svg");
 
+  src: url("../fonts/icomoon.eot?u6kkyu8");
 
+  src: url("../fonts/icomoon.eot?u6kkyu8#iefix") format("embedded-opentype"), url("../fonts/icomoon.ttf?u6kkyu8") format("truetype"), url("../fonts/icomoon.woff?u6kkyu8") format("woff"), url("../fonts/icomoon.svg?u6kkyu8#icomoon") format("svg");
 
   font-weight: normal;
 
   font-style: normal;
 
 }
 
@@ -9590,6 +9590,7 @@ body {
 
   flex-direction: column;
 
   overflow-y: scroll;
 
   min-height: 100vh;
 
+  position: relative;
 
 }
 
 
 #ch-ggs-web-suite-content {
 
@@ -10918,17 +10919,17 @@ a.ch-ggs-web-suite-icon-link {
 
     left: 100%;
 
   }
 
 }
 
-.ch-ggs-web-suite-landing-seciton {
 
+.ch-ggs-web-suite-landing-section {
 
   min-height: 100vh;
 
   padding: 120px 0;
 
 }
 
 
-.ch-ggs-web-suite-landing-seciton-dark {
 
+.ch-ggs-web-suite-landing-section-dark {
 
   color: #fff;
 
   background: #250025;
 
 }
 
 
-.ch-ggs-web-suite-landing-seciton-hero {
 
+.ch-ggs-web-suite-landing-section-hero {
 
   min-height: calc(100vh - 91px);
 
   background-image: linear-gradient(270deg, rgba(201, 85, 217, 0.3) 0%, #8D3E97 100%), url("../img//hero-xs.jpg");
 
   background-size: cover;
 
@@ -10937,6 +10938,7 @@ a.ch-ggs-web-suite-icon-link {
 
 .ch-ggs-web-suite-landing-section-title {
 
   font-size: 32px;
 
   display: flex;
 
+  margin-bottom: 80px;
 
 }
 
 
 .ch-ggs-web-suite-landing-section-title-icon {
 
@@ -10956,14 +10958,14 @@ a.ch-ggs-web-suite-icon-link {
 
 }
 
 
 .ch-ggs-web-suite-article-landing {
 
-  margin-bottom: 30px;
 
+  margin-bottom: 200px;
 
   color: #212529;
 
 }
 
 .ch-ggs-web-suite-article-landing:hover, .ch-ggs-web-suite-article-landing:focus {
 
   text-decoration: none;
 
 }
 
 
-.ch-ggs-web-suite-landing-seciton-dark .ch-ggs-web-suite-article-landing {
 
+.ch-ggs-web-suite-landing-section-dark .ch-ggs-web-suite-article-landing {
 
   color: #fff;
 
 }
 
 
@@ -11047,17 +11049,17 @@ a.ch-ggs-web-suite-icon-link {
 
   font-weight: bolder;
 
 }
 
 
-.ch-ggs-web-suite-landing-nav .nav-item.active > .nav-link {
 
+.ch-ggs-web-suite-landing-nav .nav-item > .nav-link.active {
 
   color: #990099;
 
 }
 
 
 @media (min-width: 576px) {
 
-  .ch-ggs-web-suite-landing-seciton-hero {
 
+  .ch-ggs-web-suite-landing-section-hero {
 
     background-image: linear-gradient(270deg, rgba(201, 85, 217, 0.3) 0%, #8D3E97 100%), url("../img//hero-sm.jpg");
 
   }
 
 }
 
 @media (min-width: 768px) {
 
-  .ch-ggs-web-suite-landing-seciton-hero {
 
+  .ch-ggs-web-suite-landing-section-hero {
 
     background-image: linear-gradient(270deg, rgba(201, 85, 217, 0.3) 0%, #8D3E97 100%), url("../img//hero-md.jpg");
 
   }
 
 
@@ -11087,7 +11089,7 @@ a.ch-ggs-web-suite-icon-link {
 
   }
 
 }
 
 @media (min-width: 992px) {
 
-  .ch-ggs-web-suite-landing-seciton-hero {
 
+  .ch-ggs-web-suite-landing-section-hero {
 
     min-height: calc(100vh - 98px);
 
     background-image: linear-gradient(270deg, rgba(201, 85, 217, 0.3) 0%, #8D3E97 100%), url("../img//hero-lg.jpg");
 
   }
 
@@ -11135,7 +11137,7 @@ a.ch-ggs-web-suite-icon-link {
 
   }
 
 }
 
 @media (min-width: 1200px) {
 
-  .ch-ggs-web-suite-landing-seciton-hero {
 
+  .ch-ggs-web-suite-landing-section-hero {
 
     background-image: linear-gradient(270deg, rgba(201, 85, 217, 0.3) 0%, #8D3E97 100%), url("../img//hero-xl.jpg");
 
   }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
assets/css/style.css.map


+ 17 - 3
assets/js/functions-new-landing.js
파일 보기 

@@ -1,6 +1,9 @@
 
 jQuery(document).ready(function($) {

 	

 	(function() {

+		

+		return;

+		

 		const sections = [

 			  document.getElementById('ch-ggs-web-suite-section-01'),

 			  document.getElementById('ch-ggs-web-suite-section-02'),

@@ -14,14 +17,25 @@ jQuery(document).ready(function($) {
 
 			};

 			

 			// intersection observer setup

+//			const observerOptions = {

+//			  root: null,

+//			  rootMargin: '0px',

+//			  threshold: 0.7,

+//			};

+			

 			const observerOptions = {

-			  root: null,

-			  rootMargin: '0px',

-			  threshold: 0.7,

+			  root:null,

+			  rootMargin: '0px 0px -100% 0px',

+			  threshold: 0

 			};

 			

 			function observerCallback(entries, observer) {

 			  entries.forEach((entry) => {

+				console.log(

+					entry.target,

+					entry.isIntersecting,

+					entry.intersectionRatio

+				);

 			    if (entry.isIntersecting) {

 			      // get the nav item corresponding to the id of the section

 			      // that is currently in view

+ 11 - 10
assets/scss/_project.scss
파일 보기 

@@ -1166,17 +1166,17 @@ a.ch-ggs-web-suite-icon-link {
 
 

 // new landing

 

-.ch-ggs-web-suite-landing-seciton {

+.ch-ggs-web-suite-landing-section {

 	min-height: 100vh;

 	padding: 120px 0;

 }

 

-.ch-ggs-web-suite-landing-seciton-dark {

+.ch-ggs-web-suite-landing-section-dark {

 	color: $white;

 	background: $primary-d-200;

 }

 

-.ch-ggs-web-suite-landing-seciton-hero {

+.ch-ggs-web-suite-landing-section-hero {

 	min-height: calc(100vh - 91px);

 	background-image: linear-gradient(270deg, rgba(201,85,217,0.30) 0%, #8D3E97 100%), url('#{$image}/hero-xs.jpg');

 	background-size: cover;

@@ -1185,6 +1185,7 @@ a.ch-ggs-web-suite-icon-link {
 
 .ch-ggs-web-suite-landing-section-title {

 	font-size: 32px;

 	display: flex;

+	margin-bottom: 80px;

 }

 

 .ch-ggs-web-suite-landing-section-title-icon {

@@ -1204,7 +1205,7 @@ a.ch-ggs-web-suite-icon-link {
 
 }

 

 .ch-ggs-web-suite-article-landing {

-	margin-bottom: $grid-gutter-width;

+	margin-bottom: 200px;

 	color: $body-color;

 

 	&:hover,

@@ -1213,7 +1214,7 @@ a.ch-ggs-web-suite-icon-link {
 
 	}

 }

 

-.ch-ggs-web-suite-landing-seciton-dark .ch-ggs-web-suite-article-landing {

+.ch-ggs-web-suite-landing-section-dark .ch-ggs-web-suite-article-landing {

 	color: $white;

 }

 

@@ -1300,18 +1301,18 @@ a.ch-ggs-web-suite-icon-link {
 
 	font-weight: bolder;

 }

 

-.ch-ggs-web-suite-landing-nav .nav-item.active > .nav-link {

+.ch-ggs-web-suite-landing-nav .nav-item > .nav-link.active {

 	color: $primary;

 }

 

 @include media-breakpoint-up(sm) {

-	.ch-ggs-web-suite-landing-seciton-hero {

+	.ch-ggs-web-suite-landing-section-hero {

 		background-image: linear-gradient(270deg, rgba(201,85,217,0.30) 0%, #8D3E97 100%), url('#{$image}/hero-sm.jpg');

 	}

 }

 

 @include media-breakpoint-up(md) {

-	.ch-ggs-web-suite-landing-seciton-hero {

+	.ch-ggs-web-suite-landing-section-hero {

 		background-image: linear-gradient(270deg, rgba(201,85,217,0.30) 0%, #8D3E97 100%), url('#{$image}/hero-md.jpg');

 	}

 

@@ -1347,7 +1348,7 @@ a.ch-ggs-web-suite-icon-link {
 
 }

 

 @include media-breakpoint-up(lg) {

-	.ch-ggs-web-suite-landing-seciton-hero {

+	.ch-ggs-web-suite-landing-section-hero {

 		min-height: calc(100vh - 98px);

 		background-image: linear-gradient(270deg, rgba(201,85,217,0.30) 0%, #8D3E97 100%), url('#{$image}/hero-lg.jpg');

 	}

@@ -1400,7 +1401,7 @@ a.ch-ggs-web-suite-icon-link {
 
 }

 

 @include media-breakpoint-up(xl) {

-	.ch-ggs-web-suite-landing-seciton-hero {

+	.ch-ggs-web-suite-landing-section-hero {

 		background-image: linear-gradient(270deg, rgba(201,85,217,0.30) 0%, #8D3E97 100%), url('#{$image}/hero-xl.jpg');

 	}

+ 8 - 6
index.php
파일 보기 

@@ -1,10 +1,10 @@
 
-<div id="ch-ggs-web-suite-landing-nav-trigger" class="ch-ggs-web-suite-landing-nav-trigger"></div>

+

 

 <?php include('_inc/_header-suite-start.php'); ?>

 

 <?php /* START: Pagetitle Content */ ?>

 <div class="ch-ggs-web-suite-landing-sections">

-	<section class="ch-ggs-web-suite-landing-seciton ch-ggs-web-suite-landing-seciton-hero">

+	<section class="ch-ggs-web-suite-landing-section ch-ggs-web-suite-landing-section-hero">

 		<div class="container">

 			<h1 class="ch-ggs-web-suite-landing-hero-title">Ihr Software-Werkzeugkasten für gefährliche Stoffe und Güter</h1>

 			<div class="ch-ggs-web-suite-common-content-holder">

@@ -21,7 +21,7 @@
 
 	</section>

 	<div id="ch-ggs-web-suite-landing-nav" class="ch-ggs-web-suite-landing-nav">

 		<div class="container">

-			<div class="navbar">

+			<div class="navbar" id="navbar-spy-sections">

 				<ul class="navbar-nav flex-row">

 					<li id="ch-ggs-web-suite-nav-item-01" class="nav-item"><a href="#ch-ggs-web-suite-section-01" class="nav-link px-2">Überblick</a></li>

 					<li id="ch-ggs-web-suite-nav-item-02" class="nav-item"><a href="#ch-ggs-web-suite-section-02" class="nav-link px-2">Die <span class="upper">Hazmat</span> Suite</a></li>

@@ -30,10 +30,10 @@
 
 			</div>

 		</div>

 	</div>

-	<section id="ch-ggs-web-suite-section-01" class="ch-ggs-web-suite-landing-seciton ch-ggs-web-suite-landing-seciton-dark">

+	<section id="ch-ggs-web-suite-section-01" class="ch-ggs-web-suite-landing-section ch-ggs-web-suite-landing-section-dark">

 		<?php include('_inc/_sectionCardsNew.php') ?>

 	</section>

-	<section id="ch-ggs-web-suite-section-02" class="ch-ggs-web-suite-landing-seciton ch-ggs-web-suite-landing-seciton-dark">

+	<section id="ch-ggs-web-suite-section-02" class="ch-ggs-web-suite-landing-section ch-ggs-web-suite-landing-section-dark">

 		<div class="container">

 			<h2 class="ch-ggs-web-suite-landing-section-title"><i class="ch-ggs-web-suite-landing-section-title-icon ifc ifc-frontal-truck"></i> Hazmat Suite</h2>

 			<?php include('_inc/_sectionArticleNew.php') ?>

@@ -41,9 +41,11 @@
 
 			<?php include('_inc/_sectionArticleNewText.php') ?>

 		</div>

 	</section>

-	<section id="ch-ggs-web-suite-section-03" class="ch-ggs-web-suite-landing-seciton">

+	<section id="ch-ggs-web-suite-section-03" class="ch-ggs-web-suite-landing-section">

 		<div class="container">

+			<h2 class="ch-ggs-web-suite-landing-section-title"><i class="ch-ggs-web-suite-landing-section-title-icon ifc ifc-frontal-truck"></i> SmartIdentify</h2>

 			<?php include('_inc/_sectionArticleNew.php') ?>

+			<h2 class="ch-ggs-web-suite-landing-section-title"><i class="ch-ggs-web-suite-landing-section-title-icon ifc ifc-frontal-truck"></i> SmartLabel</h2>

 			<?php include('_inc/_sectionArticleNew.php') ?>

 		</div>

 	</section>

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.