Accueil Explorer Aide
Connexion
hnm
/
hazmat-suite
8
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

update styling

tomekk il y a 4 ans
Parent
7cfbbd8aba
commit
5c5c3665a2
7 fichiers modifiés avec 36 ajouts et 34 suppressions
Vue séparée Afficher les stats Diff
  1. 4 3
      _inc/_header-suite-start.php
  2. 4 4
      _inc/_header.php
  3. 16 17
      assets/css/style.css
  4. 0 0
      assets/css/style.css.map
  5. 3 1
      assets/scss/_custom.scss
  6. 9 5
      assets/scss/_layout.scss
  7. 0 4
      assets/scss/_project.scss

+ 4 - 3
_inc/_header-suite-start.php
Voir le fichier 

@@ -1,7 +1,7 @@
 
 <?php 

 	$GLOBALS['offsetClass'] = "col-md-8 offset-md-2 col-lg-6 offset-lg-3 ch-ggs-web-suite-common-content";

 	$GLOBALS['offsetClassLg'] = "col-lg-10 offset-lg-1 col-xl-8 offset-xl-2 ch-ggs-web-suite-common-content";

-	$assets_version = '1.10';

+	$assets_version = '1.11';

 ?>

 

 <!doctype html>

@@ -29,7 +29,7 @@
 
         <header id="ch-ggs-web-suite-header">

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

         	<div class="container">

-				<nav id="ch-ggs-web-suite-nav" class="navbar navbar-expand-lg align-items-lg-start">

+				<nav id="ch-ggs-web-suite-nav" class="navbar navbar-expand-lg align-items-lg-center">

 	        		<a href="index.php" class="navbar-brand">

 		        		<img src="assets/img/HAZMATSuite.svg" alt="Logo Hazmatsuite" class="img-fluid" width="284px" height="70px">

 	        		</a>

@@ -70,7 +70,8 @@
 
 								<a href="agb.php" class="nav-link" title="AGB">AGB</a>

 							</li>

 							<li class="dropdown level-rel-0">

-								<a href="#" class="nav-link dropdown-toggle" id="languageDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Sprache"><i aria-hidden="true" class="btn-icon ifc ifc-chain"></i> Sprache</a>

+								<a href="#" class="nav-link dropdown-toggle" id="languageDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Sprache">

+									<i aria-hidden="true" class="btn-icon ifc ifc-chain"></i> Sprache</a>

 								<div class="dropdown-menu" aria-labelledby="languageDropdown">

 									<a href="example.php" class="dropdown-item active ch-ggs-web-suite-language-nav" title="Sprache DE">DE</a>

 									<a href="example.php" class="dropdown-item ch-ggs-web-suite-language-nav" title="Sprache EN">EN</a>

+ 4 - 4
_inc/_header.php
Voir le fichier 

@@ -2,7 +2,7 @@
 
 	$GLOBALS['offsetClass'] = "col-md-8 offset-md-2 col-lg-6 offset-lg-3";

 	$GLOBALS['classMainHasLeft'] = "col-md-8 col-lg-9";

 	$GLOBALS['classLeft'] = "col-md-4 col-lg-3 mt-5 mt-md-0";

-	$assets_version = '1.10';

+	$assets_version = '1.11';

 ?>

 

 <!doctype html>

@@ -28,7 +28,7 @@
 
         <header id="ch-ggs-web-suite-header">

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

         	<div class="container">

-				<nav id="ch-ggs-web-suite-nav" class="navbar navbar-expand-lg align-items-lg-start">

+				<nav id="ch-ggs-web-suite-nav" class="navbar navbar-expand-lg align-items-lg-center">

 	        		<a href="index.php" class="navbar-brand">

 	        			<img src="assets/img/HAZMATSuite.svg" alt="Logo Hazmatsuite" class="img-fluid" width="284px" height="70px">

         			</a>

