From 66601455626f8f39bda10c545c9661449a1e29b3 Mon Sep 17 00:00:00 2001 From: Paul Martin Date: Tue, 28 Mar 2017 16:12:40 -0500 Subject: [PATCH 1/3] Added collapsable nav bar. Moved buttons to line up --- .gitignore | 8 +++++++ app/partials/tutorials.html | 20 ++++++++++++++++ css/main.css | 16 +++++++++++++ index.html | 43 ++++++++++++++++++++++----------- lib/GruntFile.js | 24 +++++++++++++++++++ lib/bower.json | 18 ++++++++++++++ lib/package.json | 24 +++++++++++++++++++ www/tutorials.html | 48 ------------------------------------- 8 files changed, 139 insertions(+), 62 deletions(-) create mode 100644 .gitignore create mode 100644 app/partials/tutorials.html create mode 100644 lib/GruntFile.js create mode 100644 lib/bower.json create mode 100644 lib/package.json delete mode 100644 www/tutorials.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..863eb5f --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +.DS_Store +*.sublime-project +*.sublime-workspace +*.sublime-grunt.cache +*.sass-cache +*.css.map +lib/node_modules +lib/bower_components \ No newline at end of file diff --git a/app/partials/tutorials.html b/app/partials/tutorials.html new file mode 100644 index 0000000..50d221c --- /dev/null +++ b/app/partials/tutorials.html @@ -0,0 +1,20 @@ +
+
+
+

Tutorials

+
+
+
+ +
+
+
+
+ diff --git a/css/main.css b/css/main.css index 6287d6b..88f6c09 100644 --- a/css/main.css +++ b/css/main.css @@ -92,7 +92,23 @@ 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; } + +.nav-item li a{ + font-size: 1.5em !important; + margin-right: 15px; + color: #c3c4c6 !important; + opacity: 0.5 !important; +} + +.move-me { + margin-top: 35px !important; +} + +.com{ + margin-top: 20px !important; +} diff --git a/index.html b/index.html index 32376fd..56c38fa 100644 --- a/index.html +++ b/index.html @@ -5,9 +5,9 @@ - - - + + + - +
@@ -153,7 +162,7 @@

Community

code

Contribute

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!

- Contribute + Contribute
@@ -170,5 +179,11 @@

Community

+ + + + + + diff --git a/lib/GruntFile.js b/lib/GruntFile.js new file mode 100644 index 0000000..7ee54cc --- /dev/null +++ b/lib/GruntFile.js @@ -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']); +}; \ No newline at end of file diff --git a/lib/bower.json b/lib/bower.json new file mode 100644 index 0000000..704f91f --- /dev/null +++ b/lib/bower.json @@ -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" + } +} \ No newline at end of file diff --git a/lib/package.json b/lib/package.json new file mode 100644 index 0000000..e9ff39a --- /dev/null +++ b/lib/package.json @@ -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" + } +} diff --git a/www/tutorials.html b/www/tutorials.html deleted file mode 100644 index 19fce71..0000000 --- a/www/tutorials.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - DeepForge - - - - - - - - - -
-
-
-

Tutorials

-
-
-
- -
-
-
-
- - - From 1a35aa80b17f2c78d82fd67597b77dd4bafb9d7f Mon Sep 17 00:00:00 2001 From: Paul Martin Date: Wed, 29 Mar 2017 09:31:46 -0500 Subject: [PATCH 2/3] Fixed font size and gap in header --- css/main.css | 18 +++++++++++++----- index.html | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/css/main.css b/css/main.css index 88f6c09..057d8cc 100644 --- a/css/main.css +++ b/css/main.css @@ -4,6 +4,7 @@ .really-dark { background-color: #040620!important; + margin-bottom: -150px !important; } .logo-grey { @@ -98,11 +99,18 @@ img.overview { display: block; } -.nav-item li a{ - font-size: 1.5em !important; - margin-right: 15px; - color: #c3c4c6 !important; - opacity: 0.5 !important; + +.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 { diff --git a/index.html b/index.html index 56c38fa..099b641 100644 --- a/index.html +++ b/index.html @@ -179,7 +179,7 @@

Community

- + From 1383fb0848dfd36cf8414b75fcabe0529b906bd9 Mon Sep 17 00:00:00 2001 From: Paul Martin Date: Wed, 29 Mar 2017 09:33:55 -0500 Subject: [PATCH 3/3] Fixed button allignment --- css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index 057d8cc..431887a 100644 --- a/css/main.css +++ b/css/main.css @@ -118,5 +118,5 @@ button .navbar-toggle{ } .com{ - margin-top: 20px !important; + margin-top: 1px !important; }