added basic bootstrap navbar and layout and everything

This commit is contained in:
nilsding 2014-08-01 11:55:50 +02:00
parent 601b27d3b3
commit 310e7e80b4
8 changed files with 27 additions and 35 deletions

View File

@ -0,0 +1,4 @@
#= require jquery
#= require jquery_ujs
#= require turbolinks
#= require_tree .

View File

@ -1,16 +0,0 @@
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// compiled file.
//
// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require jquery
//= require jquery_ujs
//= require turbolinks
//= require_tree .

View File

@ -1,15 +0,0 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
* compiled file so the styles you add here take precedence over styles defined in any styles
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
*= require_tree .
*= require_self
*/

View File

@ -0,0 +1,5 @@
@import "bootswatch/flatly/variables";
@import "bootstrap";
body { padding-top: $navbar-height; }
@import "bootswatch/flatly/bootswatch";
@import "base";

View File

@ -0,0 +1 @@
/* all custom SCSS should go into here */

View File

@ -6,4 +6,15 @@
= javascript_include_tag 'application', 'data-turbolinks-track' => true = javascript_include_tag 'application', 'data-turbolinks-track' => true
= csrf_meta_tags = csrf_meta_tags
%body %body
%nav.navbar.navbar-default.navbar-fixed-top{role: "navigation"}
.container
.navbar-header
%button.navbar-toggle{"data-target" => "#j2-main-navbar-collapse", "data-toggle" => "collapse", type: "button"}
%span.sr-only Toggle navigation
%span.icon-bar
%span.icon-bar
%span.icon-bar
%a.navbar-brand{href: "/"} justask2
#j2-main-navbar-collapse.collapse.navbar-collapse
%ul.nav.navbar-nav
= yield = yield

View File

@ -1,2 +1,3 @@
%h1 Static#about .container
%p Find me in app/views/static/about.html.haml %h1 Static#about
%p Find me in app/views/static/about.html.haml

View File

@ -1,2 +1,3 @@
%h1 Static#index .container
%p Find me in app/views/static/index.html.haml %h1 Static#index
%p Find me in app/views/static/index.html.haml