Skip to content

Commit b8cad82

Browse files
authored
Merge pull request #71 from topcoder-platform/develop
Universal navigation
2 parents 2500e65 + c7a06c5 commit b8cad82

File tree

6 files changed

+54
-336
lines changed

6 files changed

+54
-336
lines changed

design/custom.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

design/custom.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/scss/base/_footer.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
}
99

1010
.Frame-footer {
11-
11+
position: relative;
12+
top: 21px;
1213
.Footer {
1314
padding: 0px 80px 0px 80px;
1415
color: white;

views/default.master.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
{asset name="Head"}
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,400i,600,700,700i" rel="stylesheet">
10+
<link href="https://fonts.googleapis.com/css2?family=Barlow&family=Barlow+Condensed&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
1011
{literal}
1112
<script>
1213
!function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on","addSourceMiddleware","addIntegrationMiddleware","setAnonymousId","addDestinationMiddleware"];analytics.factory=function(e){return function(){var t=Array.prototype.slice.call(arguments);t.unshift(e);analytics.push(t);return analytics}};for(var e=0;e<analytics.methods.length;e++){var key=analytics.methods[e];analytics[key]=analytics.factory(key)}analytics.load=function(key,e){var t=document.createElement("script");t.type="text/javascript";t.async=!0;t.src="https://cdn.segment.com/analytics.js/v1/" + key + "/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);analytics._loadOptions=e};analytics.SNIPPET_VERSION="4.13.1";
@@ -152,7 +153,7 @@
152153
</div>
153154
</div>
154155
<div class="Frame-footer">
155-
{include file="partials/footer.tpl"}
156+
<div id="footerNav"></div>
156157
</div>
157158
</div>
158159
<div id="modals"></div>

views/partials/footer.tpl

Lines changed: 0 additions & 160 deletions
This file was deleted.

0 commit comments

Comments
 (0)