Skip to content

Commit ba5d456

Browse files
committed
bootstrap install
1 parent c4e109c commit ba5d456

File tree

7 files changed

+61
-72
lines changed

7 files changed

+61
-72
lines changed

Gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ gem 'rails', '4.1.4'
55
gem 'sass-rails', '~> 4.0.3'
66
gem 'uglifier', '>= 1.3.0'
77
gem 'coffee-rails', '~> 4.0.0'
8+
gem 'bootstrap-sass', '~> 3.2.0'
9+
gem 'flat-ui-sass', github: 'wingrunr21/flat-ui-sass'
10+
gem 'autoprefixer-rails'
811
gem 'slim-rails'
912

1013
gem 'devise'

Gemfile.lock

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
GIT
2+
remote: git://github.com/wingrunr21/flat-ui-sass.git
3+
revision: b6e792b216b6cac482586d60b5d31e1df3f43619
4+
specs:
5+
flat-ui-sass (2.1.3)
6+
bootstrap-sass (>= 3.1)
7+
sass (>= 3.2.0)
8+
19
GEM
210
remote: https://rubygems.org/
311
specs:
@@ -28,6 +36,8 @@ GEM
2836
thread_safe (~> 0.1)
2937
tzinfo (~> 1.1)
3038
arel (5.0.1.20140414130214)
39+
autoprefixer-rails (3.0.1.20140826)
40+
execjs
3141
aws-sdk (1.53.0)
3242
aws-sdk-v1 (= 1.53.0)
3343
aws-sdk-v1 (1.53.0)
@@ -38,6 +48,8 @@ GEM
3848
coderay (>= 1.0.0)
3949
erubis (>= 2.6.6)
4050
rack (>= 0.9.0)
51+
bootstrap-sass (3.2.0.2)
52+
sass (~> 3.2)
4153
builder (3.2.2)
4254
cancancan (1.9.2)
4355
climate_control (0.0.3)
@@ -178,11 +190,14 @@ PLATFORMS
178190
ruby
179191

180192
DEPENDENCIES
193+
autoprefixer-rails
181194
aws-sdk
182195
better_errors
196+
bootstrap-sass (~> 3.2.0)
183197
cancancan
184198
coffee-rails (~> 4.0.0)
185199
devise
200+
flat-ui-sass!
186201
jbuilder (~> 2.0)
187202
jquery-rails
188203
omniauth

app/assets/javascripts/application.js

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
//= require angular
1717
//= require angular-route
1818
//= require ui-bootstrap
19+
//= require bootstrap-sprockets
1920
//= require restangular
2021
//= require angapp
2122
//= require controllers

app/assets/stylesheets/application.css

-67
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
* This is a manifest file that'll be compiled into application.css, which will include all the files
3+
* listed below.
4+
*
5+
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
6+
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
7+
*
8+
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
9+
* compiled file so the styles you add here take precedence over styles defined in any styles
10+
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
11+
* file per style scope.
12+
*
13+
*= require_tree .
14+
*= require_self
15+
*= require bootstrap
16+
*/
17+
18+
@import "bootstrap-sprockets";
19+
@import "bootstrap";

app/views/pages/home.html.slim

-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ doctype html
22
html
33
head
44
title Songsync|HomePage
5-
//<link href="/Users/rosexu/SongSync/vendor/assets/stylesheets/bootstrap.css" rel="stylesheet">
6-
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
7-
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
8-
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
9-
<script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
105

116
body
127
h1 HomePage

config/locales/en.bootstrap.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Sample localization file for English. Add more files in this directory for other locales.
2+
# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
3+
4+
en:
5+
breadcrumbs:
6+
application:
7+
root: "Index"
8+
pages:
9+
pages: "Pages"
10+
helpers:
11+
actions: "Actions"
12+
links:
13+
back: "Back"
14+
cancel: "Cancel"
15+
confirm: "Are you sure?"
16+
destroy: "Delete"
17+
new: "New"
18+
edit: "Edit"
19+
titles:
20+
edit: "Edit %{model}"
21+
save: "Save %{model}"
22+
new: "New %{model}"
23+
delete: "Delete %{model}"

0 commit comments

Comments
 (0)