Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update default.html #317

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,15 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.8.0)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.16.2)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.13.8-x86_64-linux)
racc (~> 1.4)
octokit (4.25.1)
Expand Down Expand Up @@ -252,6 +256,7 @@ GEM
zeitwerk (2.6.0)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
Expand Down
24 changes: 13 additions & 11 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,24 @@
<!DOCTYPE html>
<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->
<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->
<!--[if !IE]><!--> <html lang="en"> <!--<![endif]-->
{% include head.html %}
<!--[if !IE]><!-->
<html lang="en">
<!--<![endif]-->
{% include head.html %}

<body>
<div class="wrapper">
{% include sidebar.html %}
<body>
<div class="wrapper">
{% include sidebar.html %}

<div class="main-wrapper">
<div class="main-wrapper">
{{ content }}
</div>

</div>
</div>

{% include footer.html %}
{% include footer.html %}

{% include scripts.html %}
</body>
{% include scripts.html %}
</body>

</html>

42 changes: 40 additions & 2 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ h6 {

a {
color: darken($theme-color, 15%);

&:hover {
text-decoration: underline;
color: darken($theme-color, 30%);
}

&:focus {
text-decoration: none;
}
Expand All @@ -45,32 +47,37 @@ p {

.sidebar-wrapper {
grid-column: span 3;
order: 2;
order: 0;
background: $theme-color;
color: #fff;

a {
color: #fff;
}

.profile-container {
padding: 30px;
//background: darken($theme-color, 10%);
background: rgba(0, 0, 0, 0.2);
text-align: center;
color: #fff;
}

.name {
font-size: 32px;
font-weight: 900;
margin-top: 0;
margin-bottom: 10px;
}

.tagline {
color: rgba(256, 256, 256, 0.6);
font-size: 16px;
font-weight: 400;
margin-top: 0;
margin-bottom: 0;
}

.profile {
margin-bottom: 15px;
}
Expand All @@ -83,55 +90,67 @@ p {
border-radius: 100%;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
}

.contact-list {

.fas,
.fab,
.far {
margin-right: 5px;
font-size: 18px;
vertical-align: middle;
}

li {
margin-bottom: 15px;

&:last-child {
margin-bottom: 0;
}
}
}

.container-block {
padding: 30px;
}

.container-block-title {
text-transform: uppercase;
font-size: 16px;
font-weight: 700;
margin-top: 0;
margin-bottom: 15px;
}

.degree {
font-size: 14px;
margin-top: 0;
margin-bottom: 5px;
}

.education-container {
.item {
margin-bottom: 15px;

&:last-child {
margin-bottom: 0;
}
}

.meta {
color: rgba(256, 256, 256, 0.6);
font-weight: 500;
margin-bottom: 0px;
margin-top: 0;
}

.time {
color: rgba(256, 256, 256, 0.6);
font-weight: 500;
margin-bottom: 0px;
}
}

.languages-container {
.lang-desc {
color: rgba(256, 256, 256, 0.6);
Expand All @@ -140,8 +159,10 @@ p {

.languages-list {
margin-bottom: 0;

li {
margin-bottom: 10px;

&:last-child {
margin-bottom: 0;
}
Expand All @@ -150,8 +171,10 @@ p {

.interests-list {
margin-bottom: 0;

li {
margin-bottom: 10px;

&:last-child {
margin-bottom: 0;
}
Expand All @@ -163,6 +186,7 @@ p {
grid-column: span 7;
background: #fff;
padding: 60px;

.section-title {
text-transform: uppercase;
font-size: 20px;
Expand All @@ -172,6 +196,7 @@ p {
margin-top: 0;
margin-bottom: 20px;
}

.section {
margin-bottom: 60px;
}
Expand All @@ -182,11 +207,13 @@ p {
margin-bottom: 30px;
}
}

.upper-row {
position: relative;
overflow: hidden;
margin-bottom: 2px;
}

.job-title,
.degree {
color: $text-color;
Expand All @@ -195,12 +222,14 @@ p {
margin-bottom: 0;
font-weight: 500;
}

.time {
position: absolute;
right: 0;
top: 0;
color: $text-grey;
}

.company,
.university {
margin-bottom: 10px;
Expand All @@ -214,10 +243,12 @@ p {
margin-bottom: 5px;
color: darken($theme-color, 15%);
}

.projects-section {
.intro {
margin-bottom: 30px;
}

.item {
margin-bottom: 15px;
}
Expand All @@ -229,15 +260,18 @@ p {
color: $text-color;
margin-bottom: 1px;
}

.publication-authors {
font-style: italic;
color: $text-grey;
margin-bottom: 1px;
}

.publications-section {
.intro {
margin-bottom: 30px;
}

.item {
margin-bottom: 15px;
}
Expand All @@ -249,15 +283,18 @@ p {
margin-bottom: 15px;
overflow: hidden;
}

.level-title {
font-size: 14px;
margin-top: 0;
margin-bottom: 12px;
}

.level-bar {
height: 12px;
background: $smoky-white;
}

.level-bar-inner {
height: 12px;
background: lighten($theme-color, 15%);
Expand All @@ -266,6 +303,7 @@ p {

.footer {
padding-top: 30px;

.copyright {
line-height: 1.6;
color: $text-color-secondary;
Expand All @@ -275,4 +313,4 @@ p {
.fa-heart {
color: $heart;
}
}
}