Skip to content

Commit 6967446

Browse files
hurlatundehurlatunde
committed
Merge branch 'develop'
2 parents 59cdf2c + 1dab630 commit 6967446

File tree

14 files changed

+396
-139
lines changed

14 files changed

+396
-139
lines changed

‎.idea/workspace.xml‎

Lines changed: 149 additions & 110 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_includes/footer.html‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,35 @@
1-
<section class="content-36">
2-
<div class="container">
3-
<h2>We’ve created the product that will help your startup even better</h2>
4-
<p>The most important parts of the SwallowJs Framework are the simple included set of
5-
different functions. The SwallowJs is build main <strong class="pathjs">PathJs</strong> for routing, <strong
6-
class="mustachejs">MustacheJs</strong>
7-
for view and depend more on <strong class="firebase">Firebase</strong> for data-source, and also build-in
8-
server side
9-
request for your regular JSON calls.</p>
10-
<a class="btn btn-success" href="/documentation-beta"> Documentation </a>
1+
<section class="content-36"
2+
style="background: url(../assets/img/sub-footer.jpeg)center center no-repeat;
3+
position:relative;
4+
background-attachment: fixed;background-size: cover;">
5+
<div class="sub-container-holder" ></div>
6+
<div class="sub-container">
7+
<div class="container">
8+
<h2>We’ve created the product that will help you kick start your project faster and better</h2>
9+
<p>The most important parts of the SwallowJs Framework are the simple included set of
10+
different functions. The SwallowJs is build mainly <strong class="pathjs" data-toggle="tooltip"
11+
data-placement="bottom"
12+
title="PathJS is a lightweight, client-side routing library that allows you to create 'single page' applications using Hashbangs and/or HTML5 pushState.">PathJs</strong>
13+
for routing, <strong
14+
class="mustachejs" data-toggle="tooltip" data-placement="bottom"
15+
title="Mustache is a logic-less template syntax. It can be used for HTML, config files, source code - anything. It works by expanding tags in a template using values provided in a hash or object.">MustacheJs</strong>
16+
for view and depend more on <strong class="firebase" data-toggle="tooltip" data-placement="bottom"
17+
title="Firebase gives you the tools and infrastructure you need to build better apps and grow successful business.">Firebase</strong>
18+
for data-source, and also build-in server side request for your regular JSON calls.</p>
19+
<a class="btn btn-success" href="/doc"> Documentation </a>
20+
</div>
1121
</div>
1222
</section>
1323

1424
<footer class="footer-1 bg-midnight-blue">
1525
<div class="container">
1626
<div class="row">
1727
<div class="col-sm-5">
18-
<p class="lead"><b>200,000</b> users registered since January</p>
19-
It’s our aim to increase productivity and make coding more enjoyable.
28+
<img src="../assets/img/swallo_logo_footer.png"
29+
style="width: 190px;margin: 10px 0; padding-bottom: 12px"/>
30+
31+
<!--<p class="lead"><b>200,000</b> users registered since January</p>-->
32+
<p>It’s our aim to increase productivity and make coding more enjoyable.</p>
2033
<div class="social-btns">
2134
<a href="#" class="social-btn-facebook"
2235
data-text="Startup Design Framework - http://designmodo.com/startup/ Suit Up your Startup!"

‎_includes/head.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
<!-- Icons -->
2222
<!-- 16x16 -->
23-
<link rel="shortcut icon" href="{{ site.url }}/favicon.ico">
23+
<link rel="shortcut icon" href="{{ site.url }}/assets/img/favicon.png">
2424
<!-- 32x32 -->
25-
<link rel="shortcut icon" href="{{ site.url }}/favicon.png">
25+
<link rel="shortcut icon" href="{{ site.url }}/assets/img/favicon.png">
2626

2727
<script type="text/javascript" src="{{ site.url }}/assets/js/jquery-2.1.4.min.js"></script>
2828
</head>

