From 6648f8d07427999d8174375f4a841629c52a56cf Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Sun, 16 Sep 2018 05:02:16 +0200 Subject: [PATCH] Minor style adjustments --- src/styles/_project.sass | 4 ++-- src/styles/components/_jumbotron.sass | 2 +- src/styles/components/_navbar.sass | 3 --- src/templates/nodes/view_base.pug | 22 ++++++++++------------ src/templates/projects/edit.pug | 2 +- src/templates/projects/edit_layout.pug | 2 +- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/styles/_project.sass b/src/styles/_project.sass index 8ff08ada..644f360a 100644 --- a/src/styles/_project.sass +++ b/src/styles/_project.sass @@ -1775,7 +1775,7 @@ a.learn-more box-shadow: 0 5px 35px rgba(black, .2) color: $color-text-dark-primary position: absolute - top: 0 + top: -$project_header-height left: 0 right: 0 width: 80% @@ -1803,7 +1803,7 @@ a.learn-more &.visible visibility: visible opacity: 1 - top: $project_header-height + top: 0 .overlay-container .title diff --git a/src/styles/components/_jumbotron.sass b/src/styles/components/_jumbotron.sass index 438809f3..7775bb8d 100644 --- a/src/styles/components/_jumbotron.sass +++ b/src/styles/components/_jumbotron.sass @@ -10,7 +10,7 @@ position: relative &:after - background-color: rgba(black, .6) + background-color: rgba(black, .5) bottom: 0 content: '' display: none diff --git a/src/styles/components/_navbar.sass b/src/styles/components/_navbar.sass index b21c57a7..a52df028 100644 --- a/src/styles/components/_navbar.sass +++ b/src/styles/components/_navbar.sass @@ -57,8 +57,6 @@ +position-center-translate .dropdown - min-width: 50px // navbar avatar size - .navbar-item &:hover box-shadow: none // Remove the blue underline usually on navbar, from dropdown items. @@ -195,7 +193,6 @@ $nav-secondary-bar-size: -2px &.nav-see-more color: $primary - font-size: $font-size-xxs i, span +active-gradient diff --git a/src/templates/nodes/view_base.pug b/src/templates/nodes/view_base.pug index 67535f96..63820389 100644 --- a/src/templates/nodes/view_base.pug +++ b/src/templates/nodes/view_base.pug @@ -27,10 +27,10 @@ | {# DETAILS #} - section.node-details-meta.px-4.py-2 + section.node-details-meta.pl-4.pr-2.py-2.border-bottom ul.list-unstyled.m-0 | {% if node.properties.license_type %} - li + li.px-2 a.node-details-license( href="https://creativecommons.org/licenses/", target="_blank", @@ -41,15 +41,15 @@ | {% endif %} | {% if node.has_method('PUT') and (node.properties.status != 'published') %} - li(class="status-{{ node.properties.status }}") + li.px-2(class="status-{{ node.properties.status }}") | {{ node.properties.status | undertitle }} | {% endif %} - li(title="Author") + li.px-2(title="Author") | {{ node.user.full_name }} | {{ node.user.badges.html|safe }} - li( + li.px-2( title="Created {{ node._created }} (updated {{ node._updated | pretty_date_time }})") | {{ node._created | pretty_date }} @@ -60,14 +60,12 @@ | Shared | {% endif %} - - - li.left-side + li.ml-auto | {% if node.file %} - li(title="File size") + li.px-2(title="File size") | {{ node.file.length | filesizeformat }} - li.js-type(title="File format") + li.px-2.js-type(title="File format") | {{ node.file.content_type }} | {% endif %} @@ -95,11 +93,11 @@ | {% endblock node_download %} | {% elif current_user.has_cap('can-renew-subscription') %} - a.btn.btn-success( + a.btn.btn-outline-primary( title="Renew your subscription to download", target="_blank", href="/renew") - i.pi-heart + i.pi-heart.pr-2 | Renew Subscription | {% elif current_user.is_authenticated %} diff --git a/src/templates/projects/edit.pug b/src/templates/projects/edit.pug index 6d6cabb5..032c9590 100644 --- a/src/templates/projects/edit.pug +++ b/src/templates/projects/edit.pug @@ -29,7 +29,7 @@ .container-fluid .row .col-md-12 - h5.pl-2.mb-0 Project Overview + h5.pl-2.mb-0.pt-3 Project Overview #node-edit-container form( diff --git a/src/templates/projects/edit_layout.pug b/src/templates/projects/edit_layout.pug index 41a79517..a2a63229 100644 --- a/src/templates/projects/edit_layout.pug +++ b/src/templates/projects/edit_layout.pug @@ -45,7 +45,7 @@ include ../mixins/components #project_nav #project_nav-container // TODO - make list a macro - #project_tree.edit.bg-white + #project_tree.edit.bg-light +nav-secondary()(class="nav-secondary-vertical") +nav-secondary-link( class="{% if title == 'edit' %}active{% endif %}",