Skip to content

Commit 2c5154d

Browse files
committed
Merge branch 'develop'
2 parents 6967446 + 5d8a3b1 commit 2c5154d

File tree

9 files changed

+617
-247
lines changed

9 files changed

+617
-247
lines changed

.idea/workspace.xml

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

README.md

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,11 @@
1-
# Update 05/06/2016
1+
# SwallowJs
22

3-
Important! It's better to download the gzipped files instead of forking the repo. I would really appreciate if you could give me a star. 😁
3+
[SwallowJs](http://www.swallowjs.org) is a **lightweight** web services framework that will help kick start your Javascript project
4+
So Ridiculously Fast & Easy-To-Use You’ll Think It’s Magic.
45

5-
This project is under MIT license, so feel free to make it your own.
6+
The most important parts of the SwallowJs Framework are the simple included set of different functions. The SwallowJs is build mainly **PathJs** for routing, **MustacheJs** for view and depend more on **Firebase** for data-source, and also build-in **server side** request for your regular JSON calls.
67

7-
# Leonids Jekyll Themes
8-
9-
**[Leonids](http://renyuanz.github.io/leonids)** is a clean Jekyll theme perfect for powering your GitHub hosted blog.
10-
11-
## What is Leonids?
12-
13-
* Responsive templates. Looking good on mobile, tablet, and desktop.
14-
* Simple and clear permalink structure.
15-
* Support for Disqus Comments.
16-
* Support for multi-authors.
17-
* **And** the Leonids (/ˈliːənɪdz/ lee-ə-nidz) are a prolific meteor shower associated with the comet [Tempel-Tuttle](https://en.wikipedia.org/wiki/55P/Tempel%E2%80%93Tuttle).
18-
19-
See a [demo](http://renyuanz.github.io/leonids/) hosted on GitHub.
8+
## Installing **SwallowJs** via Composer
209

2110
## Quick setup
22-
23-
`git clone https://github.com/renyuanz/leonids`
24-
25-
`cd leonids`
26-
27-
`jekyll server`
28-
29-
Check out your awesome blog at `http://localhost:4000` and Cheers!
30-
31-
## TODO
32-
33-
- [ ] Build a timeline page.
34-
- [ ] Build a portfolio page.
35-
- [ ] Redesign categories page. Ref: [dribbble: blog category section By Ilja Miskov](https://dribbble.com/shots/2274792-Blog-Category-Selection)
36-
- [ ] Multi languages support.
11+
`git clone https://github.com/hurlatunde/swallow.js`

_includes/head.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@
2525
<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>
28+
<script type="text/javascript" src="{{ site.url }}/assets/js/bootstrap.min.js"></script>
29+
2830
</head>

_includes/js.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<script type="text/javascript" src="{{ site.url }}/assets/js/bootstrap.min.js"></script>
21
<script type="text/javascript" src="{{ site.url }}/assets/js/jquery.scrollTo-1.4.3.1-min.js"></script>
32
<script type="text/javascript" src="{{ site.url }}/assets/js/modernizr.custom.js"></script>
43
<script type="text/javascript" src="{{ site.url }}/assets/js/page-transitions.js"></script>
@@ -21,7 +20,7 @@
2120
$('#related-articles').css({position: 'static', top: '0px'});
2221
}
2322
})
24-
23+
});
2524
</script>
2625

2726
{% if site.owner.google.analytics %}

_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" id="wrap">
6+
<div class="mcontent" id="wrap" data-spy="scroll" data-target="#navbar-doc-side">
77
{{ content }}
88
{% include footer.html %}
99
{% include js.html %}

assets/css/style.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ body {
99
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
1010
font-size: 14px;
1111
line-height: 1.231;
12+
position: relative;
1213
}
1314

15+
1416
input,
1517
button,
1618
select,
@@ -2315,4 +2317,20 @@ p strong {
23152317
height: 100%;
23162318
background: rgba(27, 31, 35, 0.87);
23172319
opacity: 0.999;
2320+
}
2321+
2322+
.blog-4 h3 {
2323+
font-size: 35px;
2324+
margin: 0 0 35px;
2325+
font-size: 35px;
2326+
margin: 43px 0 22px 0;
2327+
padding-top: 20px;
2328+
}
2329+
2330+
.blog-4 .related-articles a:hover, .blog-4 .related-articles a:focus, .blog-4 .related-articles a.active {
2331+
color: #13584b;
2332+
}
2333+
2334+
.panel .panel {
2335+
margin-bottom: 5px;
23182336
}

documentation-beta/doc.html

