Skip to content
This repository has been archived by the owner on Feb 8, 2019. It is now read-only.

Commit

Permalink
Merge pull request #83 from gmfc/clean-build
Browse files Browse the repository at this point in the history 
Clean build
  • Loading branch information
@gmfc
gmfc committed Oct 17, 2016
2 parents a16225a + da090cb commit 4f09510
Show file tree
Hide file tree
Showing 13 changed files with 90 additions and 25 deletions.
Binary file added assets/Logo_Plataforma.ico
View file
Binary file not shown.
Binary file removed assets/icon.ico
View file
Binary file not shown.
Binary file added assets/logo.ico
View file
Binary file not shown.
7 changes: 5 additions & 2 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@ gulp.task('dist:win', ['build'], function() {
var nw = new NwBuilder({
files: ['./ui/**/**'],
platforms: ['win32'],
version: '0.17.6',
appVersion: pack.version,
winIco: './assets/logo.ico',
flavor: 'normal',
appName: 'Plataforma de Força',
appName: 'Plataforma',
buildType: 'versioned',
winIco: './assets/icon.ico'
forceDownload: false
});
nw.on('log', console.log);
nw.build().then(function() {
Expand All @@ -72,3 +74,4 @@ gulp.task('dist:win', ['build'], function() {
});

gulp.task('build', ['clean:js', 'rtcontrol', 'controladorIndex']);
gulp.task('dist', ['dist:win']);
7 changes: 4 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
"main": "./ui/index.html",
"scripts": {
"test": "./node_modules/.bin/mocha --reporter spec -s 0",
"watch": "./node_modules/.bin/mocha --reporter nyan --watch",
"auto": "gulp stream",
"watch:test": "./node_modules/.bin/mocha --reporter nyan --watch",
"watch:build": "gulp stream",
"start": "nw .",
"docs": "gulp docs",
"build": "gulp build"
"build": "gulp build",
"dist": "gilp dist"
},
"repository": {
"type": "git",
Expand Down
12 changes: 7 additions & 5 deletions ui/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@

<head>
<meta charset="UTF-8">
<title>Plataforma de força: Menu</title>
<title>Plataforma de força: Sobre</title>
<link rel="icon" type="image/png" href="./img/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="./img/favicon-16x16.png" sizes="16x16" />
<script type="text/javascript" src="libs/jquery-2.2.1.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="css/semantic.min.css">
Expand All @@ -13,11 +15,11 @@
.ui.menu .item i.icon {
margin-right: 1.5em;
}

.main.container {
margin-top: 7em;
}

.ui.menu .item {
padding-top: 0;
padding-bottom: 0;
Expand All @@ -30,7 +32,7 @@
<div class="ui fixed inverted menu">
<div class="ui container">
<a href="./index.html" class="header item">
<i class="big block layout icon"></i> Menu
<img src="./img/logo.svg" style="margin-right: 42px;" alt="" /> Menu
</a>
<div class="ui simple dropdown item">
Medições <i class="dropdown icon"></i>
Expand All @@ -52,4 +54,4 @@
</div>
</body>

</html>
</html>
Binary file added ui/img/favicon-16x16.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ui/img/favicon-32x32.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions ui/img/logo.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions ui/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<head>
<meta charset="UTF-8">
<title>Plataforma de força: Menu</title>
<link rel="icon" type="image/png" href="./img/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="./img/favicon-16x16.png" sizes="16x16" />
<script type="text/javascript" src="libs/jquery-2.2.1.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="css/semantic.min.css">
Expand All @@ -13,11 +15,11 @@
.ui.menu .item i.icon {
margin-right: 1.5em;
}

.main.container {
margin-top: 7em;
}

.ui.menu .item {
padding-top: 0;
padding-bottom: 0;
Expand All @@ -30,7 +32,7 @@
<div class="ui fixed inverted menu">
<div class="ui container">
<a href="./index.html" class="header item">
<i class="big block layout icon"></i> Menu
<img src="./img/logo.svg" style="margin-right: 42px;" alt="" /> Menu
</a>
<div class="ui simple dropdown item">
Medições <i class="dropdown icon"></i>
Expand All @@ -52,4 +54,4 @@
</div>
</body>

</html>
</html>
20 changes: 11 additions & 9 deletions ui/medicao.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<head>
<meta charset="UTF-8">
<title>Plataforma de força</title>
<link rel="icon" type="image/png" href="./img/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="./img/favicon-16x16.png" sizes="16x16" />
<script type="text/javascript" src="libs/jquery-2.2.1.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">

Expand All @@ -19,11 +21,11 @@
.ui.menu .item i.icon {
margin-right: 1.5em;
}

.main.container {
margin-top: 7em;
}

.ui.menu .item {
padding-top: 0;
padding-bottom: 0;
Expand All @@ -32,18 +34,18 @@

<style>
.chart {}

.main text {
font: 10px sans-serif;
}

.axis line,
.axis path {
shape-rendering: crispEdges;
stroke: black;
fill: none;
}

circle {
fill: steelblue;
}
Expand All @@ -55,11 +57,11 @@
stroke-width: 2;
fill: none;
}

line {
stroke: black;
}

text {
font-family: Arial;
font-size: 9pt;
Expand All @@ -72,7 +74,7 @@
<div class="ui fixed inverted menu">
<div class="ui container">
<a href="./index.html" class="header item">
<i class="big block layout icon"></i> Menu
<img src="./img/logo.svg" style="margin-right: 42px;" alt="" /> Menu
</a>
<div class="ui simple dropdown item">
Medições <i class="dropdown icon"></i>
Expand Down Expand Up @@ -171,4 +173,4 @@ <h2>Estabilograma</h2>
<script src="./js/controladorIndex.js"></script>
</body>

</html>
</html>
3 changes: 2 additions & 1 deletion ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"window": {
"toolbar": false,
"width": 950,
"height": 800
"height": 800,
"icon": "./img/favicon-32x32.png"
},
"homepage": "https://github.com/gmfc/pfnw5"
}
4 changes: 3 additions & 1 deletion ui/realtime.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<head>
<meta charset="UTF-8">
<title>Plataforma de força</title>
<link rel="icon" type="image/png" href="./img/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="./img/favicon-16x16.png" sizes="16x16" />
<script type="text/javascript" src="libs/jquery-2.2.1.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">

Expand All @@ -30,7 +32,7 @@
<div class="ui fixed inverted menu">
<div class="ui container">
<a href="./index.html" class="header item">
<i class="big block layout icon"></i> Menu
<img src="./img/logo.svg" style="margin-right: 42px;" alt="" /> Menu
</a>
<div class="ui simple dropdown item">
Medições <i class="dropdown icon"></i>
Expand Down

0 comments on commit 4f09510

Please sign in to comment.