@@ -78,8 +78,8 @@
 
 <!-- 								</div> -->

 <!-- 							</li> -->

 							<li class="dropdown level-rel-0">

-								<a href="#" class="nav-link dropdown-toggle" id="languageDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Sprache"><i aria-hidden="true" class="ifc ifc-chain"></i> Sprache 

-								</a>

+								<a href="#" class="nav-link dropdown-toggle" id="languageDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Sprache">

+									<i aria-hidden="true" class="ifc ifc-chain"></i> Sprache</a>

 								<div class="dropdown-menu" aria-labelledby="languageDropdown">

 									<a href="example.php" class="dropdown-item active ch-ggs-web-suite-language-nav" title="Sprache DE">DE</a>

 									<a href="example.php" class="dropdown-item ch-ggs-web-suite-language-nav" title="Sprache EN">EN</a>

+ 16 - 17
assets/css/style.css
Voir le fichier 

@@ -7,8 +7,8 @@
 
  */
 
 @font-face {
 
   font-family: "icomoon";
 
-  src: url("../fonts/icomoon.eot?ujnwapn");
 
-  src: url("../fonts/icomoon.eot?ujnwapn#iefix") format("embedded-opentype"), url("../fonts/icomoon.ttf?ujnwapn") format("truetype"), url("../fonts/icomoon.woff?ujnwapn") format("woff"), url("../fonts/icomoon.svg?ujnwapn#icomoon") format("svg");
 
+  src: url("../fonts/icomoon.eot?ui1a00x");
 
+  src: url("../fonts/icomoon.eot?ui1a00x#iefix") format("embedded-opentype"), url("../fonts/icomoon.ttf?ui1a00x") format("truetype"), url("../fonts/icomoon.woff?ui1a00x") format("woff"), url("../fonts/icomoon.svg?ui1a00x#icomoon") format("svg");
 
   font-weight: normal;
 
   font-style: normal;
 
   font-display: swap;
 
@@ -3108,7 +3108,7 @@ input[type=button].btn-block {
 
 }
 
 .dropdown-toggle::after {
 
   display: inline-block;
 
-  margin-left: 0.255em;
 
+  margin-left: 0.357143em;
 
   vertical-align: 0.255em;
 
   content: "";
 
   border-top: 0.3em solid;
 
@@ -3202,7 +3202,7 @@ input[type=button].btn-block {
 
 }
 
 .dropup .dropdown-toggle::after {
 
   display: inline-block;
 
-  margin-left: 0.255em;
 
+  margin-left: 0.357143em;
 
   vertical-align: 0.255em;
 
   content: "";
 
   border-top: 0;
 
@@ -3223,7 +3223,7 @@ input[type=button].btn-block {
 
 }
 
 .dropright .dropdown-toggle::after {
 
   display: inline-block;
 
-  margin-left: 0.255em;
 
+  margin-left: 0.357143em;
 
   vertical-align: 0.255em;
 
   content: "";
 
   border-top: 0.3em solid transparent;
 
@@ -3247,7 +3247,7 @@ input[type=button].btn-block {
 
 }
 
 .dropleft .dropdown-toggle::after {
 
   display: inline-block;
 
-  margin-left: 0.255em;
 
+  margin-left: 0.357143em;
 
   vertical-align: 0.255em;
 
   content: "";
 
 }
 
@@ -3256,7 +3256,7 @@ input[type=button].btn-block {
 
 }
 
 .dropleft .dropdown-toggle::before {
 
   display: inline-block;
 
-  margin-right: 0.255em;
 
+  margin-right: 0.357143em;
 
   vertical-align: 0.255em;
 
   content: "";
 
   border-top: 0.3em solid transparent;
 
@@ -4635,7 +4635,7 @@ input[type=button].btn-block {
 
 
 @media (min-width: 576px) {
 
   .modal-dialog {
 
-    max-width: 540;
 
+    max-width: 540px;
 
     margin: 1.75rem auto;
 
   }
 
 
@@ -9623,6 +9623,11 @@ footer h2 {
 
   margin-bottom: 2.5rem;
 
 }
 
 
+.navbar-brand svg,
 
+.navbar-brand img {
 
+  max-width: 243px;
 
+}
 
+
 
 #ch-ggs-web-suite-header {
 
   padding: 18px 0;
 
   border-bottom: 2px solid #990099;
 
@@ -9667,12 +9672,14 @@ footer h2 {
 
   display: block;
 
   height: 4px;
 
   width: 26px;
 
-  margin-top: 5px;
 
   transform: rotate(0deg);
 
   transform-origin: left center;
 
   transition: 0.25s ease-in-out;
 
   will-change: transform;
 
 }
 
+.navbar-toggler .navbar-toggler-bar:not(:first-child) {
 
+  margin-top: 5px;
 
+}
 
 .navbar-toggler[aria-expanded=true] .navbar-toggler-bar:nth-child(1) {
 
   transform: rotate(45deg);
 
   top: 20px;
 
@@ -9715,10 +9722,6 @@ footer h2 {
 
   #ch-ggs-web-suite-nav {
 
     padding: 0;
 
   }
 
-
 
-  #ch-ggs-web-suite-toggler-nav {
 
-    margin-top: 12px;
 
-  }
 
 }
 
 h1 {
 
   color: #990099;
 
@@ -9945,10 +9948,6 @@ h4 + hr {
 
   color: #990099;
 
 }
 
 
-.modal-dialog {
 
-  max-width: 540px;
 
-}
 
-
 
 .modal-content {
 
   padding: 40px 40px 60px;
 
 }

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
assets/css/style.css.map


+ 3 - 1
assets/scss/_custom.scss
Voir le fichier 

@@ -250,6 +250,8 @@ $dropdown-link-active-bg:          	transparent;
 
 

 $lead-font-size:                    1.25rem;

 

+$caret-spacing:                     0.357143em;

+

 

 @import "bootstrap/variables";

 

@@ -269,7 +271,7 @@ $common-padding:				$grid-gutter-width;
 
 $modal-inner-padding:         0 !default;

 $modal-footer-border-width:     0;

 

-$modal-md:                      540;

+$modal-md:                      540px;

 

 $font-family-icons:				'icomoon';

+ 9 - 5
assets/scss/_layout.scss
Voir le fichier 

@@ -43,6 +43,11 @@ footer h2 {
 
 	margin-bottom: 2.5rem;

 }

 

+.navbar-brand svg,

+	.navbar-brand img {

+		max-width: 243px;

+	}

+

 // header

 

 #ch-ggs-web-suite-header {

@@ -97,13 +102,16 @@ footer h2 {
 
 		display: block;

 		height: 4px;

 		width: 26px;

-		margin-top: 5px;

 		transform: rotate(0deg);

 		transform-origin: left center;

 		transition: .25s ease-in-out;

 		will-change: transform;

 	}

 

+	.navbar-toggler-bar:not(:first-child) {

+		margin-top: 5px;

+	}

+

 	&[aria-expanded="true"] {

 		.navbar-toggler-bar:nth-child(1) {

 			transform: rotate(45deg);

@@ -154,10 +162,6 @@ footer h2 {
 
 	#ch-ggs-web-suite-nav {

 		padding: 0;

 	}

-

-	#ch-ggs-web-suite-toggler-nav {

-		margin-top: 12px;

-	}

 }

+ 0 - 4
assets/scss/_project.scss
Voir le fichier 

@@ -84,7 +84,6 @@ h4 + hr {
 
 	.dropdown-menu {

 		box-shadow: none; 

 	}

-	

 }

 

 @include media-breakpoint-up(lg) {

@@ -121,9 +120,6 @@ h4 + hr {
 
 }

 

 //modal

-.modal-dialog {

-	max-width: 540px;

-}

 .modal-content {

 	padding: 40px 40px 60px;

 }

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff