pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1053 from dod-ccpo/fix-sidebar

Browse Source 
Stickybits!
This commit is contained in:
leigh-mil
2019-08-30 18:15:57 -04:00
committed by GitHub
parent c5284fd8f9 4ba1c4d869
commit 104a1d189c
12 changed files with 88 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/components/sticky_cta.html
View File

@@ -1,5 +1,5 @@
{% macro StickyCTA(text) -%}
<div class="sticky-cta" v-sticky="{ stickyTop: 2 }">
<div class="sticky-cta" v-sticky='{ "stickyBitStickyOffset": 76 }'>
<div class="sticky-cta-container">
<div class="sticky-cta-text">
<h3>{{ text }}</h3>

56
templates/navigation/global_sidenav.html
View File

@@ -2,33 +2,37 @@
{% from "components/sidenav_item.html" import SidenavItem %}
<div v-cloak is="SidenavToggler" class="sidenav-container">
<div v-cloak is="SidenavToggler" class="global-navigation">
<template slot-scope='props'>
<div v-bind:class="{'global-navigation': true, 'sidenav': props.isVisible, 'sidenav--minimized': !props.isVisible}">
<a href="#" v-on:click="props.toggle" class="sidenav__toggle">
<template v-if="props.isVisible">
{{ Icon('angle-double-left-solid', classes="toggle-arrows icon--blue") }}
Hide
</template>
<template v-else>
Show
{{ Icon('angle-double-right-solid', classes="toggle-arrows icon--blue") }}
</template>
</a>
<div v-if="props.isVisible">
<div class="sidenav__title">Portfolios</div>
<ul class="sidenav__list--padded">
{% if portfolios %}
{% for other_portfolio in portfolios|sort(attribute='name') %}
{{ SidenavItem(other_portfolio.name,
href=url_for("applications.portfolio_applications", portfolio_id=other_portfolio.id),
active=(other_portfolio.id | string) == request.view_args.get('portfolio_id')
) }}
{% endfor %}
{% else %}
<li><span class="sidenav__text">You have no portfolios yet</span></li>
{% endif %}
</ul>
<div v-bind:class="{'sidenav-container': props.isVisible, 'sidenav-container--minimized': !props.isVisible}">
<div class="sidenav-container__fixed">
<div v-bind:class="{'sidenav': props.isVisible, 'sidenav--minimized': !props.isVisible}">
<a href="#" v-on:click="props.toggle" class="sidenav__toggle">
<template v-if="props.isVisible">
{{ Icon('angle-double-left-solid', classes="toggle-arrows icon--blue") }}
Hide
</template>
<template v-else>
Show
{{ Icon('angle-double-right-solid', classes="toggle-arrows icon--blue") }}
</template>
</a>
<div v-if="props.isVisible">
<div class="sidenav__title">Portfolios</div>
<ul class="sidenav__list--padded">
{% if portfolios %}
{% for other_portfolio in portfolios|sort(attribute='name') %}
{{ SidenavItem(other_portfolio.name,
href=url_for("applications.portfolio_applications", portfolio_id=other_portfolio.id),
active=(other_portfolio.id | string) == request.view_args.get('portfolio_id')
) }}
{% endfor %}
{% else %}
<li><span class="sidenav__text">You have no portfolios yet</span></li>
{% endif %}
</ul>
</div>
</div>
</div>
</div>
</template>

6
templates/portfolios/header.html
View File

@@ -15,12 +15,6 @@
<div class='portfolio-header__name'>
<h1>{{ portfolio.name }}</h1>
</div>
<div class='row'>
<div class='column-left'></div>
<div class='column-right portfolio-funding__header--funded-through {{ "funded" if funding_end_date is not none and funded else "unfunded"}}'>
</div>
</div>
</div>
<div class='row links'>
{% if user_can(permissions.VIEW_PORTFOLIO_FUNDING) %}