Skip to content

Commit

Permalink
Updated for gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
sbstjn committed Mar 6, 2012
1 parent e37625c commit 4467ec7
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion public/scripts/app.main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var p = '/scripts/vendor/';
var p = 'scripts/vendor/';
require(["jquery", p + "dropdown.js", p + "prettify.js", "./scripts/examples.js"], function($, dd, pf, examples) {
$(document).ready(function(e) {
prettyPrint();
Expand Down
2 changes: 1 addition & 1 deletion public/scripts/app.none.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var p = '/scripts/vendor/';
var p = 'scripts/vendor/';
require(["jquery", p + "dropdown.js", p + "prettify.js", "./scripts/examples.js"], function($, dd, pf, examples) {
$(document).ready(function(e) {
prettyPrint();
Expand Down
4 changes: 2 additions & 2 deletions public/scripts/app.walkLED.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var pv = '/scripts/vendor/';
var pl = '/scripts/libs/';
var pv = 'scripts/vendor/';
var pl = 'scripts/libs/';
require(["jquery", pv + "dropdown.js", pv + "prettify.js", pl + 'Noduino.js', pl + 'Noduino.Socket.js', pl + 'Logger.HTML.js'], function($, dd, p, NoduinoObj, Connector, Logger) {
var Noduino = null;

Expand Down
2 changes: 1 addition & 1 deletion public/scripts/example-1.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ define(function() {
}

Example.handle = function() {
require(['/scripts/libs/Noduino.js', '/scripts/libs/Noduino.Socket.js', '/scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) {
require(['scripts/libs/Noduino.js', 'scripts/libs/Noduino.Socket.js', 'scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) {
var Noduino = new NoduinoObj({debug: false, host: 'http://localhost:8090'}, Connector, Logger);
Noduino.connect(function(err, board) {
$('#e1-exampleConnection .alert').addClass('hide');
Expand Down
2 changes: 1 addition & 1 deletion public/scripts/example-2.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define(function() {

Example2.handle = function() {
var that = this;
require(['/scripts/libs/Noduino.js', '/scripts/libs/Noduino.Socket.js', '/scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) {
require(['scripts/libs/Noduino.js', 'scripts/libs/Noduino.Socket.js', 'scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) {
var Noduino = new NoduinoObj({debug: false, host: 'http://localhost:8090'}, Connector, Logger);
Noduino.connect(function(err, board) {
$('#e2-exampleConnection .alert').addClass('hide');
Expand Down
2 changes: 1 addition & 1 deletion public/scripts/example-3.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ define(function() {

Example3.handle = function() {

require(['/scripts/libs/Noduino.js', '/scripts/libs/Noduino.Socket.js', '/scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) {
require(['scripts/libs/Noduino.js', 'scripts/libs/Noduino.Socket.js', 'scripts/libs/Logger.js'], function(NoduinoObj, Connector, Logger) {
var Noduino = new NoduinoObj({debug: false, host: 'http://localhost:8090'}, Connector, Logger);
Noduino.connect(function(err, board) {
$('#e3-exampleConnection .alert').addClass('hide');
Expand Down
4 changes: 2 additions & 2 deletions public/styles/bootstrap/init.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions public/styles/bootstrap/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
@zindexModal: 1050;

// Sprite icons path
@iconSpritePath: "/images/glyphicons-halflings.png";
@iconWhiteSpritePath: "/images/glyphicons-halflings-white.png";
@iconSpritePath: "../../images/glyphicons-halflings.png";
@iconWhiteSpritePath: "../../images/glyphicons-halflings-white.png";

// Input placeholder text color
@placeholderText: @grayLight;
Expand Down
2 changes: 1 addition & 1 deletion public/styles/init.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ form.well{padding:14px;}
.the-icons{margin-left:0;list-style:none;}
.the-icons i:hover{background-color:rgba(255, 0, 0, 0.25);}
.bootstrap-examples .thumbnail{margin-bottom:9px;background-color:#fff;}
@media (max-width:480px){body{padding-top:70px;} h2{margin-top:27px;} h2 small{display:block;line-height:18px;} h3{margin-top:18px;} .jumbotron h1,.jumbotron p{text-align:center;margin-right:0;} .jumbotron h1{font-size:45px;margin-right:0;} .jumbotron p{margin-right:0;margin-left:0;font-size:18px;line-height:24px;} .jumbotron .btn{display:block;font-size:18px;padding:10px 14px;margin:0 auto 10px;} .masthead{padding-top:0;} .quick-links{margin:40px 0 0;} .quick-links .divider{display:none;} .example-sites{margin-left:0;} .example-sites>li{float:none;display:block;max-width:280px;margin:0 auto 18px;text-align:center;} .example-sites .thumbnail>img{max-width:270px;} table code{white-space:normal;word-wrap:break-word;word-break:break-all;} .modal-example .modal{position:relative;top:auto;right:auto;bottom:auto;left:auto;}}@media (max-width:768px){body{padding-top:0;} .jumbotron .btn{margin-bottom:10px;} .subnav{position:static;top:auto;z-index:auto;width:auto;height:auto;background:#fff;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .subnav .nav>li{float:none;} .subnav .nav>li>a{border:0;} .subnav .nav>li+li>a{border-top:1px solid #e5e5e5;} .subnav .nav>li:first-child>a,.subnav .nav>li:first-child>a:hover{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} .large-bird{display:none;} .popover-well .popover-wrapper{margin-left:0;} .show-grid [class*="span"]{margin-bottom:5px;} .footer .pull-right{float:none;} .footer p{margin-bottom:9px;}}@media (min-width:480px) and (max-width:768px){.jumbotron h1{font-size:54px;} .jumbotron p{margin-right:0;margin-left:0;}}@media (min-width:768px) and (max-width:980px){body{padding-top:0;} .jumbotron h1{font-size:72px;}}@media (max-width:980px){.navbar-fixed-top .brand{float:left;margin-left:0;padding-left:10px;padding-right:10px;} .quick-links li{display:inline-block;margin:5px;}}@media (min-width:1210px){.subnav-fixed .nav{width:1168px;}}body{position:relative;padding-top:90px;background-color:white;background-image:url(/images/grid-18px-masked.png);background-repeat:repeat-x;background-position:0 40px;}
@media (max-width:480px){body{padding-top:70px;} h2{margin-top:27px;} h2 small{display:block;line-height:18px;} h3{margin-top:18px;} .jumbotron h1,.jumbotron p{text-align:center;margin-right:0;} .jumbotron h1{font-size:45px;margin-right:0;} .jumbotron p{margin-right:0;margin-left:0;font-size:18px;line-height:24px;} .jumbotron .btn{display:block;font-size:18px;padding:10px 14px;margin:0 auto 10px;} .masthead{padding-top:0;} .quick-links{margin:40px 0 0;} .quick-links .divider{display:none;} .example-sites{margin-left:0;} .example-sites>li{float:none;display:block;max-width:280px;margin:0 auto 18px;text-align:center;} .example-sites .thumbnail>img{max-width:270px;} table code{white-space:normal;word-wrap:break-word;word-break:break-all;} .modal-example .modal{position:relative;top:auto;right:auto;bottom:auto;left:auto;}}@media (max-width:768px){body{padding-top:0;} .jumbotron .btn{margin-bottom:10px;} .subnav{position:static;top:auto;z-index:auto;width:auto;height:auto;background:#fff;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .subnav .nav>li{float:none;} .subnav .nav>li>a{border:0;} .subnav .nav>li+li>a{border-top:1px solid #e5e5e5;} .subnav .nav>li:first-child>a,.subnav .nav>li:first-child>a:hover{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} .large-bird{display:none;} .popover-well .popover-wrapper{margin-left:0;} .show-grid [class*="span"]{margin-bottom:5px;} .footer .pull-right{float:none;} .footer p{margin-bottom:9px;}}@media (min-width:480px) and (max-width:768px){.jumbotron h1{font-size:54px;} .jumbotron p{margin-right:0;margin-left:0;}}@media (min-width:768px) and (max-width:980px){body{padding-top:0;} .jumbotron h1{font-size:72px;}}@media (max-width:980px){.navbar-fixed-top .brand{float:left;margin-left:0;padding-left:10px;padding-right:10px;} .quick-links li{display:inline-block;margin:5px;}}@media (min-width:1210px){.subnav-fixed .nav{width:1168px;}}body{position:relative;padding-top:90px;background-color:white;background-image:url(../images/grid-18px-masked.png);background-repeat:repeat-x;background-position:0 40px;}
.jumbotron{position:relative;}
.jumbotron h1{margin-bottom:9px;font-size:81px;letter-spacing:-1px;line-height:1;}
.jumbotron p{margin-bottom:18px;font-weight:300;}
Expand Down
2 changes: 1 addition & 1 deletion public/styles/init.less
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ body {
position: relative;
padding-top: 90px;
background-color: white;
background-image: url(/images/grid-18px-masked.png);
background-image: url(../images/grid-18px-masked.png);
background-repeat: repeat-x;
background-position: 0 40px; }
.jumbotron {
Expand Down
2 changes: 1 addition & 1 deletion srv.app.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ define(['kickstart', 'module', 'path', 'fs'], function (kickstart, module, path,
/**
* Catch request for serving walkLED example page
*/
srv.all('/examples/walkLED.html', function(req, res) {
srv.all('/example-walkLED.html', function(req, res) {
res.render('example-walkLED', {jsApp: 'walkLED', active: 'examples', title: 'noduino', 'examples': examples});
});

Expand Down
4 changes: 2 additions & 2 deletions views/home.jade
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ section#homeContent
p
a(href="https://github.com/semu/noduino") Download noduino
| , install needed packages with npm, fetch git submodules, upload duino's file <code>duino/src/du.ino</code> to your Arduino and you are good to go. An example on how to catch and fire events with an HTML interface is provided as well. Take a look at
a(href="/examples/walkLED.html") LED Walker
a(href="/example-walkLED.html") LED Walker
| …
.span9
pre.prettyprint.linenums=examples.node
Expand Down Expand Up @@ -137,7 +137,7 @@ section#homeContent
.row
.span12
p.exampleLinks
a.btn.btn-success(href="/examples/walkLED.html")
a.btn.btn-success(href="/example-walkLED.html")
i.icon-gift.icon-white
| View Example
.page-header
Expand Down
10 changes: 5 additions & 5 deletions views/layout.jade
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
html(lang="en")
head
title Arduino control nodeuino for JavaScript and Node.js with WebSockets and HTML5
link(rel="stylesheet", href="/styles/bootstrap/init.css")
link(rel="stylesheet", href="/styles/prettify.css")
link(rel="stylesheet", href="/styles/init.css")
script(data-main="/scripts/app." + jsApp, type="text/javascript", src="/scripts/vendor/require-jquery.js")
link(rel="stylesheet", href="styles/bootstrap/init.css")
link(rel="stylesheet", href="styles/prettify.css")
link(rel="stylesheet", href="styles/init.css")
script(data-main="scripts/app." + jsApp, type="text/javascript", src="scripts/vendor/require-jquery.js")
script(type="text/javascript", src="http://localhost:8090/socket.io/socket.io.js")
body
.navbar.navbar-fixed-top(style="z-index: 4;position:absolute;")
Expand All @@ -22,7 +22,7 @@ html(lang="en")
b.caret
ul.dropdown-menu
li
a(href="/examples/walkLED.html") Adjustable LED Walker
a(href="/example-walkLED.html") Adjustable LED Walker
li
a(href="https://github.com/semu/noduino") View on GitHub &raquo;
div.nav-collapse.pull-right
Expand Down

0 comments on commit 4467ec7

Please sign in to comment.