Merge remote-tracking branch 'remotes/origin/bootstrap3'
Conflicts: app/views/packages/index.html.erb
This commit is contained in:
commit
0277a4e3d0
7 changed files with 61 additions and 35 deletions
3
Gemfile
3
Gemfile
|
|
@ -56,7 +56,8 @@ group :development do
|
|||
end
|
||||
|
||||
# Twitter Bootstrap template
|
||||
gem 'bootstrap-sass'
|
||||
#gem 'bootstrap-sass'
|
||||
gem 'anjlab-bootstrap-rails', '>= 3.0.0.0'
|
||||
|
||||
# Pagination
|
||||
# Hint: rails generate kaminari:views bootstrap
|
||||
|
|
|
|||
32
Gemfile.lock
32
Gemfile.lock
|
|
@ -25,15 +25,16 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
anjlab-bootstrap-rails (3.0.0.1)
|
||||
railties (>= 3.0)
|
||||
sass (>= 3.2)
|
||||
arel (4.0.0)
|
||||
atomic (1.1.10)
|
||||
atomic (1.1.13)
|
||||
better_errors (0.9.0)
|
||||
coderay (>= 1.0.0)
|
||||
erubis (>= 2.6.6)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bootstrap-sass (2.3.2.1)
|
||||
sass (~> 3.2)
|
||||
builder (3.1.4)
|
||||
callsite (0.0.11)
|
||||
coderay (1.0.9)
|
||||
|
|
@ -46,13 +47,12 @@ GEM
|
|||
coffee-script-source (1.6.3)
|
||||
debug_inspector (0.0.2)
|
||||
erubis (2.7.0)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
execjs (2.0.0)
|
||||
fancybox2-rails (0.2.4)
|
||||
railties (>= 3.1.0)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.4)
|
||||
jbuilder (1.4.2)
|
||||
i18n (0.6.5)
|
||||
jbuilder (1.5.0)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.2.0)
|
||||
jquery-rails (3.0.4)
|
||||
|
|
@ -62,7 +62,7 @@ GEM
|
|||
kaminari (0.14.1)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
libv8 (3.11.8.17)
|
||||
libv8 (3.16.14.3)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
|
|
@ -70,9 +70,9 @@ GEM
|
|||
callsite
|
||||
rack-contrib
|
||||
railties
|
||||
mime-types (1.23)
|
||||
mime-types (1.24)
|
||||
minitest (4.7.5)
|
||||
multi_json (1.7.7)
|
||||
multi_json (1.7.9)
|
||||
pg (0.16.0)
|
||||
polyglot (0.3.3)
|
||||
rack (1.5.2)
|
||||
|
|
@ -97,7 +97,7 @@ GEM
|
|||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
ref (1.0.5)
|
||||
sass (3.2.9)
|
||||
sass (3.2.10)
|
||||
sass-rails (4.0.0)
|
||||
railties (>= 4.0.0.beta, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
|
|
@ -114,15 +114,15 @@ GEM
|
|||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sqlite3 (1.3.7)
|
||||
therubyracer (0.11.4)
|
||||
libv8 (~> 3.11.8.12)
|
||||
sqlite3 (1.3.8)
|
||||
therubyracer (0.12.0)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
thor (0.18.1)
|
||||
thread_safe (0.1.2)
|
||||
atomic
|
||||
tilt (1.4.1)
|
||||
treetop (1.4.14)
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (1.3.0)
|
||||
|
|
@ -136,9 +136,9 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
anjlab-bootstrap-rails (>= 3.0.0.0)
|
||||
better_errors
|
||||
binding_of_caller
|
||||
bootstrap-sass
|
||||
coffee-rails (~> 4.0.0)
|
||||
fancybox2-rails (~> 0.2.4)
|
||||
jbuilder (~> 1.2)
|
||||
|
|
|
|||
|
|
@ -14,4 +14,5 @@
|
|||
//= require jquery_ujs
|
||||
//= require fancybox
|
||||
//= require turbolinks
|
||||
//= require twitter/bootstrap
|
||||
//= require_tree .
|
||||
|
|
|
|||
|
|
@ -1,16 +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 top of the
|
||||
* compiled file, but it's generally better to create a new file per style scope.
|
||||
*
|
||||
*= require_self
|
||||
*= require_tree .
|
||||
*= require fancybox
|
||||
*/
|
||||
|
||||
//= require bootstrap
|
||||
|
|
@ -1,2 +1,16 @@
|
|||
@import 'bootstrap';
|
||||
@import 'bootstrap-responsive';
|
||||
/*
|
||||
* 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 top of the
|
||||
* compiled file, but it's generally better to create a new file per style scope.
|
||||
*
|
||||
*= require_self
|
||||
*= require_tree .
|
||||
*= require fancybox
|
||||
*/
|
||||
|
||||
@import "twitter/bootstrap";
|
||||
|
|
|
|||
|
|
@ -24,6 +24,28 @@ foo
|
|||
<!-- Show only packages with screenshots -->
|
||||
<!--</label>-->
|
||||
</div>
|
||||
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#"><i class="icon-align-left"></i></a>
|
||||
<a class="btn" href="#"><i class="icon-align-center"></i></a>
|
||||
<a class="btn" href="#"><i class="icon-align-right"></i></a>
|
||||
<a class="btn" href="#"><i class="icon-align-justify"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="btn-group" data-toggle="buttons">
|
||||
<label class="btn btn-primary">
|
||||
<input type="radio" name="options" id="option1"> Option 1
|
||||
</label>
|
||||
<label class="btn btn-primary">
|
||||
<input type="radio" name="options" id="option2"> Option 2
|
||||
</label>
|
||||
<label class="btn btn-primary">
|
||||
<input type="radio" name="options" id="option3"> Option 3
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<% end %>
|
||||
|
||||
<%= render "packages_search_results", object: @packages %>
|
||||
|
|
|
|||
4
debshots.komodoproject
Normal file
4
debshots.komodoproject
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Komodo Project File - DO NOT EDIT -->
|
||||
<project id="82040c61-6d49-4c43-98d9-08c73df8f96e" kpf_version="5" name="debshots.komodoproject">
|
||||
</project>
|
||||
Loading…
Add table
Add a link
Reference in a new issue