xdrm-brackets
/
xdrm.io
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: xdrm-brackets:d0648bea84112667e20529881812e1e6b7ef2b30
Branches Tags
xdrm-brackets:master
xdrm-brackets:search-engine
xdrm-brackets:feature/yellow
..
compare: xdrm-brackets:674a23215bde24d1ddd60dced9dbff327d90284e
Branches Tags
xdrm-brackets:search-engine
xdrm-brackets:feature/yellow
xdrm-brackets:master

No commits in common. "d0648bea84112667e20529881812e1e6b7ef2b30" and "674a23215bde24d1ddd60dced9dbff327d90284e" have entirely different histories.
d0648bea84 ... 674a23215b

4 changed files with 24 additions and 108 deletions
Show Stats Expand all files Collapse all files

15
src/assets/timeline/logo.svg
View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="4.2333mm" height="4.2333mm" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<linearGradient id="a" x1="122.52" x2="130.49" y1="39.199" y2="31.302" gradientTransform="translate(.09658)" gradientUnits="userSpaceOnUse">
<stop stop-color="#745cfc" offset="0"/>
<stop stop-color="#564ba4" offset="1"/>
</linearGradient>
</defs>
<g transform="matrix(.10155 0 0 .10155 -90.232 -10.197)">
<g transform="matrix(0 2.2967 -2.2967 0 990.37 -169.5)" fill="url(#a)">
<path d="m122.72 31.302 2.3682 3.7201a0.21308 0.21308 89.753 0 1 9.8e-4 0.2273l-2.4668 3.9498h1.5785a0.73492 0.73492 149.45 0 0 0.64338-0.37973l1.4732-2.6685a0.27716 0.27716 104.45 0 0 0.0345-0.13395v-1.7817a0.28946 0.28946 76.14 0 0-0.0332-0.13465l-1.2688-2.4147a0.71792 0.71792 31.14 0 0-0.63551-0.38397z"/>
<path d="m130.48 39.199-2.4404-3.8335 2.538-4.0637h-2.0122l-1.7173 3.1108v1.9246l1.5038 2.8618z"/>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

111
src/components/Timeline.vue
View File

@ -2,13 +2,14 @@
<div id='timeline'>
<div id='search-header' ref='header'>
<img src='../assets/timeline/logo.svg'/>
<span>
<h3>{{ $t('timeline.title') }}</h3> <SkillCard :id='skill' :active='true'/>
</span>
<input type='button' :value="$t('timeline.back')" @click='$event.preventDefault(); scrollBack()'/>
</div>
<div class="col1"></div>
<div class="col2"></div>
<div class="col3"></div>
<div class="col4"></div>
<div class="col5"></div>
<template class='project' v-for='(proj) of projects'>
<div :key="'spacer-'+proj.name" class='spacer' />
@ -24,6 +25,12 @@
Created <b>{{ proj.name }}</b> <span>{{ proj.started_at | date_diff }} ago</span>
</div>
<div :key="'col1-'+proj.name" class="col1"></div>
<div :key="'col2-'+proj.name" class="col2"></div>
<div :key="'col3-'+proj.name" class="col3"></div>
<div :key="'col4-'+proj.name" class="col4"></div>
<div :key="'col5-'+proj.name" class="col5"></div>
<div :key="'joint-start-'+proj.name" class='joint-start' />
<div :key="'skill-icon-'+proj.name" class='skill-icon'>
@ -82,7 +89,6 @@ import SkillCard from './SkillCard.vue';
import { Project } from '../model/projects';
import { tID } from '../model/skills';
import * as projects from '../service/projects';
import * as scroller from '../service/scroller';
function pluralize(n: number, s: string): string {
n = Math.floor(Math.abs(n));
@ -172,7 +178,7 @@ export default class Timeline extends Vue {
if ( el == null ) {
return;
}
// when scrolling after this limit, make the header fixed
// when scrolling after this limit, make the header fixed
const limit = el.offsetTop;
if ( target.scrollTop >= limit ) {
@ -181,10 +187,6 @@ export default class Timeline extends Vue {
header.classList.remove('fixed');
}
}
protected scrollBack() {
scroller.go("skill-picker", 0);
}
}
</script>
@ -197,10 +199,9 @@ export default class Timeline extends Vue {
$bg-color: #202228;
$header-height: 6rem;
$joint-height: 2rem;
$logo-size: 5rem;
#search-header {
display: grid;
display: block;
position: absolute;
top: 0;
left: 0;
@ -212,9 +213,6 @@ export default class Timeline extends Vue {
z-index: 500;
grid-template-columns: $logo-size auto min-content;
align-items: center;
transition: background .5s ease-in-out,
margin .2s ease-in-out,
left .2s ease-in-out,
@ -222,83 +220,18 @@ export default class Timeline extends Vue {
border-radius .2s ease-in-out,
box-shadow .1s ease-in-out;
img {
width: $logo-size;
height: $logo-size;
opacity: 0;
margin-left: .5rem;
transition: opacity .2s ease-in-out;
}
span {
display: flex;
margin: auto;
flex-flow: row nowrap;
h3 {
color: #fff;
font-size: 1.3em;
transition: color .2s ease-in-out;
}
.skill-card {
margin: 0 .5em;
cursor: auto;
&:hover {
background: #444952;
}
}
}
input {
padding: .4em 1em;
margin-right: 1.5em;
color: #fff;
font-size: 1.4rem;
background: linear-gradient(to top right, #564ba4, #745cfc);
border: none;
border-radius: .5rem / .5rem;
opacity: 0;
transition: opacity .2s ease-in-out;
cursor: pointer;
}
&.fixed {
position: fixed;
left: 1rem;
width: calc( 100% - #{1*2rem} );
margin-top: 1rem;
background: #fff;
background: #eee;
// background: linear-gradient(to top right, #564ba4, #745cfc);
border-radius: 1rem / 1rem;
box-shadow: 0 0 1em darken(#202228, 5%);
img {
opacity: 1;
}
h3 {
color: #000;
}
input {
opacity: 1;
}
}
}
#timeline {
@ -318,7 +251,13 @@ export default class Timeline extends Vue {
padding: 0 5rem;
padding-top: $header-height;
padding-top: #{$header-height + 2rem};
// /**DEBUG**/.col1{ grid-column: 1; height: 1rem; background: red; }
// /**DEBUG**/.col2{ grid-column: 2; height: 1rem; background: blue; }
// /**DEBUG**/.col3{ grid-column: 3; height: 1rem; background: yellow; }
// /**DEBUG**/.col4{ grid-column: 4; height: 1rem; background: green; }
// /**DEBUG**/.col5{ grid-column: 5; height: 1rem; background: orange; }
// line 1
.spacer { grid-column: 2; };
@ -497,14 +436,12 @@ export default class Timeline extends Vue {
color: #999999;
}
.name b {
b {
color: #745cfc;
font-weight: 500;
}
.name span,
.src span,
.end span {
span {
position: relative;
font-size: .8em;

3
src/locales/en.json
View File

@ -9,8 +9,5 @@
"home.line4-2": "and",
"home.line4-3": "(Arduino, Raspberry).",
"timeline.title": "Timeline of projects featuring",
"timeline.back": "Change skill",
"end": ""
}

3
src/locales/fr.json
View File

@ -9,8 +9,5 @@
"home.line4-2": "et l'",
"home.line4-3": "(Arduino, Raspberry).",
"timeline.title": "Chronologie des projets avec",
"timeline.back": "Choisir compétence",
"end": ""
}