Compare commits

...

2 Commits

Author SHA1 Message Date
Thoscellen
3e0f980bc6 fix: Tweaked roundings and fonts and fixed assets links in .css.
Need to be tested on Pages to see if links works as well as locally.
2021-08-10 00:19:33 +02:00
Thoscellen
acdfe1129d chore: 👷 Changed folder structure to groups things together 2021-08-10 00:08:34 +02:00
12 changed files with 21 additions and 22 deletions

View File

@ -4,7 +4,9 @@
pages: pages:
stage: deploy stage: deploy
script: echo "hi" script:
- cp -r assets/ public/wireframe/
- mv assets/ public/assets/
artifacts: artifacts:
paths: paths:
- public - public

View File

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

Before

Width:  |  Height:  |  Size: 176 KiB

After

Width:  |  Height:  |  Size: 176 KiB

View File

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -18,10 +18,10 @@ h1,
h2, h2,
h3, h3,
button { button {
font-family: "Chalkboard", "Comic Neue", "Comic Sans MS", cursive; font-family: "Comic Sans MS", "Chalkboard", "Comic Neue", cursive;
/* letter-spacing: -0.5px; */ /* letter-spacing: -0.5px; */
text-transform: uppercase; text-transform: uppercase;
font-weight: 700; font-weight: 500;
} }
/* The body of the fake website consist of a scrollable big picture */ /* The body of the fake website consist of a scrollable big picture */
@ -100,10 +100,10 @@ button {
#tabs-container { #tabs-container {
display: flex; display: flex;
font-family: "Chalkboard", "Comic Neue", "Comic Sans MS", cursive; font-family: "Comic Sans MS", "Chalkboard", "Comic Neue", cursive;
/* letter-spacing: -0.5px; */ /* letter-spacing: -0.5px; */
overflow-x: auto; overflow-x: auto;
font-weight: 600; font-weight: 500;
} }
#tabs-container a { #tabs-container a {
@ -181,12 +181,12 @@ input {
height: 40px; height: 40px;
text-transform: initial; text-transform: initial;
font-size: initial; font-size: initial;
font-family: Calibri, Mallanna, "Segoe UI", sans-serif; font-family: Calibri, Mallanna, sans-serif;
} }
#doc-file-viewmode a { #doc-file-viewmode a {
background-image: linear-gradient(#fff, #e9ebef); background-image: linear-gradient(#fff, #e9ebef);
border-radius: 15px; border-radius: 10px;
height: 40px; height: 40px;
min-width: 40px; min-width: 40px;
display: inline-block; display: inline-block;
@ -203,7 +203,7 @@ button {
background-image: linear-gradient(#3889c1, #43b9e7); background-image: linear-gradient(#3889c1, #43b9e7);
color: #fff; color: #fff;
border: none; border: none;
border-radius: 15px; border-radius: 10px;
font-size: initial; font-size: initial;
padding:9px 12px; padding:9px 12px;
} }
@ -288,12 +288,12 @@ button {
.type-folder { .type-folder {
border: 1px solid #efdd77; border: 1px solid #efdd77;
background: left / contain no-repeat url("./assets/folder-large.png") ; background: left / contain no-repeat url("../assets/folder-large.png") ;
} }
.type-file { .type-file {
/* border: 1px solid lightgray; */ /* border: 1px solid lightgray; */
background: left / contain no-repeat url("./assets/unknown-large.png") ; background: left / contain no-repeat url("../assets/unknown-large.png") ;
} }

View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<link type="text/css" rel="stylesheet" href="./main.css" /> <link type="text/css" rel="stylesheet" href="css/main.css" />
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Document</title> <title>Document</title>
@ -10,18 +10,18 @@
<body> <body>
<div id="fake"> <div id="fake">
<img src="./assets/fake-home.jpg" /> <img src="assets/fake-home.jpg" />
</div> </div>
<div id="lbmod1" class="lb-mod softener"> <div id="lbmod1" class="lb-mod softener">
<div class="lb-container"> <div class="lb-container">
<div class="lb-header"> <div class="lb-header">
<h2>Importer des documents</h2> <h2>Importer des documents</h2>
<a href="#" class="close-button"><img src="./assets/closebutton.png"></a> <a href="#" class="close-button"><img src="assets/closebutton.png"></a>
<div id="tabs-container"> <div id="tabs-container">
<span></span> <span></span>
<span class="active"><a href="">Parcourir son Espace Doc</a></span>
<span><a href="#">Intégrer un contenu externe</a></span> <span><a href="#">Intégrer un contenu externe</a></span>
<span><a href="#">Filmer depuis la caméra</a></span> <span><a href="#">Filmer depuis la caméra</a></span>
<span class="active"><a href="">Parcourir son Espace Doc</a></span>
<span></span> <span></span>
</div> </div>
</div> </div>

View File

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

View File

@ -5,14 +5,12 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title> <title>Juxtaposed Lightbox</title>
<link rel="stylesheet" href="remus.min.css">
</head> </head>
<body> <body>
<div class="juxtapose" data-animate="true"> <div class="juxtapose" data-animate="true">
<img src="./actual-screenshot1.jpg" alt="" data-label="2019"> <img src="actual-screenshot1.jpg" alt="An image of the actual implementation" data-label="before">
<img src="./poc-screenshot1.jpg" alt="" data-label="poc"> <img src="poc-screenshot1.jpg" alt="An image of my prototype implementation" data-label="after">
</div> </div>
<script src="https://cdn.knightlab.com/libs/juxtapose/latest/js/juxtapose.min.js"></script> <script src="https://cdn.knightlab.com/libs/juxtapose/latest/js/juxtapose.min.js"></script>
<link rel="stylesheet" href="https://cdn.knightlab.com/libs/juxtapose/latest/css/juxtapose.css"> <link rel="stylesheet" href="https://cdn.knightlab.com/libs/juxtapose/latest/css/juxtapose.css">

View File

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 129 KiB

View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<link type="text/css" rel="stylesheet" href="./wireframe.css" /> <link type="text/css" rel="stylesheet" href="css/wireframe.css" />
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Document</title> <title>Document</title>
@ -14,9 +14,9 @@
<div class=" "><span class="text-ph close-button">x</span></div> <div class=" "><span class="text-ph close-button">x</span></div>
<div id="tabs-container"> <div id="tabs-container">
<span></span> <span></span>
<span class="active"><a href="#" class="text-ph">Onglet actif</a></span>
<span><a href="#" class="text-ph">Onglet 1</a></span> <span><a href="#" class="text-ph">Onglet 1</a></span>
<span><a href="#" class="text-ph">Onglet 2</a></span> <span><a href="#" class="text-ph">Onglet 2</a></span>
<span class="active"><a href="#" class="text-ph">Onglet actif</a></span>
<span></span> <span></span>
</div> </div>
</div> </div>
@ -26,7 +26,6 @@
<button>🔍</button> <button>🔍</button>
</div> </div>
<div id="doc-file-viewmode"> <div id="doc-file-viewmode">
Vue :
<a href="#" class="active">Mosaïque</a> <a href="#" class="active">Mosaïque</a>
<a href="#">Grille</a> <a href="#">Grille</a>
<a href="#">Liste</a> <a href="#">Liste</a>