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

Commit

Permalink
Version number and author at the bottom of the page
Browse files Browse the repository at this point in the history
  • Loading branch information
Andre Medeiros committed Aug 9, 2014
1 parent 55668f1 commit 2a2a2c5
Show file tree
Hide file tree
Showing 7 changed files with 161 additions and 87 deletions.
24 changes: 12 additions & 12 deletions TODO
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,37 @@
+ DONE RxMarbles title and proposition value
+ DONE Examples for Observable Instance Methods
+ DONE OperatorsMenu should stretch its height
- TODO Version number and author at the bottom of the page
- from package.json
+ DONE Version number and author at the bottom of the page
>>> v0.2.0

- TODO Webpage footer
- TODO README.md
- TODO Styling for dragging a marble
- z-depth and side arrows
>>> v0.2.1
- TODO Fix bugs for first release
- cross browser issues, etc
>>> v1.0.0

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

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

- TODO Interactively add marbles to an InputStream
- TODO Interactively remove marbles from an InputStream
>>> v0.4.0
>>> v1.3.0

- TODO Render lists of marbles for the buffer example
>>> v0.5.0

- TODO Fix bugs for first release
- cross browser issues, etc
>>> v1.0.0
>>> v1.4.0

- TODO Interactively add errors to an InputStream
>>> v1.5.0

- TODO Hovering over a diagram shows mapping arrows
>>> v1.6.0

- TODO Use virtual-dom for all views, only when virtual-dom events work
- See modules under Raynos/mercury
- TODO Refactor to conform to MVC philosophy
Expand Down
13 changes: 13 additions & 0 deletions dist/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,14 @@
transform: rotate(-45deg);
}
body {
position: relative;
background: #ececec;
color: #323232;
font-family: 'Source Sans Pro', sans-serif;
}
a {
color: #3ea1cb;
}
.page-row {
position: relative;
width: 1060px;
Expand Down Expand Up @@ -276,3 +280,12 @@ ul.operators-menu li > a:hover:after {
position: absolute;
right: 5px;
}
.footer {
position: absolute;
bottom: 0;
right: 20px;
color: #7c7c7c;
}
.footer #app-version {
margin-right: 0.3em;
}
186 changes: 113 additions & 73 deletions dist/js/app.js

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ <h3 class="value-proposition">Interactive diagrams of Rx Observables</h3>
<section class="operators-menu-container"></section>
<section class="sandbox"></section>
</div>
<section class="footer">
<span id="app-version"></span>by <a href="https://twitter.com/andrestaltz">@andrestaltz</a>
</section>
<script src="dist/js/app.js"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rxmarbles",
"version": "0.1.0",
"version": "0.2.0",
"author": "Andre Staltz",
"repository": {
"type": "git",
Expand Down Expand Up @@ -29,6 +29,6 @@
},
"scripts": {
"preinstall": "rm -rf build && rm -rf node_modules",
"postinstall": "mkdir build && mkdir build/src && ln -s ../build/src node_modules/rxmarbles"
"postinstall": "mkdir build && mkdir build/src && ln -s ../build/src node_modules/rxmarbles && ln -s ../package.json node_modules/package.json"
}
}
3 changes: 3 additions & 0 deletions src/app.coffee
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
Sandbox = require 'rxmarbles/views/sandbox'
OperatorsMenu = require 'rxmarbles/views/operators-menu'
Package = require 'package.json'

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

operatorsMenuContainer = document.querySelector(".operators-menu-container")
operatorsMenuContainer.appendChild(OperatorsMenu.render())

document.querySelector("#app-version").textContent = "v#{Package.version}"
15 changes: 15 additions & 0 deletions styles/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@
@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro);

body {
position: relative;
background: @color-almost-white;

// Default typography
color: @color-black;
font-family: 'Source Sans Pro', sans-serif;
}

a {
color: @color-blue;
}

.page-row {
position: relative;
width: @page-row-width;
Expand Down Expand Up @@ -82,4 +87,14 @@ ul.operators-menu {
right: 5px;
}
}
}

.footer {
position: absolute;
bottom: 0;
right: 20px;
color: @color-grey-dark;
#app-version {
margin-right: 0.3em;
}
}

0 comments on commit 2a2a2c5

Please sign in to comment.