Skip to content

Commit

Permalink
Merge branch 'master' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
guilhermeborgesbastos committed May 20, 2020
2 parents b7fb405 + 41ca0a9 commit 268e1e7
Show file tree
Hide file tree
Showing 12 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion src/app/about/about.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
-webkit-border-radius: 99em;
-moz-border-radius: 99em;
border-radius: 99em;
background-image: url('../../assets/template/about/guilherme-borges-bastos-picture.jpg');
background-image: url('https://assets.guilhermeborgesbastos.com/live-resume/template/about/guilherme-borges-bastos-picture.jpg');
border: 3px solid #d4e7fe;
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/contact/contact.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ <h1 i18n="nav@@contact">Contact</h1>
</div>
<div class="right-side"></div>
</div>
<img loading="lazy" height="705" src="./assets/template/contact/gbastos-Illustration.png" class="illustration" alt="illustration">
<img loading="lazy" height="704" width="512" src="https://assets.guilhermeborgesbastos.com/live-resume/template/contact/gbastos-Illustration.png" class="illustration" alt="illustration">
<div class="half-circle"></div>
</section>
2 changes: 1 addition & 1 deletion src/app/contact/contact.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
background-repeat: no-repeat;
background-position: center center;
border-radius: 99em;
background-image: url('../../assets/template/about/guilherme-borges-bastos-picture.jpg');
background-image: url('https://assets.guilhermeborgesbastos.com/live-resume/template/about/guilherme-borges-bastos-picture.jpg');
border: 1px solid #d4e7fe;
margin-right: 1em;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div class="skills">
<img loading="lazy" class="background" src="./assets/template/welcome/illustration-back.png" alt="Background"/>
<img loading="lazy" class="skill-icon docker" src="./assets/template/welcome/icons/docker.svg" alt="Docker"/>
<img loading="lazy" class="skill-icon css" src="./assets/template/welcome/icons/css3.svg" alt="CSS3"/>
<img loading="lazy" class="skill-icon git" src="./assets/template/welcome/icons/git.svg" alt="Git"/>
<img loading="lazy" class="skill-icon html" src="./assets/template/welcome/icons/html5.svg" alt="HTML5"/>
<img loading="lazy" class="skill-icon sql" src="./assets/template/welcome/icons/sql.svg" alt="SQL"/>
<img loading="lazy" class="skill-icon php" src="./assets/template/welcome/icons/php.svg" alt="PHP"/>
<img loading="lazy" class="skill-icon java" src="./assets/template/welcome/icons/java.svg" alt="JAVA"/>
<img loading="lazy" class="skill-icon bitbucket" src="./assets/template/welcome/icons/bitbucket.svg" alt="BitBucket"/>
<img loading="lazy" class="skill-icon android" src="./assets/template/welcome/icons/android.svg" alt="Android"/>
<img loading="lazy" class="background" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/illustration-back.png" alt="Background"/>
<img loading="lazy" class="skill-icon docker" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/icons/docker.svg" alt="Docker"/>
<img loading="lazy" class="skill-icon css" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/icons/css3.svg" alt="CSS3"/>
<img loading="lazy" class="skill-icon git" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/icons/git.svg" alt="Git"/>
<img loading="lazy" class="skill-icon html" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/icons/html5.svg" alt="HTML5"/>
<img loading="lazy" class="skill-icon sql" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/icons/sql.svg" alt="SQL"/>
<img loading="lazy" class="skill-icon php" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/icons/php.svg" alt="PHP"/>
<img loading="lazy" class="skill-icon java" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/icons/java.svg" alt="JAVA"/>
<img loading="lazy" class="skill-icon bitbucket" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/icons/bitbucket.svg" alt="BitBucket"/>
<img loading="lazy" class="skill-icon android" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/icons/android.svg" alt="Android"/>
</div>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="dialog-container">
<img loading="lazy" src="./assets/template/welcome/bubble-frame.png" alt="Welcome Speech Bobble"/>
<img loading="lazy" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/bubble-frame.png" alt="Welcome Speech Bobble"/>
<div class="console">
<p class="hello" i18n="dialog@@hello">Hello!</p>
<span
Expand Down
2 changes: 1 addition & 1 deletion src/app/welcome/welcome.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section id="welcome">
<div class="layer_one">
<div class="avatar-container">
<img loading="lazy" class="illustration" src="./assets/template/welcome/[email protected]" alt="Guilherme Borges Bastos"/>
<img loading="lazy" class="illustration" src="https://assets.guilhermeborgesbastos.com/live-resume/template/welcome/[email protected]" alt="Guilherme Borges Bastos"/>
<app-welcome-background></app-welcome-background>
</div>
<app-welcome-dialog></app-welcome-dialog>
Expand Down
12 changes: 6 additions & 6 deletions src/assets/data/experiences.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"http": "https://www.facebook.com/editoranossotransito/"
}
],
"backgroundUrl": "./assets/template/experience/uberaba.jpg"
"backgroundUrl": "https://assets.guilhermeborgesbastos.com/live-resume/template/experience/uberaba.jpg"
},
{
"id": 2,
Expand Down Expand Up @@ -77,7 +77,7 @@
"http": "https://www.instagram.com/somos_etatica/"
}
],
"backgroundUrl": "./assets/template/experience/rio.jpg"
"backgroundUrl": "https://assets.guilhermeborgesbastos.com/live-resume/template/experience/rio.jpg"
},
{
"id": 3,
Expand Down Expand Up @@ -112,7 +112,7 @@
"http": "https://www.linkedin.com/company/deevo/about/"
}
],
"backgroundUrl": "./assets/template/experience/sao-paulo.jpg"
"backgroundUrl": "https://assets.guilhermeborgesbastos.com/live-resume/template/experience/sao-paulo.jpg"
},
{
"id": 4,
Expand Down Expand Up @@ -151,7 +151,7 @@
"http": "https://www.facebook.com/skydreamer.io/"
}
],
"backgroundUrl": "./assets/template/experience/utrecht.jpg"
"backgroundUrl": "https://assets.guilhermeborgesbastos.com/live-resume/template/experience/utrecht.jpg"
},
{
"id": 5,
Expand Down Expand Up @@ -196,7 +196,7 @@
"http": "https://www.youtube.com/c/QatGlobal-USA"
}
],
"backgroundUrl": "./assets/template/experience/uberaba.jpg"
"backgroundUrl": "https://assets.guilhermeborgesbastos.com/live-resume/template/experience/uberaba.jpg"
},
{
"id": 6,
Expand Down Expand Up @@ -240,6 +240,6 @@
"http": "https://www.youtube.com/swisscom"
}
],
"backgroundUrl": "./assets/template/experience/rotterdam.jpg"
"backgroundUrl": "https://assets.guilhermeborgesbastos.com/live-resume/template/experience/rotterdam.jpg"
}
]
18 changes: 9 additions & 9 deletions src/assets/data/posts.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"thumbnail": "./assets/posts/post-11-03-2019.jpg",
"thumbnail": "https://assets.guilhermeborgesbastos.com/live-resume/posts/post-11-03-2019.jpg",
"http": "https://www.linkedin.com/pulse/anti-traversing-2d-array-formula-guilherme-borges-bastos/",
"date": "11-03-2019",
"internationalizations": [
Expand All @@ -17,7 +17,7 @@
]
},
{
"thumbnail": "./assets/posts/post-01-15-2019.jpg",
"thumbnail": "https://assets.guilhermeborgesbastos.com/live-resume/posts/post-01-15-2019.jpg",
"http": "https://www.linkedin.com/pulse/em-2019-saia-do-desemprego-seja-voc%C3%AA-um-web-developer-borges-bastos/",
"date": "01-15-2019",
"internationalizations": [
Expand All @@ -34,7 +34,7 @@
]
},
{
"thumbnail": "./assets/posts/post-07-10-2016.jpg",
"thumbnail": "https://assets.guilhermeborgesbastos.com/live-resume/posts/post-07-10-2016.jpg",
"http": "https://www.linkedin.com/pulse/map-item-navigation-android-opensource-en-guilherme-borges-bastos/",
"date": "07-10-2016",
"internationalizations": [
Expand All @@ -51,7 +51,7 @@
]
},
{
"thumbnail": "./assets/posts/post-05-07-2016.jpg",
"thumbnail": "https://assets.guilhermeborgesbastos.com/live-resume/posts/post-05-07-2016.jpg",
"http": "https://www.linkedin.com/pulse/geo-distance-search-mysql-php-guilherme-borges-bastos/",
"date": "05-07-2016",
"internationalizations": [
Expand All @@ -68,7 +68,7 @@
]
},
{
"thumbnail": "./assets/posts/post-06-18-2016.jpg",
"thumbnail": "https://assets.guilhermeborgesbastos.com/live-resume/posts/post-06-18-2016.jpg",
"http": "https://www.linkedin.com/pulse/envio-de-e-mail-autenticado-php-guilherme-borges-bastos/",
"date": "06-18-2016",
"internationalizations": [
Expand All @@ -85,7 +85,7 @@
]
},
{
"thumbnail": "./assets/posts/post-06-04-2016.jpg",
"thumbnail": "https://assets.guilhermeborgesbastos.com/live-resume/posts/post-06-04-2016.jpg",
"http": "https://www.linkedin.com/pulse/sharing-android-6-opensource-download-guilherme-borges-bastos/",
"date": "06-04-2016",
"internationalizations": [
Expand All @@ -102,7 +102,7 @@
]
},
{
"thumbnail": "./assets/posts/post-05-28-2016.jpg",
"thumbnail": "https://assets.guilhermeborgesbastos.com/live-resume/posts/post-05-28-2016.jpg",
"http": "https://www.linkedin.com/pulse/capturing-contact-list-android-open-source-en-borges-bastos/",
"date": "05-28-2016",
"internationalizations": [
Expand All @@ -119,7 +119,7 @@
]
},
{
"thumbnail": "./assets/posts/post-05-14-2016.jpg",
"thumbnail": "https://assets.guilhermeborgesbastos.com/live-resume/posts/post-05-14-2016.jpg",
"http": "https://www.linkedin.com/pulse/tinder-slide-card-android-open-source-en-guilherme-borges-bastos/",
"date": "05-14-2016",
"internationalizations": [
Expand All @@ -136,7 +136,7 @@
]
},
{
"thumbnail": "./assets/posts/post-05-21-2016.jpg",
"thumbnail": "https://assets.guilhermeborgesbastos.com/live-resume/posts/post-05-21-2016.jpg",
"http": "https://www.linkedin.com/pulse/push-notification-para-android-totorial-open-source-borges-bastos/",
"date": "05-21-2016",
"internationalizations": [
Expand Down
2 changes: 1 addition & 1 deletion src/assets/favicon/browserconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="https://www.guilhermeborgesbastos.com/en/assets/favicon/mstile-150x150.png"/>
<square150x150logo src="https://assets.guilhermeborgesbastos.com/live-resume/favicon/mstile-150x150.png"/>
<TileColor>#da532c</TileColor>
</tile>
</msapplication>
Expand Down
4 changes: 2 additions & 2 deletions src/assets/favicon/site.webmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"short_name": "Live Resume - GBASTOS",
"icons": [
{
"src": "https://www.guilhermeborgesbastos.com/en/assets/favicon/android-chrome-192x192.png",
"src": "https://assets.guilhermeborgesbastos.com/live-resume/favicon/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "https://www.guilhermeborgesbastos.com/en/assets/favicon/android-chrome-512x512.png",
"src": "https://assets.guilhermeborgesbastos.com/live-resume/favicon/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
Expand Down
24 changes: 12 additions & 12 deletions src/assets/scss/modules/_fonts.scss
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
@font-face {
font-family: 'Montserrat';
src: url('assets/fonts/black/Montserrat-Black.woff2') format('woff2'),
url('assets/fonts/black/Montserrat-Black.woff') format('woff');
src: url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/black/Montserrat-Black.woff2') format('woff2'),
url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/black/Montserrat-Black.woff') format('woff');
font-weight: 900;
font-style: normal;
}

@font-face {
font-family: 'Montserrat';
src: url('assets/fonts/thin/Montserrat-Thin.woff2') format('woff2'),
url('assets/fonts/thin/Montserrat-Thin.woff') format('woff');
src: url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/thin/Montserrat-Thin.woff2') format('woff2'),
url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/thin/Montserrat-Thin.woff') format('woff');
font-weight: 100;
font-style: normal;
}

@font-face {
font-family: 'Montserrat';
src: url('assets/fonts/semi-bold/Montserrat-SemiBold.woff2') format('woff2'),
url('assets/fonts/semi-bold/Montserrat-SemiBold.woff') format('woff');
src: url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/semi-bold/Montserrat-SemiBold.woff2') format('woff2'),
url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/semi-bold/Montserrat-SemiBold.woff') format('woff');
font-weight: 600;
font-style: normal;
}


@font-face {
font-family: 'Montserrat';
src: url('assets/fonts/bold/Montserrat-Bold.woff2') format('woff2'),
url('assets/fonts/bold/Montserrat-Bold.woff') format('woff');
src: url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/bold/Montserrat-Bold.woff2') format('woff2'),
url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/bold/Montserrat-Bold.woff') format('woff');
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: 'Montserrat';
src: url('assets/fonts/regular/Montserrat-Regular.woff2') format('woff2'),
url('assets/fonts/regular/Montserrat-Regular.woff') format('woff');
src: url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/regular/Montserrat-Regular.woff2') format('woff2'),
url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/regular/Montserrat-Regular.woff') format('woff');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Montserrat';
src: url('assets/fonts/italic/Montserrat-Italic.woff2') format('woff2'),
url('assets/fonts/italic/Montserrat-Italic.woff') format('woff');
src: url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/italic/Montserrat-Italic.woff2') format('woff2'),
url('https://assets.guilhermeborgesbastos.com/live-resume/fonts/italic/Montserrat-Italic.woff') format('woff');
font-weight: normal;
font-style: italic;
}
14 changes: 7 additions & 7 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
<meta name="description" content="Hello, I'm a Full-stack Java Web Developer with 10+ years of experience designing web and mobile projects. Find out more in my live-resume!"/>
<!-- Facebook meta properties -->
<meta property="og:title" content="Live Resume - Guilherme Borges Bastos"/>
<meta property="og:image" content="https://www.guilhermeborgesbastos.com/en/assets/og-image.png"/>
<meta property="og:image" content="https://assets.guilhermeborgesbastos.com/live-resume/og-image.png"/>
<meta property="og:type" content="website"/>
<meta property="og:url" content="https://www.guilhermeborgesbastos.com/en/" />
<meta property="og:title" content="Live Resume - Guilherme Borges Bastos" />
<meta property="og:description" content="Hello, I'm a Full-stack Java Web Developer with 10+ years of experience designing web and mobile projects. Find out more in my live-resume!" />
<!-- All the favicon -->
<link rel="icon" type="image/x-icon" href="./assets/favicon/favicon.ico">
<link rel="apple-touch-icon" sizes="180x180" href="./assets/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="./assets/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="./assets/favicon/favicon-16x16.png">
<link rel="manifest" href="./assets/favicon/site.webmanifest">
<link rel="mask-icon" href="./assets/favicon/safari-pinned-tab.svg" color="#5bbad5">
<link rel="icon" type="image/x-icon" href="https://assets.guilhermeborgesbastos.com/live-resume/favicon/favicon.ico">
<link rel="apple-touch-icon" sizes="180x180" href="https://assets.guilhermeborgesbastos.com/live-resume/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="https://assets.guilhermeborgesbastos.com/live-resume/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="https://assets.guilhermeborgesbastos.com/live-resume/favicon/favicon-16x16.png">
<link rel="manifest" href="https://assets.guilhermeborgesbastos.com/live-resume/favicon/site.webmanifest">
<link rel="mask-icon" href="https://assets.guilhermeborgesbastos.com/live-resume/favicon/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">
</head>
Expand Down

0 comments on commit 268e1e7

Please sign in to comment.