Skip to content
This repository was archived by the owner on Oct 26, 2021. It is now read-only.

Commit 2a2a2c5

Browse files
author
Andre Medeiros
committed
Version number and author at the bottom of the page
1 parent 55668f1 commit 2a2a2c5

File tree

7 files changed

+161
-87
lines changed

7 files changed

+161
-87
lines changed

TODO

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,37 @@
2323
+ DONE RxMarbles title and proposition value
2424
+ DONE Examples for Observable Instance Methods
2525
+ DONE OperatorsMenu should stretch its height
26-
- TODO Version number and author at the bottom of the page
27-
- from package.json
26+
+ DONE Version number and author at the bottom of the page
2827
>>> v0.2.0
2928

30-
- TODO Webpage footer
3129
- TODO README.md
3230
- TODO Styling for dragging a marble
3331
- z-depth and side arrows
34-
>>> v0.2.1
32+
- TODO Fix bugs for first release
33+
- cross browser issues, etc
34+
>>> v1.0.0
3535

3636
- TODO Render each stream with a different regular polygon?
3737
- TODO Render also the stream completion time marker?
38-
>>> v0.2.2
38+
>>> v1.1.0
3939

4040
- TODO Render metastreams in 'window' example
4141
- TODO Add examples groupBy, flatMap, concatMap, switch
42-
>>> v0.3.0
42+
>>> v1.2.0
4343

4444
- TODO Interactively add marbles to an InputStream
4545
- TODO Interactively remove marbles from an InputStream
46-
>>> v0.4.0
46+
>>> v1.3.0
4747

4848
- TODO Render lists of marbles for the buffer example
49-
>>> v0.5.0
50-
51-
- TODO Fix bugs for first release
52-
- cross browser issues, etc
53-
>>> v1.0.0
49+
>>> v1.4.0
5450

5551
- TODO Interactively add errors to an InputStream
52+
>>> v1.5.0
53+
5654
- TODO Hovering over a diagram shows mapping arrows
55+
>>> v1.6.0
56+
5757
- TODO Use virtual-dom for all views, only when virtual-dom events work
5858
- See modules under Raynos/mercury
5959
- TODO Refactor to conform to MVC philosophy

dist/css/main.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,14 @@
216216
transform: rotate(-45deg);
217217
}
218218
body {
219+
position: relative;
219220
background: #ececec;
220221
color: #323232;
221222
font-family: 'Source Sans Pro', sans-serif;
222223
}
224+
a {
225+
color: #3ea1cb;
226+
}
223227
.page-row {
224228
position: relative;
225229
width: 1060px;
@@ -276,3 +280,12 @@ ul.operators-menu li > a:hover:after {
276280
position: absolute;
277281
right: 5px;
278282
}
283+
.footer {
284+
position: absolute;
285+
bottom: 0;
286+
right: 20px;
287+
color: #7c7c7c;
288+
}
289+
.footer #app-version {
290+
margin-right: 0.3em;
291+
}

dist/js/app.js

Lines changed: 113 additions & 73 deletions
Large diffs are not rendered by default.

index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ <h3 class="value-proposition">Interactive diagrams of Rx Observables</h3>
2727
<section class="operators-menu-container"></section>
2828
<section class="sandbox"></section>
2929
</div>
30+
<section class="footer">
31+
<span id="app-version"></span>by <a href="https://twitter.com/andrestaltz">@andrestaltz</a>
32+
</section>
3033
<script src="dist/js/app.js"></script>
3134
</body>
3235
</html>

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rxmarbles",
3-
"version": "0.1.0",
3+
"version": "0.2.0",
44
"author": "Andre Staltz",
55
"repository": {
66
"type": "git",
@@ -29,6 +29,6 @@
2929
},
3030
"scripts": {
3131
"preinstall": "rm -rf build && rm -rf node_modules",
32-
"postinstall": "mkdir build && mkdir build/src && ln -s ../build/src node_modules/rxmarbles"
32+
"postinstall": "mkdir build && mkdir build/src && ln -s ../build/src node_modules/rxmarbles && ln -s ../package.json node_modules/package.json"
3333
}
3434
}

src/app.coffee

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
Sandbox = require 'rxmarbles/views/sandbox'
22
OperatorsMenu = require 'rxmarbles/views/operators-menu'
3+
Package = require 'package.json'
34

45
sandboxContainer = document.querySelector(".sandbox")
56
sandboxContainer.appendChild(Sandbox.render())
67

78
operatorsMenuContainer = document.querySelector(".operators-menu-container")
89
operatorsMenuContainer.appendChild(OperatorsMenu.render())
10+
11+
document.querySelector("#app-version").textContent = "v#{Package.version}"

styles/main.less

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,18 @@
1616
@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro);
1717

1818
body {
19+
position: relative;
1920
background: @color-almost-white;
2021

2122
// Default typography
2223
color: @color-black;
2324
font-family: 'Source Sans Pro', sans-serif;
2425
}
2526

27+
a {
28+
color: @color-blue;
29+
}
30+
2631
.page-row {
2732
position: relative;
2833
width: @page-row-width;
@@ -82,4 +87,14 @@ ul.operators-menu {
8287
right: 5px;
8388
}
8489
}
90+
}
91+
92+
.footer {
93+
position: absolute;
94+
bottom: 0;
95+
right: 20px;
96+
color: @color-grey-dark;
97+
#app-version {
98+
margin-right: 0.3em;
99+
}
85100
}

0 commit comments

Comments
 (0)