Refresh and update styles

This commit is contained in:
Maruan Al-Shedivat 2017-01-31 10:05:44 -05:00
parent 36e32cc92a
commit 20e8a83fcd
17 changed files with 108 additions and 79 deletions

View File

@ -6,6 +6,7 @@ name: Your Name
email: you@example.com email: you@example.com
description: > # this means to ignore newlines until "url:" description: > # this means to ignore newlines until "url:"
A simple, whitespace theme for academics. Based on [*folio](https://github.com/bogoli/-folio) design. A simple, whitespace theme for academics. Based on [*folio](https://github.com/bogoli/-folio) design.
last_updated:
url: # the base hostname & protocol for your site url: # the base hostname & protocol for your site
baseurl: /al-folio # the subpath of your site, e.g. /blog/ baseurl: /al-folio # the subpath of your site, e.g. /blog/
@ -42,6 +43,9 @@ collections:
output: true output: true
permalink: /poetry/:path/ permalink: /poetry/:path/
# Collection settings
news_limit: 5
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Jekyll settings # Jekyll settings
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -91,6 +95,5 @@ scholar:
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Other advanced settings (don't touch if you are not sure) # Other advanced settings (don't touch if you are not sure)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
fontawesome_version: "4.6.3"
jquery_version: "1.12.4" jquery_version: "1.12.4"
katex_version: "0.6.0" katex_version: "0.7.0"

View File

@ -3,7 +3,11 @@
<div class="wrapper"> <div class="wrapper">
<p class="small"> <p class="small">
© Copyright {{ site.time | date: '%Y' }} {{ site.name }}. © Copyright {{ site.time | date: '%Y' }} {{ site.name }}.
{{ site.footer_text }}</p> {{ site.footer_text }}
{% if site.last_updated %}
Last updated: {{ site.last_updated }}.
{% endif %}
</p>
</div> </div>
</footer> </footer>

View File

@ -6,6 +6,8 @@
<title>{{ site.name }}{% if page.title and page.url != "/" %} | {{ page.title }}{% endif %}</title> <title>{{ site.name }}{% if page.title and page.url != "/" %} | {{ page.title }}{% endif %}</title>
<meta name="description" content="{{ site.description }}"> <meta name="description" content="{{ site.description }}">
<link rel="shortcut icon" href="{{ '/assets/img/favicon.ico' | prepend: site.baseurl | prepend: site.url }}">
<link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl | prepend: site.url }}"> <link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl | prepend: site.url }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}"> <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
</head> </head>

View File

@ -2,6 +2,13 @@
<div class="wrapper"> <div class="wrapper">
{% if page.layout != "about" %}
<span class="site-title">
{% assign name = site.name | split: ' ' %}
<strong>{{ name | first }}</strong> {{ name | last }}
</span>
{% endif %}
<nav class="site-nav"> <nav class="site-nav">
<div class="trigger"> <div class="trigger">
@ -18,6 +25,9 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<!-- CV link -->
<a class="page-link" href="{{ '/assets/pdf/CV.pdf' | prepend: site.baseurl | prepend: site.url }}">vitae</a>
</div> </div>
</nav> </nav>

View File

@ -12,3 +12,14 @@
<!-- Include custom icon fonts --> <!-- Include custom icon fonts -->
<link rel="stylesheet" href="{{ '/assets/css/font-awesome.min.css' | prepend: site.baseurl | prepend: site.url }}"> <link rel="stylesheet" href="{{ '/assets/css/font-awesome.min.css' | prepend: site.baseurl | prepend: site.url }}">
<link rel="stylesheet" href="{{ '/assets/css/academicons.min.css' | prepend: site.baseurl | prepend: site.url }}"> <link rel="stylesheet" href="{{ '/assets/css/academicons.min.css' | prepend: site.baseurl | prepend: site.url }}">
<!-- Google Analytics -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-XXXXXXXX-X', 'auto');
ga('send', 'pageview');
</script>

