Skip to content

Commit 27ba8bc

Browse files
CodeRodeoCodeRodeo
committed
services page beta and cleanup
1 parent 2ed8cbc commit 27ba8bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+4969
-79
lines changed

‎_includes/nav.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@
1313
<button href="#" class="d-flex btn btn-sm secondary p2pu-btn orange">Create an Account</button>
1414
</div>
1515
</nav>
16-
<!--button href="#" class="d-flex btn btn-sm secondary p2pu-btn dark" id="nav-account"></button> TODO: PULLS IN LOGIN LINK, ETC. - do we ditch this or modify it somewhere?) -->
17-
<nav id="account-info" class="order-2 order-md-4 m3-0 ms-auto">
16+
17+
<!--nav id="account-info" class="order-2 order-md-4 m3-0 ms-auto">
1818
<div class="dropdown nav-item">
1919
<a href="#" class="nav-link d-flex align-items-center mb-2 mb-md-0 link-dark text-decoration-none dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
2020
<span class="material-icons">account_circle</span>
2121
</a>
2222
<ul class="dropdown-menu" aria-labelledby="dropdownNavLink" style="">
23-
<li><a class="dropdown-item active" href="#" aria-current="page">Overview</a></li> <!-- TODO: automagically get active classes? -->
23+
<li><a class="dropdown-item" href="#" aria-current="page">Overview</a></li>
2424
<li><a class="dropdown-item" href="#">Inventory</a></li>
2525
<li><a class="dropdown-item" href="#">Customers</a></li>
2626
<li><a class="dropdown-item" href="#">Products</a></li>
2727
<li><a class="dropdown-item" href="#">Reports</a></li>
2828
<li><a class="dropdown-item" href="#">Analytics</a></li>
2929
</ul>
3030
</div>
31-
</nav>
31+
</nav-->
3232

3333

3434
<nav id="log-in" class="order-2 order-md-4 me-0 dropdown">

‎_includes/scripts.html

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
66
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous"></script>
77

8+
<script src="{{site.baseurl}}/assets/js/fade-in-scroll.js"></script>
9+
810
<script src="{{site.data.bundles['common']['js']}}"></script>
911
<script src="{{site.data.bundles['p2pu-theme']['js']}}"></script>
1012
<script src="{{site.data.bundles['navbar']['js']}}"></script>

‎_layouts/team.html

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
layout: base
33
extra_css:
44
- /assets/css/p2pu-team.css
5-
- /assets/css/p2pu-search.css
65
- /assets/css/vendor/slick.css
76
- /assets/css/vendor/slick-theme.css
87
extra_js:

‎_sass/_common.scss

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
//for fade-in-scroll.js
3+
4+
section.landing, header.page-header, main > section{
5+
opacity: 0;
6+
}

‎_sass/_dev.scss

-12
This file was deleted.

‎_sass/_help.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import "cards/_generic-card";
2+
@import "layout-elements/contact-form.scss";
23

34
#about{
45
.header-wrap{

‎_sass/_index.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,17 @@
102102
}
103103

