Skip to content

Commit 12e911c

Browse files
lmccartlmccart
authored
Merge pull request #902 from lmccart/main
adding promo to site
2 parents 9b1c757 + 2c6613b commit 12e911c

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

‎src/assets/css/main.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ a.code.addon {
833833
height: 100px;
834834
position: relative;
835835
background: white;
836-
/* margin-top: 1.5em; temp promo */
836+
margin-top: 1.5em; /* temp promo */
837837
}
838838

839839
#navi,
@@ -2263,7 +2263,7 @@ footer {
22632263
@media (min-width: 780px) {
22642264
.container {
22652265
width: 49em !important;
2266-
margin: 10em auto; /* temp promo, 11.5em */
2266+
margin: 11.5em auto; /* temp promo, 10.0em */
22672267
}
22682268
main {
22692269
width: 36em;
@@ -2276,7 +2276,7 @@ footer {
22762276

22772277
@media (min-width: 780px) {
22782278
.container {
2279-
margin: 10em auto; /* temp promo, 11.5em */
2279+
margin: 11.5em auto; /* temp promo, 10.0em */
22802280
width: 100%;
22812281
padding: 0.8em 0 0 0;
22822282
height: auto;
@@ -2301,7 +2301,7 @@ footer {
23012301
}
23022302
#i18n-btn {
23032303
position: absolute;
2304-
top: 2.5em; /* temp promo, 4.0em */
2304+
top: 4.0em; /* temp promo, 2.5em */
23052305
right: 1em;
23062306
}
23072307
#i18n-btn a {

‎src/assets/js/reference.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4404,7 +4404,7 @@ define('menuView',[
44044404
});
44054405

44064406

4407-
define('text!tpl/library.html',[],function () { return '<h3><%= module.name %> library</h3>\n\n<p><%= module.description %></p>\n\n<div id="library-page" class="reference-group clearfix"> \n\n<% var t = 0; col = 0; %>\n\n<% _.each(groups, function(group){ %>\n <% if (t == 0) { %> \n <div class="column_<%=col%>">\n <% } %>\n <% if (group.name !== module.name && group.name !== \'p5\') { %>\n <% if (group.hash) { %> <a href="<%=group.hash%>" <% if (group.module !== module.name) { %>class="core"<% } %>><% } %> \n <h4 class="group-name <% if (t == 0) { %> first<%}%>"><%=group.name%></h4>\n <% if (group.hash) { %> </a><br> <% } %>\n <% } %>\n <% _.each(group.items.filter(function(item) {return item.access !== \'private\'}), function(item) { %>\n <a href="<%=item.hash%>" <% if (item.module !== module.name) { %>class="core"<% } %>><%=item.name%><% if (item.itemtype === \'method\') { %>()<%}%></a><br>\n <% t++; %>\n <% }); %>\n <% if (t >= Math.floor(totalItems/4)) { col++; t = 0; %>\n </div>\n <% } %>\n<% }); %>\n</div>\n';});
4407+
define('text!tpl/library.html',[],function () { return '<h3><%= module.name %> library</h3>\n\n<p><%= module.description %></p>\n\n<div id="library-page" class="reference-group clearfix"> \n\n<% var t = 0; col = 0; %>\n\n<% _.each(groups, function(group){ %>\n <% if (t == 0) { %> \n <div class="column_<%=col%>">\n <% } %>\n <% if (group.name !== module.name && group.name !== \'p5\') { %>\n <% if (group.hash) { %> <a href="<%=group.hash%>" <% if (group.module !== module.name) { %>class="core"<% } %>><% } %> \n <h2 class="group-name <% if (t == 0) { %> first<%}%>"><%=group.name%></h2>\n <% if (group.hash) { %> </a><br> <% } %>\n <% } %>\n <% _.each(group.items.filter(function(item) {return item.access !== \'private\'}), function(item) { %>\n <a href="<%=item.hash%>" <% if (item.module !== module.name) { %>class="core"<% } %>><%=item.name%><% if (item.itemtype === \'method\') { %>()<%}%></a><br>\n <% t++; %>\n <% }); %>\n <% if (t >= Math.floor(totalItems/4)) { col++; t = 0; %>\n </div>\n <% } %>\n<% }); %>\n</div>\n';});
44084408

44094409
define(
44104410
'libraryView',[

‎src/templates/pages/download/support.hbs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ slug: download/
1414
<h1>{{#i18n "support-title"}}{{/i18n}}</h1>
1515

1616
<p>{{#i18n "support-1"}}{{/i18n}}<a href="https://processingfoundation.org/support/">Processing Foundation</a>{{#i18n "support-2"}}{{/i18n}} <a href="https://processingfoundation.org/fellowships">{{#i18n "support-3"}}{{/i18n}}</a>{{#i18n "support-4"}}{{/i18n}}<a href="https://processingfoundation.org/advocacy">{{#i18n "support-5"}}{{/i18n}}</a></p>
17-
<script src="https://donorbox.org/widget.js" paypalExpress="true"></script><iframe allowpaymentrequest="" height="900" name="donorbox" src="https://donorbox.org/embed/support-the-processing-foundation?hide_donation_meter=true" style="max-width: 500px; min-width: 250px; max-height:none!important; margin-top: 1em" ></iframe>
17+
{{!-- <script src="https://donorbox.org/widget.js" paypalExpress="true"></script><iframe allowpaymentrequest="" height="900" name="donorbox" src="https://donorbox.org/embed/support-the-processing-foundation?hide_donation_meter=true" style="max-width: 500px; min-width: 250px; max-height:none!important; margin-top: 1em" ></iframe> --}}
18+
<script src="https://donorbox.org/widget.js" paypalExpress="true"></script><iframe allowpaymentrequest="" height="900" name="donorbox" src="https://donorbox.org/embed/supportp52020" style="max-width: 500px; min-width: 250px; max-height:none!important; margin-top: 1em" ></iframe>
1819

1920
<p><a href="https://processingfoundation.org">{{#i18n "support-32"}}{{/i18n}}</a>{{#i18n "support-33"}}{{/i18n}}</p>
2021

‎src/templates/pages/index.hbs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ slug: /
4444
target="_blank">{{#i18n "p4xp6"}}{{/i18n}}</a></li>
4545
</ul>
4646

47-
<h2>{{#i18n "sketch_credits"}}{{/i18n}}</h2>
48-
<p>{{#i18n "sketch_info"}}{{/i18n}}</p>
47+
{{!-- <h2>{{#i18n "sketch_credits"}}{{/i18n}}</h2>
48+
<p>{{#i18n "sketch_info"}}{{/i18n}}</p> --}}
4949
</main>
5050
{{> footer}}
5151
</div> <!-- end column-span -->
@@ -60,5 +60,5 @@ slug: /
6060

6161
<object tabindex=-1 type="image/svg+xml" data="{{assets}}/img/thick-asterisk-alone.svg" id="asterisk-design-element"
6262
aria-hidden="true">*</object>
63-
<iframe tabindex='-1' id='home-sketch-frame' src='{{assets}}/p5_featured/KD_2020_08_08_22_21_27/'></iframe>
63+
{{!-- <iframe tabindex='-1' id='home-sketch-frame' src='{{assets}}/p5_featured/KD_2020_08_08_22_21_27/'></iframe> --}}
6464
</div> <!-- end home-page -->

‎src/templates/partials/footer.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: footer
44
<footer>
55
<h2 class="sr-only">{{#i18n "footerxh1"}}{{/i18n}}</h2>
66
<p> {{#i18n "footer1"}}{{/i18n}}<a href='https://github.com/mcturner1995' target="_blank">Moira
7-
Turner</a>{{#i18n "footer2"}}{{/i18n}}<a href='http://lauren-mccarthy.com' target="_blank">Lauren
7+
Turner</a>{{#i18n "footer2"}}{{/i18n}}<a href='http://lauren-mccarthy.com' target="_blank">Lauren Lee
88
McCarthy</a>{{#i18n "footer3"}}{{/i18n}}<a href="http://processing.org/foundation/" target="_blank">Processing
99
Foundation</a> {{#i18n "footer4"}}{{/i18n}}
1010
<a href="http://itp.nyu.edu/itp/" target="_blank">NYU ITP</a>. {{#i18n "footer5"}}{{/i18n}}<a

‎src/templates/partials/header.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ title: header
1414

1515
<a tabindex="1" href="#content" id="skip-to-content">Skip to main content</a>
1616

17-
<!-- <a id="promo-link" href="https://donorbox.org/supportpf2019-fundraising-campaign" target="_blank"><div id="promo">This season, we need your help! Click here to #SupportP5!</div></a> -->
17+
<a id="promo-link" href="https://donorbox.org/supportp52020" target="_blank"><div id="promo">This season, we need your help! Click here to #SupportP5!</div></a>
1818
</nav>

0 commit comments

Comments
 (0)