View File

@ -2,7 +2,8 @@
<h2>news</h2> <h2>news</h2>
{% if site.news %} {% if site.news %}
<table> <table>
{% for item in site.news reversed %} {% assign news = site.news | reverse %}
{% for item in news limit: site.news_limit %}
<tr> <tr>
<td class="date">{{ item.date | date: "%b %-d, %Y" }}</td> <td class="date">{{ item.date | date: "%b %-d, %Y" }}</td>
<td class="announcement"> <td class="announcement">

View File

@ -2,7 +2,11 @@
--- ---
{% if entry.abbr %} {% if entry.abbr %}
{% if site.data.venues[entry.abbr] %}
<abbr>[<a href="{{site.data.venues[entry.abbr].url}}" target="_blank">{{entry.abbr}}</a>]</abbr>
{% else %}
<abbr>[{{entry.abbr}}]</abbr> <abbr>[{{entry.abbr}}]</abbr>
{% endif %}
{% endif %} {% endif %}
<div id="{{entry.key}}"> <div id="{{entry.key}}">
@ -23,7 +27,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% else %} {% else %}
{% if entry.author_array.length > 1 %} and {% endif %} and
{% if author.last == site.scholar.last_name %} {% if author.last == site.scholar.last_name %}
<em>{{author.last}}, {{author.first}}</em> <em>{{author.last}}, {{author.first}}</em>
{% else %} {% else %}
@ -37,7 +41,6 @@
{% endfor %} {% endfor %}
</span> </span>
{% if entry.type != "book" %}
<span class="periodical"> <span class="periodical">
{% if entry.type == "article" %} {% if entry.type == "article" %}
<em>{{entry.journal}}</em> <em>{{entry.journal}}</em>
@ -50,22 +53,13 @@
</span> </span>
{% endif %} {% endif %}
{% if entry.type == "book" %}
<span class="publisher">
{% if entry.publisher %}
<em>{{entry.publisher}}</em>
{% endif %}
{% if entry.year %}
{{entry.year}}
{% endif %}
</span>
{% endif %}
{% endif %}
<span class="links"> <span class="links">
{% if entry.abstract %} {% if entry.abstract %}
[<a class="abstract">Abs</a>] [<a class="abstract">Abs</a>]
{% endif %} {% endif %}
{% if entry.arxiv %}
[<a href="http://arxiv.org/abs/{{ entry.arxiv }}" target="_blank">arXiv</a>]
{% endif %}
{% if entry.html %} {% if entry.html %}
[<a href="{{ entry.html }}" target="_blank">HTML</a>] [<a href="{{ entry.html }}" target="_blank">HTML</a>]
{% endif %} {% endif %}

View File

@ -1,7 +1,7 @@
--- ---
layout: about layout: about
permalink: / permalink: /
title: your name title: <strong>Your</strong> Name
description: <a href="">Affiliations</a>. Address. Contacts. Moto. Etc. description: <a href="">Affiliations</a>. Address. Contacts. Moto. Etc.
profile: profile:

View File

@ -74,10 +74,9 @@ ul, ol, dl, figure,
hr { hr {
/* Inset, by Dan Eden */ /* Inset, by Dan Eden */
border: 0; border: 0;
height: 0;
border-top: 1px solid rgba(0, 0, 0, 0.1); border-top: 1px solid rgba(0, 0, 0, 0.1);
border-bottom: 1px solid rgba(255, 255, 255, 0.3); border-bottom: 1px solid rgba(255, 255, 255, 0.3);
height: 0;
margin: 20px 0;
} }

View File