‎_includes/js.html‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
<script type="text/javascript" src="{{ site.url }}/assets/js/bootstrap.min.js"></script>
32
<script type="text/javascript" src="{{ site.url }}/assets/js/jquery.scrollTo-1.4.3.1-min.js"></script>
43
<script type="text/javascript" src="{{ site.url }}/assets/js/modernizr.custom.js"></script>
@@ -7,17 +6,40 @@
76
<script type="text/javascript" src="{{ site.url }}/assets/js/jquery.svg.js"></script>
87
<script type="text/javascript" src="{{ site.url }}/assets/js/jquery.svganim.js"></script>
98
<script type="text/javascript" src="{{ site.url }}/assets/js/jquery.parallax.min.js"></script>
10-
<script type="text/javascript" src="{{ site.url }}/assets/js/startup-kit.js"></script>
9+
<!--<script type="text/javascript" src="{{ site.url }}/assets/js/startup-kit.js"></script>-->
10+
11+
<script>
12+
$(function () {
13+
$('[data-toggle="tooltip"]').tooltip();
14+
15+
16+
var stickyHeaderTop = $('#related-articles').offset().top;
17+
$(window).scroll(function () {
18+
if ($(window).scrollTop() > stickyHeaderTop) {
19+
$('#related-articles').css({position: 'fixed', top: '0px'});
20+
} else {
21+
$('#related-articles').css({position: 'static', top: '0px'});
22+
}
23+
})
24+
25+
</script>
1126

1227
{% if site.owner.google.analytics %}
1328
<!-- Asynchronous Google Analytics snippet -->
1429
<script>
15-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
16-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
17-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
18-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
30+
(function (i, s, o, g, r, a, m) {
31+
i['GoogleAnalyticsObject'] = r;
32+
i[r] = i[r] || function () {
33+
(i[r].q = i[r].q || []).push(arguments)
34+
}, i[r].l = 1 * new Date();
35+
a = s.createElement(o),
36+
m = s.getElementsByTagName(o)[0];
37+
a.async = 1;
38+
a.src = g;
39+
m.parentNode.insertBefore(a, m)
40+
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
1941

20-
ga('create', '{{ site.owner.google.analytics }}', 'auto');
21-
ga('send', 'pageview');
42+
ga('create', '{{ site.owner.google.analytics }}', 'auto');
43+
ga('send', 'pageview');
2244
</script>
2345
{% endif %}

‎_includes/menu.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<div class="navbar-header">
22
<button type="button" class="navbar-toggle"></button>
33
<a class="brand" href="/">
4-
54
<img src="../assets/img/swallo_logo_beta.png" style="width: 190px;margin-top: 1px;" />
65
</a>
76
</div>

‎_layouts/default.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% include head.html %}
55
<body>
6-
<div class="mcontent">
6+
<div class="mcontent" id="wrap">
77
{{ content }}
88
{% include footer.html %}
99
{% include js.html %}

‎assets/css/style.css‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2156,4 +2156,163 @@ figure figcaption {
21562156

21572157
.entry figure {
21582158
margin: 30px 0;
2159+
}
2160+
2161+
.content-3 {
2162+
padding-top: 130px;
2163+
padding-bottom: 130px;
2164+
position: relative;
2165+
}
2166+
.content-3 h3 {
2167+
font-size: 30px;
2168+
font-weight: normal;
2169+
color: #2c3e50;
2170+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
2171+
font-weight: 300;
2172+
margin-bottom: 24px;
2173+
}
2174+
.content-3 p {
2175+
font-size: 16px;
2176+
font-weight: normal;
2177+
color: #7f8c8d;
2178+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
2179+
line-height: 29.999999999999996px;
2180+
}
2181+
@media (max-width: 767px) {
2182+
.content-3 p {
2183+
margin-bottom: 34px;
2184+
}
2185+
}
2186+
.content-3.v-center,
2187+
.content-3 .v-center {
2188+
display: table;
2189+
width: 100%;
2190+
}
2191+
.content-3.v-center > div,
2192+
.content-3 .v-center > div {
2193+
display: table-cell;
2194+
vertical-align: middle;
2195+
margin-top: 0;
2196+
margin-bottom: 0;
2197+
float: none;
2198+
}
2199+
@media (min-width: 768px) {
2200+
.content-3.v-center.row:before,
2201+
.content-3 .v-center.row:before,
2202+
.content-3.v-center.row:after,
2203+
.content-3 .v-center.row:after {
2204+
display: none;
2205+
}
2206+
}
2207+
@media (max-width: 767px) {
2208+
.content-3.v-center,
2209+
.content-3 .v-center {
2210+
-webkit-box-sizing: border-box;
2211+
-moz-box-sizing: border-box;
2212+
box-sizing: border-box;
2213+
padding-left: 5px;
2214+
padding-right: 5px;
2215+
}
2216+
.content-3.v-center.row,
2217+
.content-3 .v-center.row {
2218+
display: block;
2219+
width: auto;
2220+
}
2221+
.content-3.v-center.row:before,
2222+
.content-3 .v-center.row:before,
2223+
.content-3.v-center.row:after,
2224+
.content-3 .v-center.row:after {
2225+
display: none;
2226+
}
2227+
.content-3.v-center.row > *,
2228+
.content-3 .v-center.row > * {
2229+
display: block;
2230+
vertical-align: baseline;
2231+
}
2232+
}
2233+
.content-3 .img {
2234+
max-width: 380px;
2235+
margin-left: auto;
2236+
}
2237+
.content-3 .img img {
2238+
width: 100%;
2239+
}
2240+
@media (max-width: 767px) {
2241+
.content-3 .img {
2242+
margin-right: auto;
2243+
margin-bottom: 30px;
2244+
}
2245+
}
2246+
.content-3 .delimiter {
2247+
margin-top: 130px;
2248+
padding-top: 70px;
2249+
border-top: 2px solid #ecf0f1;
2250+
}
2251+
@media (max-width: 767px) {
2252+
.content-3 .delimiter {
2253+
display: none;
2254+
}
2255+
}
2256+
.content-3 .features h6 {
2257+
margin-top: 0;
2258+
margin-bottom: 22px;
2259+
font-size: 20px;
2260+
font-weight: normal;
2261+
color: #34495e;
2262+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
2263+
font-weight: 500;
2264+
text-transform: none;
2265+
}
2266+
@media (max-width: 767px) {
2267+
.content-3 .features h6 {
2268+
margin-top: 30px;
2269+
margin-bottom: 15px;
2270+
}
2271+
}
2272+
.content-3 .features p {
2273+
margin-top: 0;
2274+
margin-bottom: 0;
2275+
line-height: 26px;
2276+
}
2277+
.content-3.mirror .aligment {
2278+
float: right;
2279+
}
2280+
.content-3.mirror .img {
2281+
margin-left: 0;
2282+
margin-right: auto;
2283+
max-width: 397px;
2284+
}
2285+
@media (max-width: 767px) {
2286+
.content-3.mirror .img {
2287+
margin-left: auto;
2288+
}
2289+
}
2290+
2291+
.content-3.mirror .img {
2292+
margin-left: 0;
2293+
margin-right: auto;
2294+
max-width: 428px;
2295+
margin-top: 14px;
2296+
}
2297+
2298+
.header-2 .navbar .nav > li > a {
2299+
padding: 29px 0 28px;
2300+
font-size: 13px;
2301+
font-weight: 500;
2302+
letter-spacing: inherit;
2303+
color: #ffffff;
2304+
}
2305+
2306+
p strong {
2307+
cursor: pointer! important;
2308+
}
2309+
2310+
.sub-container-holder {
2311+
position: absolute;
2312+
top: 0;
2313+
bottom: 0;
2314+
width: 100%;
2315+
height: 100%;
2316+
background: rgba(27, 31, 35, 0.87);
2317+
opacity: 0.999;
21592318
}

‎assets/img/bg.jpeg‎

740 KB
Loading

‎assets/img/favicon.png‎

1.6 KB
Loading

‎assets/img/ps-wire-imac@2x.png‎

72.7 KB
Loading

0 commit comments

Comments
 (0)