Introduce bootstrap-sass and extras

This commit is contained in:
Petko Bordjukov 2014-09-17 12:42:37 +03:00
parent f37ef78058
commit 50cd123935
8 changed files with 53 additions and 2 deletions

View File

@ -37,6 +37,10 @@ gem 'puma'
gem 'globalize', '~> 4.0.2' gem 'globalize', '~> 4.0.2'
gem 'bootstrap-sass'
gem 'bootstrap-sass-extras'
gem 'autoprefixer-rails'
group :development do group :development do
gem 'spring' gem 'spring'
gem 'spring-commands-rspec' gem 'spring-commands-rspec'

View File

@ -37,7 +37,13 @@ GEM
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (5.0.1.20140414130214) arel (5.0.1.20140414130214)
autoprefixer-rails (3.1.0.20140911)
execjs
bcrypt (3.1.7) bcrypt (3.1.7)
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
bootstrap-sass-extras (0.0.6)
rails (>= 3.1.0)
builder (3.2.2) builder (3.2.2)
capistrano (3.2.1) capistrano (3.2.1)
i18n i18n
@ -261,6 +267,9 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
autoprefixer-rails
bootstrap-sass
bootstrap-sass-extras
capistrano capistrano
capistrano-rails capistrano-rails
capistrano-rvm capistrano-rvm

View File

@ -12,4 +12,4 @@
// //
//= require jquery //= require jquery
//= require jquery_ujs //= require jquery_ujs
//= require_tree . //= require_directory .

View File

@ -0,0 +1,3 @@
//= require jquery
//= require jquery_ujs
//= require bootstrap-sprockets

View File

@ -0,0 +1,5 @@
//= require_directory .
@import "bootstrap-sprockets";
@import "bootstrap";
@import "bootstrap/theme";

View File

@ -0,0 +1,3 @@
body {
padding-top: 70px;
}

View File

@ -0,0 +1,27 @@
doctype html
html
head
meta charset="utf-8"
meta http-equiv="X-UA-Compatible" content="IE=edge"
meta name="viewport" content="width=device-width, initial-scale=1"
title "Clarion"
= stylesheet_link_tag "management/application"
= csrf_meta_tags
body
nav.navbar.navbar-default.navbar-fixed-top
.container
.navbar-header
button.navbar-toggle.collapsed type="button" data-toggle="collapse" data-target=".navbar-collapse"
span.sr-only Toggle navigation
span.icon-bar
span.icon-bar
span.icon-bar
= link_to 'Clarion', root_path, class: 'navbar-brand'
.navbar-collapse.collapse
ul.nav.navbar-nav
li.active = link_to 'Home', root_path
li = link_to 'Users', root_path
div.container
== yield
= javascript_include_tag "management/application"

View File

@ -5,4 +5,4 @@ Rails.application.config.assets.version = '1.0'
# Precompile additional assets. # Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# Rails.application.config.assets.precompile += %w( search.js ) Rails.application.config.assets.precompile += %w( management/application.css management/application.js )