Skip to content

Added collapsable nav bar. Moved buttons to line up #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added collapsable nav bar. Moved buttons to line up #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6660145
Added collapsable nav bar. Moved buttons to line up
Dmart331 Mar 28, 2017
1a35aa8
Fixed font size and gap in header
Dmart331 Mar 29, 2017
1383fb0
Fixed button allignment
Dmart331 Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.DS_Store
*.sublime-project
*.sublime-workspace
*.sublime-grunt.cache
*.sass-cache
*.css.map
lib/node_modules
lib/bower_components
20 changes: 20 additions & 0 deletions app/partials/tutorials.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<div class="container">
<div class="section">
<div class="row center">
<h4 class="col s12 light header center">Tutorials</h4>
</div>
<div class="row center">
<div class="video-container">
<iframe width="853" height="480" src="//www.youtube.com/embed/Q8TXgCzxEnw?rel=0" frameborder="0" allowfullscreen></iframe>
</div>
</div>
</div>
</div>
<footer class="page-footer really-dark">
<div class="footer-copyright">
<div class="container">
<span>&#169; 2017 DeepForge</span>
<a class="grey-text text-lighten-4 right" href="https://github.com/deepforge-dev/deepforge/blob/master/LICENSE" target="_blank">Apache v2 License</a>
</div>
</div>
</footer>
24 changes: 24 additions & 0 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

.really-dark {
background-color: #040620!important;
margin-bottom: -150px !important;
}

.logo-grey {
Expand Down Expand Up @@ -92,7 +93,30 @@ img.overview {
.brand-logo {
background: url(./deepforge-logo.png) no-repeat 10px 12px;
background-size: 75%;
margin-left: 15px;
height: 60px;
width: 200px;
display: block;
}


.section.no-pad-bot {
margin-top: -30px;
}

.navbar-default .navbar-nav>li>a {
color: #777;
font-size: 1.2em;
}

button .navbar-toggle{
background-color: #040620 !important;
}

.move-me {
margin-top: 35px !important;
}

.com{
margin-top: 1px !important;
}
43 changes: 29 additions & 14 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<link rel="stylesheet" href="css/materialize.min.css" type="text/css" media="screen" charset="utf-8">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="css/main.css" type="text/css" media="screen" charset="utf-8">
<script charset="utf-8" src="lib/jquery.min.js"></script>
<script charset="utf-8" src="lib/materialize.min.js"></script>
<script charset="utf-8" src="main.js"></script>
<link rel="stylesheet" href="lib/node_modules/bootstrap/dist/css/bootstrap.min.css">


<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Expand All @@ -20,17 +20,26 @@
</script>
</head>
<body>
<nav>
<nav class="navbar navbar-default" ng-controller="NavCtrl">
<div class="nav-wrapper really-dark">
<a href="#" class="brand-logo"></a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<!--<li><a href="tutorials.html">Tutorials</a></li>-->
<li><a href="https://github.com/deepforge-dev/deepforge/wiki">Wiki</a></li>
<!--<li><a href="https://gitter.im/deepforge-dev/deepforge">Chat</a></li>-->
<li><a href="https://github.com/deepforge-dev/deepforge/issues">Issues</a></li>
</ul>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<a href="#" class="brand-logo"></a>
<ul class="nav navbar-nav navbar-right">
<li>
<a href="https://github.com/deepforge-dev/deepforge/wiki">Wiki</a>
</li> <li>
<a href="https://github.com/deepforge-dev/deepforge/issues">Issues</a>
</li>
</ul>
</div>
</div>
</nav>
</nav>

<div class="section no-pad-bot banner-background">
<div class="row center">
<h3 class="logo-grey">A Modern Development Environment for Deep Learning</h3>
Expand Down Expand Up @@ -145,15 +154,15 @@ <h4 class="col s12 light header center">Community</h4>
<i class="material-icons large">announcement</i>
<p class="feature-title">Issue Tracker</p>
<p class="caption">The Github issue tracker is a good place to get answers for common questions and report any new issues.</p>
<a class="btn waves-effect waves-light" href="https://github.com/deepforge-dev/deepforge/issues">Issues</a>
<a class="btn waves-effect waves-light move-me" href="https://github.com/deepforge-dev/deepforge/issues">Issues</a>
</div>
</div>
<div class="col s12 m4">
<div class="center promo">
<i class="material-icons large">code</i>
<p class="feature-title">Contribute</p>
<p class="caption">Contributions are welcome! Just fork the project and submit some PR's or develop your own custom extensions. If you have any questions, just reach out on Gitter! </p>
<a class="btn waves-effect waves-light" href="https://github.com/deepforge-dev/deepforge/wiki/Contributing">Contribute</a>
<a class="btn waves-effect waves-light com" href="https://github.com/deepforge-dev/deepforge/wiki/Contributing">Contribute</a>
</div>
</div>
</div>
Expand All @@ -170,5 +179,11 @@ <h4 class="col s12 light header center">Community</h4>
</div>
</div>
</footer>
<script src="lib/bower_components/angular/angular.min.js"></script>
<script src="lib/bower_components/angular-route/angular-route.min.js"></script>
<script src="lib/node_modules/jquery/dist/jquery.min.js"></script>
<script src="lib/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
<script charset="utf-8" src="lib/materialize.min.js"></script>
<script charset="utf-8" src="main.js"></script>
</body>
</html>
24 changes: 24 additions & 0 deletions lib/GruntFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = function(grunt) {
grunt.initConfig({
jshint: {
files: ['../app/**/*.js'],
options: {
predef: ["document", "console", "$" ],
esnext: true,
browser: true,
globalstrict: true,
globals: {"angular": true, "app": true, "$http": true},
}
},

watch: {
javascripts: {
files: ['../app/**/*.js'],
tasks: ['jshint']
}
}
});

require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
grunt.registerTask('default', ['jshint', 'watch']);
};
18 changes: 18 additions & 0 deletions lib/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "lib",
"authors": [],
"description": "",
"main": "",
"moduleType": [],
"license": "MIT",
"homepage": "",
"ignore": [
"**/.*",
"node_modules",
"bower_components"
],
"dependencies": {
"angular": "^1.5.9",
"angular-route": "^1.5.7"
}
}
24 changes: 24 additions & 0 deletions lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "lib",
"version": "1.0.0",
"description": "",
"main": "Gruntfile.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "Drew Martin",
"license": "ISC",
"devDependencies": {
"grunt": "^1.0.1",
"grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-sass": "^1.0.0",
"grunt-contrib-watch": "^1.0.0",
"jshint": "^2.9.4",
"jshint-stylish": "^2.2.1",
"matchdep": "^1.0.1"
},
"dependencies": {
"bootstrap": "^3.3.7",
"jquery": "^3.1.1"
}
}
48 changes: 0 additions & 48 deletions www/tutorials.html
View file
Open in desktop

This file was deleted.