Skip to content

Commit

Permalink
Merge pull request #3 from WebFaker/bugfix/fix-task
Browse files Browse the repository at this point in the history
temporary fix
  • Loading branch information
David committed Apr 11, 2018
2 parents 1c425b4 + 693c5eb commit 5b55772
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "MIT",
"main": "src/index.js",
"scripts": {
"start": "parcel src/index.html src/monPanier.html",
"start": "parcel src/index.html",
"build": "parcel src/index.js"
},
"author": "David Venin",
Expand Down
7 changes: 4 additions & 3 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
<header class="Header">
<div class="container">
<div class="row middle-xs">
<a class="Header-logo" title="R" href="index.html">R</a>
<a class="Header-logo" title="R" href="./index.html">R</a>
<a class="Header-link-white" href="#">COLLECTION</a>
<a class="Header-link" href="events.html">EVENEMENTS</a>
<a class="Header-link" href="./events.html">EVENEMENTS</a>
<a class="Header-link" href="#">GENERATEUR</a>
<a class="Header-link-right" href="connexion.html">COMPTE</a>
<a class="Header-link-right" href="./connexion.html">COMPTE</a>
<a class="Header-link-right" href="./monPanier.html">Panier</a>
</div>
</div>
</header>
Expand Down
19 changes: 9 additions & 10 deletions src/monPanier.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Ring</title>
<body>


<header class="header">
<h1 class="header-title">Collection</h1>
<h1 class="header-title">Evenements</h1>
<h1 class="header-title">Generateur</h1>
<h1 class="header-title">Compte</h1>
</header>

</head>
<body>
<header class="header">
<a href="" class="header-title">Collection</a>
<a href="" class="header-title">Evenements</a>
<a href="" class="header-title">Generateur</a>
<a href="" class="header-title">Compte</a>
</header>

<script src="index.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion src/styles/components/_connexion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}

.Texture {
background-image: url('../img/bg.png');
// background-image: url('../img/bg.png');
height: 100%;
width: 469px;
background-repeat: no-repeat;
Expand Down
4 changes: 2 additions & 2 deletions src/styles/components/_section.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
&-container-picture{
grid-row: 1/7;
grid-column: 4/8;
background: url('../img/uibpm.jpg') no-repeat center;
// background: url('../img/uibpm.jpg') no-repeat center;
background-size: cover;
z-index: 3;
opacity: 1;

}

&-container-picture2{
background: url('../img/Texture02.png') no-repeat;
// background: url('../img/Texture02.png') no-repeat;
background-size: contain;
grid-column: 7/12;
grid-row: 2/6;
Expand Down

0 comments on commit 5b55772

Please sign in to comment.