104104
section.community{
105-
@media (min-width: map-get($grid-breakpoints, "md")) {
106-
.col-md-5{
105+
@media (min-width: map-get($grid-breakpoints, "lg")) {
106+
.col-lg-5{
107107
position: absolute;
108108
right: 0;
109109
}
110110
}
111111
}
112112

113113
section.team {
114-
@media (min-width: map-get($grid-breakpoints, "md")) {
115-
.col-md-5{
114+
@media (min-width: map-get($grid-breakpoints, "lg")) {
115+
.col-lg-5{
116116
position: absolute;
117117
left: 0;
118118
}

‎_sass/_services.scss

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@import "layout-elements/contact-form.scss";
2+
3+
#services{
4+
section.content{
5+
@media (min-width: map-get($grid-breakpoints, "lg")) {
6+
.col-lg-5{
7+
position: absolute;
8+
left: 0;
9+
}
10+
}
11+
>.container{
12+
padding-bottom: $padding-lg;
13+
}
14+
}
15+
}

‎_sass/layout-elements/_contact-form.scss

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ section.contact{
66
.container{
77
.contact-form{
88
background-color: transparent;
9+
@media (max-width: map-get($grid-breakpoints, "md")) {
10+
box-shadow: none !important;
11+
}
912
@media (min-width: map-get($grid-breakpoints, "md")) {
1013
background-color: $p2pu-light-blue;
1114
}

‎assets/css/p2pu-custom.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
---
33

44
@import "p2pu-theme/src/scss/base";
5-
@import "dev"; //TODO: just for showing logged in styles - kill this before go live
6-
5+
@import "common";

‎assets/css/p2pu-help.scss

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
---
33

44
@import "p2pu-theme/src/scss/_variables";
5-
@import "layout-elements/contact-form.scss";
65
@import "help";
76

‎assets/css/p2pu-services.scss

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
---
3+
4+
@import "p2pu-theme/src/scss/_variables";
5+
@import "services";
6+

‎assets/images/dev/370x293.jpeg

3.58 KB
Loading

‎assets/js/fade-in-scroll.js

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/* js/fade-in-scroll.js */
2+
3+
//$(document).ready(function() {
4+
$(window).on('load', function(){
5+
6+
$('main > section, header.page-header').each( function(i){
7+
8+
var bottom_of_object = $(this).position().top + $(this).outerHeight();
9+
var top_of_object = $(this).position().top + 10;
10+
var bottom_of_window = $(window).scrollTop() + $(window).height();
11+
12+
/* If the object is completely visible in the window, fade it in */
13+
if( bottom_of_window > top_of_object ){
14+
15+
$(this).animate({'opacity':'1'},250);
16+
17+
}
18+
19+
});
20+
21+
/* Every time the window is scrolled ... */
22+
$(window).scroll( function(){
23+
24+
/* Check the location of each desired element */
25+
$('main > section').each( function(i){
26+
27+
var bottom_of_object = $(this).position().top + $(this).outerHeight();
28+
var top_of_object = $(this).position().top + 10;
29+
var bottom_of_window = $(window).scrollTop() + $(window).height();
30+
31+
/* If the object is completely visible in the window, fade it in */
32+
if( bottom_of_window > top_of_object ){
33+
34+
$(this).delay(250).animate({'opacity':'1'},250);
35+
36+
}
37+
38+
});
39+
40+
});
41+
42+
});

‎en/about/index.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
---
1212

1313

14-
<section class="about-us" data-aos="fade-up">
14+
<section class="about-us">
1515
<div class="container">
1616
<p>
1717
Peer 2 Peer University (P2PU) is a 501(c)3 non-profit organization on a mission to cultivate peer learning communities in public spaces around the world.
@@ -25,7 +25,7 @@
2525
</div>
2626
</section>
2727

28-
<section class="values" data-aos="fade-up">
28+
<section class="values">
2929
<div class="container">
3030
<h2>Our Values</h2>
3131
<div class="row text-center text-md-start dot-quad">
@@ -64,7 +64,7 @@ <h3>Equity</h3>
6464
</div>
6565
</section>
6666

67-
<section class="staff" data-aos="fade-up">
67+
<section class="staff">
6868
<div class="container">
6969
<h2>P2PU Staff</h2>
7070
<p>P2PU is led by a small, distributed staff who maintain the community, develop software tools, and create courses and resources that reinforce the learning circle methodology, all of which is made available to the public for free. </p>
@@ -76,7 +76,7 @@ <h2>P2PU Staff</h2>
7676
</div>
7777
</section>
7878

79-
<section class="teams" data-aos="fade-up">
79+
<section class="teams">
8080
<div class="container">
8181
<h2>P2PU Teams</h2>
8282
<p>Teams are organized learning circle communities, typically affiliated with library systems and community-based organizations. <a href="#">Start a team.</a></p>
@@ -124,7 +124,7 @@ <h3>{{ team.name }}</h3>
124124
</div>
125125
</section>
126126

127-
<section class="board" data-aos="fade-up">
127+
<section class="board">
128128
<div class="container">
129129
<h2>P2PU Board</h2>
130130
<p>P2PU is led by a small, distributed staff who maintain the community, develop software tools, and create courses and resources that reinforce the learning circle methodology, all of which is made available to the public for free. </p>
@@ -138,7 +138,7 @@ <h2>P2PU Board</h2>
138138
</div>
139139
</section>
140140

141-
<section class="funders" data-aos="fade-up">
141+
<section class="funders">
142142
<div class="container">
143143
<h2>Supported by</h2>
144144
<p>Many people have made P2PU what it is today. A special thanks to:

‎en/contact/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
description: We’re always happy to help with issues, connect you with others, or talk about new projects!
55
extra_css:
66
---
7-
<div class="container" data-aos="fade-up">
7+
<div class="container">
88
<div class="row my-4">
99
<div class="col-12">
1010
<p>We’re always happy to help with issues, connect you with others, or talk about new projects! You can talk with others in the community via <a href="https://community.p2pu.org/" target="_blank" rel="noopener noreferrer">our online forum</a> and see recent updates from us here:</p>

0 commit comments

Comments
 (0)