@ -5,7 +5,7 @@
.site-header { .site-header {
border-bottom: 1px solid $grey-color-light; border-bottom: 1px solid $grey-color-light;
background-color: #fff; background-color: #fff;
opacity: 0.75; opacity: 0.95;
position:fixed; position:fixed;
left:0px; left:0px;
top:0px; top:0px;
@ -19,10 +19,6 @@
line-height: $nav-height; line-height: $nav-height;
letter-spacing: -1px; letter-spacing: -1px;
margin-bottom: 0; margin-bottom: 0;
&:hover {
text-decoration: none;
color: $theme-color;
}
} }
.site-nav { .site-nav {
float: right; float: right;
@ -100,11 +96,14 @@
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 100%;
.date { width: 20%; } .date { width: 19%; }
.announcement { width: 80%; } .announcement { width: 81%; }
tr { text-align: left; } tr { text-align: left; }
td { padding: 5px 0;} td {
padding: 5px 0;
vertical-align: top;
}
} }
} }
@ -230,20 +229,23 @@
.publications { .publications {
h2 { h2 {
color: $theme-color; color: $theme-color;
// border-bottom: 1px solid $theme-color;
// border-top: 1px solid $theme-color;
font-size: 32px; font-size: 32px;
margin: 40px 0; margin-bottom: 30px;
// padding: 20px 0;
text-align: center; text-align: center;
} }
} }
.year { .year {
border-bottom: 1px solid $grey-color-light; border-top: 1px solid $grey-color-light;
color: $grey-color-light; color: $grey-color-light;
margin: 0 -2.5em 40px -2em; margin: 0 -3em -2.5ex -2em;
padding-bottom: 5px; padding-top: 1ex;
text-align: right; text-align: right;
} }
.bibliography { .bibliography {
margin-bottom: 20px; margin-bottom: 50px;
margin-top: 20px; margin-top: 20px;
list-style-type: circle; list-style-type: circle;
@ -261,7 +263,10 @@
text-decoration: none; text-decoration: none;
} }
} }
> em { border-bottom: 1px solid; } > em {
border-bottom: 1px solid;
font-style: normal;
}
} }
a.abstract, a.bibtex { cursor: pointer; } a.abstract, a.bibtex { cursor: pointer; }
.hidden { .hidden {
@ -313,33 +318,33 @@
/***************************************************************************** /*****************************************************************************
* Projects * Projects
*****************************************************************************/ *****************************************************************************/
.project { .project {
box-sizing: border-box; box-sizing: border-box;
float: left; float: left;
height: 250px; height: 250px;
padding: 10px; padding: 10px;
vertical-align: middle; vertical-align: middle;
width: 33.33%; width: 33.33%;
} }
.thumbnail { .thumbnail {
overflow: hidden; overflow: hidden;
height: 230px; height: 230px;
width: 100%; width: 100%;
} }
.thumbnail img{ .thumbnail img{
height: auto; height: auto;
position: relative; position: relative;
left: -25%; left: -25%;
top: -5%; top: -5%;
width: 500px; width: 500px;
} }
.thumbnail a{ .thumbnail a{
float: left; float: left;
height: 230px; height: 230px;
position: relative; position: relative;
width: 100%; width: 100%;
} }
.thumbnail a span { .thumbnail a span {
display: none; display: none;
position: absolute; position: absolute;
top: 0; top: 0;
@ -350,10 +355,10 @@
color: $grey-color-light; color: $grey-color-light;
padding: 40px; padding: 40px;
text-align: center; text-align: center;
} }
.thumbnail a:hover span { .thumbnail a:hover span {
display: block; display: block;
} }
/** Poem formatting ********************************************/ /** Poem formatting ********************************************/
.poem-title { .poem-title {

0
assets/css/academicons.min.css vendored Executable file → Normal file
View File

0
assets/css/font-awesome.min.css vendored Executable file → Normal file
View File

0
assets/css/main.scss Executable file → Normal file
View File

0
assets/fonts/academicons.eot Executable file → Normal file
View File

0
assets/fonts/academicons.svg Executable file → Normal file
View File

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 110 KiB

0
assets/fonts/academicons.ttf Executable file → Normal file
View File

0
assets/fonts/academicons.woff Executable file → Normal file
View File