diff --git a/src/styles/_cards.sass b/src/styles/_cards.sass index a0410ce..72c88ac 100644 --- a/src/styles/_cards.sass +++ b/src/styles/_cards.sass @@ -14,7 +14,7 @@ height: 160px max-height: 160px min-height: 160px - margin: 5px auto 0 + margin: 0 auto overflow: hidden width: 100% +media-breakpoint-up(sm) diff --git a/src/styles/_jumbotron.sass b/src/styles/_jumbotron.sass index 788986c..d2ee337 100644 --- a/src/styles/_jumbotron.sass +++ b/src/styles/_jumbotron.sass @@ -20,7 +20,7 @@ color: white font-weight: 400 font-size: 48px - margin-bottom: 0 + margin: 0 text-shadow: 0 2px 2px rgba(0, 0, 0, 0.30) .lead max-width: 722px diff --git a/src/styles/_navbar.sass b/src/styles/_navbar.sass index 8d02491..41ea385 100644 --- a/src/styles/_navbar.sass +++ b/src/styles/_navbar.sass @@ -1,18 +1,20 @@ -.navbar +nav.navbar background: #fff height: auto min-height: 48px - padding: .1rem 1rem + padding: 2px 20px +media-breakpoint-up(md) box-shadow: 0 2px 2px -2px rgba(0,0,0,.15) height: 56px - padding: .5rem 1rem + padding: 10px 5px 10px 20px &.sticky-top +media-breakpoint-down(sm) position: static .logo display: flex justify-content: center + .navbar-brand + padding: .3125rem 0 .navbar-toggler padding: 0 border-radius: 0 @@ -21,17 +23,26 @@ margin-top: 15px +media-breakpoint-up(md) margin: 0 + li + line-height: 2.5 + .special + top: 10px + left: 35px .nav-item .nav-link font-size: 18px color: $dark - padding: 3vh 8px 3vh 34px + // padding: 3vh 8px 3vh 34px + padding: 10px +media-breakpoint-up(lg) padding: 6px 18px &:hover color: $muted .navbar-toggler border: 0 + display: block outline: none + +media-breakpoint-up(md) + display: none span width: 20px height: 2px @@ -48,12 +59,39 @@ display:none !important &.show padding-bottom: 75vh + .search-icon + display: flex + align-items: center + justify-content: center + padding: 0 8px + +media-breakpoint-up(lg) + padding: 0 16px + .pi-search + &::before + color: rgba(17,17,17,0.75) + font-size: 16px + .nav-notifications + display: flex + align-items: center + justify-content: center + padding: 0 8px + +media-breakpoint-up(lg) + padding: 0 16px + .navbar-item + height: auto + padding: 0 + .nav-notifications-icon + color: rgba(17,17,17,0.75) .gravatar width: 32px border-radius: 50% #userDropdown .nav-link - padding-top: 4px; - padding-bottom: 0; - padding-right: 0; - outline: none; \ No newline at end of file + padding-top: 4px + padding-bottom: 0 + padding-right: 0 + outline: none +.navbar+.page-content + padding-top: 0 +.container-page + background: #fff \ No newline at end of file diff --git a/src/styles/_typography.sass b/src/styles/_typography.sass index 276c1f8..adae317 100644 --- a/src/styles/_typography.sass +++ b/src/styles/_typography.sass @@ -5,6 +5,9 @@ body font-family: 'Source Sans Pro', sans-serif -webkit-font-smoothing: antialiased -moz-osx-font-smoothing: grayscale + color: #212529 +h1, h2, h3, h4, h5 + font-family: 'Source Sans Pro', sans-serif h1 font-size: 48px line-height: 57px @@ -16,6 +19,7 @@ h3 line-height: 38px h4 font-size 21px + font-weight: 500 line-height: 34px h5 font-size: 15px diff --git a/src/templates/homepage.pug b/src/templates/homepage.pug index e9f7274..20f2613 100644 --- a/src/templates/homepage.pug +++ b/src/templates/homepage.pug @@ -17,6 +17,11 @@ meta(name="twitter:description", content="Blender Cloud is a web based service d meta(property="og:image", content="{% if main_project.picture_header %}{{ main_project.picture_header.thumbnail('l', api=api) }}{% else %}{{ url_for('static', filename='assets/img/backgrounds/background_agent327_04.jpg')}}{% endif %}") meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_project.picture_header.thumbnail('l', api=api) }}{% else %}{{ url_for('static', filename='assets/img/backgrounds/background_agent327_04.jpg')}}{% endif %}") | {% endblock %} +| {% block css %} +| {{ super() }} +link(href="{{ url_for('static_cloud', filename='assets/css/projects-index-collection.css') }}", rel="stylesheet") +| {% endblock css %} + | {% block body %} .dashboard-container diff --git a/src/templates/layout.pug b/src/templates/layout.pug index 6ddb46a..5762399 100644 --- a/src/templates/layout.pug +++ b/src/templates/layout.pug @@ -137,8 +137,9 @@ html(lang="en") a.nav-link(href="{{ url_for('cloud.services') }}", class="{% if category == 'services' %}active{% endif %}") Services - //- li.nav-item - //- i.search-icon.pi-search + li.nav-item.search-icon + a.navbar-item + i.pi-search | {% endblock navigation_sections %} | {% if current_user.is_anonymous %} @@ -149,8 +150,8 @@ html(lang="en") | {% endif %} | {% block navigation_user %} - //- | {% include 'menus/notifications.html' %} - //- | {% include 'menus/user.html' %} + | {% include 'menus/notifications.html' %} + | {% include 'menus/user.html' %} | {% endblock navigation_user %} diff --git a/src/templates/projects/landing.pug b/src/templates/projects/landing.pug index 367b5e9..96a0874 100644 --- a/src/templates/projects/landing.pug +++ b/src/templates/projects/landing.pug @@ -107,7 +107,7 @@ header li.nav-item a.nav-link(href="#", class="{% if title == 'team' %}active{% endif %}") Team li.nav-item - a.nav-link(href="#", class="{% if title == 'gallery' %}active{% endif %}") Gallery + a.nav-link(href="/projects/gallery.html", class="{% if title == 'gallery' %}active{% endif %}") Gallery li.nav-item a.nav-link(href="#", class="{% if title == 'assets' %}active{% endif %}") Assets li.nav-item diff --git a/src/templates/projects_index_collection.pug b/src/templates/projects_index_collection.pug index 25e9394..ad9a681 100644 --- a/src/templates/projects_index_collection.pug +++ b/src/templates/projects_index_collection.pug @@ -34,6 +34,7 @@ meta(property="og:image", content="{{ page_header_image }}") meta(name="twitter:image", content="{{ page_header_image }}") | {% endblock %} | {% block css %} +| {{ super() }} link(href="{{ url_for('static_cloud', filename='assets/css/projects-index-collection.css') }}", rel="stylesheet") | {% endblock css %}