Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Use bootstrap-sass instead of the static bootstrap.css + general cleanups #33

Closed
wants to merge 12 commits into from
Closed

[WIP] Use bootstrap-sass instead of the static bootstrap.css + general cleanups #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1c81ad3
remove all custom styles to start with a vanilla bootstrap
Jul 15, 2013
cf3ac05
make the logo look like the one in the wiki
Jul 15, 2013
892cdd7
valign the right menu
Jul 15, 2013
a267fd9
woah. somebody fooled at me.
Jul 15, 2013
5799e96
we all like box-shadows, don't we?
Jul 15, 2013
5181569
static header needs some space!
Jul 15, 2013
9063614
and we have a nice header again
Jul 15, 2013
7f99494
green buttons. they scream "hellooooo!"
Jul 15, 2013
92a0a9d
thou shalt not use double quotes unless needed!
Jul 15, 2013
0dd255d
as I said...
Jul 15, 2013
0e32447
rearrange the earth-image. and stop abusing bootstrap
Jul 15, 2013
166f5b2
clean up (=rewrite...) the index-page and related stuff.
Jul 15, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ gem 'coffee-rails', '~> 4.0.0'
gem 'jquery-rails'
gem 'turbolinks'

gem 'bootstrap-sass'

group :development, :test do
gem 'rspec-rails', '~> 2.13.2'
gem 'capybara', '~> 2.1.0'
Expand Down
1 change: 1 addition & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass
capybara (~> 2.1.0)
coffee-rails (~> 4.0.0)
devise (~> 3.0.0.rc)
Expand Down
Binary file modified app/assets/images/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 0 additions & 10 deletions app/assets/stylesheets/about.css.scss
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions app/assets/stylesheets/application.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require bootstrap
*= require_tree .
*= require main
*/
13 changes: 0 additions & 13 deletions app/assets/stylesheets/get_involved.css.scss
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions app/assets/stylesheets/index.css.scss
View file
Open in desktop

This file was deleted.

Loading