Lines changed: 26 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
<header class="header-2">
88
<div class="container">
99
<div class="row">
10-
<nav class="navbar col-sm-12 navbar-fixed-top" role="navigation" style="top: -6px;z-index: 999; position: absolute;">
10+
<nav class="navbar col-sm-12 navbar-fixed-top" role="navigation"
11+
style="top: -6px;z-index: 999; position: absolute;">
1112
{% include menu.html %}
1213
</nav>
1314
</div>
@@ -35,15 +36,16 @@ <h3 style="font-size: 37px;margin-bottom: 5px;"> Welcome to the world of Swallow
3536
<div class="row">
3637
<div class="col-sm-9">
3738
<div>
38-
<div class="scrollspy-example" data-spy="scroll" data-target="#navbar-example2" data-offset="0">
39+
<div class="scrollspy-example" data-offset="0">
40+
41+
<div id="top">
42+
</div>
3943

4044
<!--intro-->
4145
<div class="div-sections" id="swallow_intro">
42-
<h3> Intro </h3>
43-
<div class="panel panel-default">
44-
<div class="panel-body">
45-
This version of the documentation is for SwallowJs v0.29 - Beta
46-
</div>
46+
<h3> SwallowJs Intro </h3>
47+
<div class="alert alert-warning">
48+
This version of the documentation is for SwallowJs v0.29 - Beta
4749
</div>
4850

4951
<p> We hope to maintain a high level of quality, validity and accuracy for
@@ -71,7 +73,8 @@ <h3>Build a Blog</h3>
7173
<div class="text-center">
7274
<img src="../assets/img/firebase.png" class="img-responsive"/>
7375
<div>
74-
<a href="/doc/tutorial-firebase" class="btn btn-inverse"> Blog build with cloud
76+
<a href="/doc/tutorial-firebase" class="btn btn-inverse"> Blog build
77+
with cloud
7578
services provider</a>
7679
</div>
7780
</div>
@@ -89,6 +92,14 @@ <h3>Build a Blog</h3>
8992
</div>
9093
<!--Build-->
9194

95+
<div id="services">
96+
<h3> Services </h3>
97+
<p> Services are the heart of your application. storage and retrieval of your data.
98+
<strong><a href="/doc/services-firebase"> Read more on Firebase services </a> </strong> or
99+
<strong><a href="/doc/services-derver-side"> Read more on Server Side services </a> </strong>
100+
</p>
101+
</div>
102+
92103
<div id="stuck">
93104
<h3>Getting Help</h3>
94105
If you’re stuck, there are a number to help you out, always ready to listen
@@ -100,7 +111,7 @@ <h3>Getting Help</h3>
100111
<div class="col-sm-3">
101112
<div class="related-articles" id="related-articles">
102113
<h6> Preface </h6>
103-
<ul>
114+
<ul id="navbar-doc-side">
104115
<li class=""><a href="#swallow_intro"> SwallowJs Intro</a></li>
105116
<li class="dropdown active">
106117
<a href="#" class="dropdown-toggle" id="dropdown_tutorial" data-toggle="dropdown">
@@ -110,46 +121,16 @@ <h6> Preface </h6>
110121
<li><a href="#tutorial_blog_server"> Blog with Server </a></li>
111122
</ul>
112123
</li>
113-
<li class=""><a href="#stuck"> Getting Help </a></li>
124+
<li class=""><a href="#swallow_intro"> SwallowJs Intro</a></li>
125+
<li class=""><a href="#services"> Services </a></li>
126+
<li class=""><a href="#top" style="font-size: 13px;"> Back to top </a></li>
114127
</ul>
115128
</div>
116129
</div>
117130
</div>
118131
</div>
119132
</section>
120133

121-
<div>
122-
<div class="hide">
123-
124-
<div>
125-
</div>
126-
127-
<nav class="navbar navbar-default navbar-static" id="navbar-example2">
128-
<div class="container-fluid">
129-
<div class="navbar-header">
130-
<button class="collapsed navbar-toggle" type="button" data-toggle="collapse"
131-
data-target=".bs-example-js-navbar-scrollspy"><span class="sr-only">Toggle navigation</span>
132-
<span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
133-
</button>
134-
<a href="#" class="navbar-brand">Project Name</a></div>
135-
<div class="collapse navbar-collapse bs-example-js-navbar-scrollspy">
136-
<ul class="nav navbar-nav">
137-
<li class=""><a href="#fat">@fat</a></li>
138-
<li class=""><a href="#mdo">@mdo</a></li>
139-
<li class="dropdown active"><a href="#" class="dropdown-toggle" id="navbarDrop1"
140-
data-toggle="dropdown" role="button" aria-haspopup="true"
141-
aria-expanded="false">Dropdown <span class="caret"></span></a>
142-
<ul class="dropdown-menu" aria-labelledby="navbarDrop1">
143-
<li class="active"><a href="#one">one</a></li>
144-
<li class=""><a href="#two">two</a></li>
145-
<li role="separator" class="divider"></li>
146-
<li class=""><a href="#three">three</a></li>
147-
</ul>
148-
</li>
149-
</ul>
150-
</div>
151-
</div>
152-
</nav>
153-
154-
</div>
155-
</div>
134+
<script>
135+
$('body').scrollspy({target: '#navbar-doc-side'})
136+
</script>

0 commit comments

Comments
 (0)