diff --git a/_data/homepage_categories.yaml b/_data/homepage_categories.yaml index 3951a7b..a6c9425 100644 --- a/_data/homepage_categories.yaml +++ b/_data/homepage_categories.yaml @@ -1,7 +1,14 @@ --- -- phekingnews -- editorial -- coverstory +featured_articles: - bigstory -- verbatim +- editorial - almostfamous +- phekingnews +- verbatim +- tech + +new_articles: +- academics +- sac +- career +- cultural diff --git a/_includes/header.html b/_includes/header.html index 0e5eb68..583adbe 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,4 +1,4 @@ -{% assign post = site.posts.first %} +{% assign post = site.categories['coverstory'].first %} {% if page.is_post == true %} {% assign post = page %} {% endif %} diff --git a/_includes/navbar.html b/_includes/navbar.html index 41e8feb..0228ec4 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -19,17 +19,17 @@ {% for cat in site.data.categories %} {% if cat.subcategories != nil %}
  • - {{ cat.name | uppercase }} + {{ cat.name | uppercase }}
    • {% elsif site.categories[cat.name] != nil%} -
  • {{ cat.name | uppercase }}
    • +
  • {{ cat.name | uppercase }}
    • {% endif %} {% endfor %} diff --git a/about/index.html b/about/index.html index 9a4580f..b17028e 100644 --- a/about/index.html +++ b/about/index.html @@ -2,7 +2,7 @@ layout: layout --- - diff --git a/css/base.scss b/css/base.scss index e6c0bc4..f61cd19 100644 --- a/css/base.scss +++ b/css/base.scss @@ -6,7 +6,7 @@ $font-color: #2b2b2b; $navbar-default-link-color: white; $navbar-default-link-active-color: darken($navbar-default-link-color, 25%); -$navbar-default-link-hover-color: darken($navbar-default-link-color, 35%); +$navbar-default-link-hover-color: $navbar-default-link-color; $home-header-bg-color: #333; $new-article-img-height: 150px; $new-article-img-width: 225px; @@ -186,6 +186,10 @@ body { box-shadow: 0 100px 125px -100px; } + &.about-header { + height: 200px; + } + .cover { z-index: 10; color: white; @@ -255,6 +259,20 @@ body { #new-articles, #related-articles { z-index: 10; + .article:hover { + + .img-container { + width: $new-article-img-width * 1.1; + height: $new-article-img-height * 1.1; + } + + } + + .cover-container-container { + width: $new-article-img-width * 1.1; + height: $new-article-img-height * 1.1; + } + .img-container { width: $new-article-img-width; height: $new-article-img-height; @@ -262,6 +280,13 @@ body { box-shadow: 0 0 15px 0 rgba(0,0,0, 0.5); } + .details:hover ~ .cover-container-container { + & > .img-container { + width: $new-article-img-width * 1.1; + height: $new-article-img-height * 1.1; + } + } + .details { margin: 10 auto; font-weight: bold; @@ -270,6 +295,7 @@ body { color: $new-article-title-color; text-transform: capitalize; font-size: 20px; + margin-top: 10px; } .tag { @@ -285,6 +311,7 @@ body { // ========== FEATURED-ARTICLE =========== // #featured-articles-container { background: $featured-articles-bg-color; + padding-top: 3em; } #featured-articles-title { @@ -328,6 +355,7 @@ body { background: $featured-articles-bg-color; width: 0.9 * $article-cover-img-width; ; height: 120px; + padding-bottom: .5em; .tag { position: absolute; @@ -342,8 +370,9 @@ body { } .title { - + font-size: 1.85em; } + &:before { content: " "; display: table; @@ -446,11 +475,35 @@ a { @include transition(all, 0.2s, ease-in); &:hover{ - color: #2c45cc; - border-bottom: 1px solid #2c45cc; + color: darken($font-color, 10%); text-decoration: none; @include transition(all, 0.2s, ease-in); } + + &.hover-underline { + position: relative; + + &:before { + content: " "; + position: absolute; + width: 100%; + height: 2px; + bottom: 0; + left: 0; + background-color: #fff; + visibility: hidden; + -webkit-transform: scaleX(0); + transform: scaleX(0); + -webkit-transition: all 0.3s ease-in-out 0s; + transition: all 0.3s ease-in-out 0s; + } + + &:hover:before { + visibility: visible; + -webkit-transform: scaleX(1); + transform: scaleX(1); + } + } } blockquote { @@ -583,4 +636,7 @@ footer { h4 { line-height:125%; } + + padding: 2em 3em; + font-size: 1.2em; } diff --git a/index.html b/index.html index a813abe..3d32025 100644 --- a/index.html +++ b/index.html @@ -7,18 +7,25 @@ title: "Home"
    - {% for post in site.posts limit: 4 offset: 1 %} -
    - -
    - + {% for cat in site.data.homepage_categories.new_articles %} + {% for post in site.categories[cat] %} + {% if post.image != null %} +
    + +
    +
    + +
    +
    +
    +

    {{ post.title }}

    +

    {{ post.category }}

    +
    +
    -
    -

    {{ post.title | truncatewords: 4}}

    -

    {{ post.category }}

    -
    - -
    + {% break %} + {% endif %} + {% endfor %} {% endfor %}
    @@ -26,8 +33,7 @@ title: "Home"
    -

    Featured Articles

    - {% for cat in site.data.homepage_categories %} + {% for cat in site.data.homepage_categories.featured_articles %} {% for post in site.categories[cat] %} {% if post.image != null %}
    @@ -39,7 +45,7 @@ title: "Home"
    {{ post.category }} -

    {{ post.title | truncatewords: 4}}

    +

    {{ post.title }}

    {% if post.excerpt != null %}{{ post.excerpt | markdownify | truncate: 75 }}{% endif %}

    @@ -73,7 +79,7 @@ title: "Home"
    - +