Permalink
Browse files

Merge pull request #40 from thoughtbot/mj-remove-stylesheets

Remove stylesheets from flutie
  • Loading branch information...
2 parents 35b9e1e + 7d2f3d9 commit e1d9dcb41bdac99b18dd3dfff77a0fcad1eca48a @mjankowski mjankowski committed Feb 12, 2013
View
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- flutie (1.3.4)
+ flutie (2.0.0)
GEM
remote: http://rubygems.org/
@@ -22,33 +22,17 @@ GEM
activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.3.2)
appraisal (0.5.1)
bundler
rake
builder (3.0.4)
- capybara (2.0.1)
- mime-types (>= 1.16)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- selenium-webdriver (~> 2.0)
- xpath (~> 1.0.0)
- childprocess (0.3.6)
- ffi (~> 1.0, >= 1.0.6)
diff-lcs (1.1.3)
erubis (2.7.0)
- ffi (1.2.0)
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
json (1.7.5)
- libwebsocket (0.1.7.1)
- addressable
- websocket
- mime-types (1.19)
multi_json (1.5.0)
- nokogiri (1.5.5)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
@@ -77,32 +61,20 @@ GEM
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
- rubyzip (0.9.9)
- sass (3.2.3)
- selenium-webdriver (2.27.2)
- childprocess (>= 0.2.5)
- libwebsocket (~> 0.1.3)
- multi_json (~> 1.0)
- rubyzip
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
+ sqlite3 (1.3.7)
thor (0.16.0)
tilt (1.3.3)
- websocket (1.0.4)
- xpath (1.0.0)
- nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
appraisal
- capybara (>= 0.4.0)
flutie!
rspec-rails
- sass
sqlite3
View
@@ -3,57 +3,16 @@ Flutie
[![Build Status](https://secure.travis-ci.org/thoughtbot/flutie.png)](http://travis-ci.org/thoughtbot/flutie)
-Basic, default styles for rails applications
+Extra view helpers for Rails applications.
-We also have a [Bourbon](https://github.com/thoughtbot/bourbon) gem available, which can be used to extend flutie with a set of vanilla sass mixins.
+We also have the [Bourbon](https://github.com/thoughtbot/bourbon) and [Neat](https://github.com/thoughtbot/neat) gems available.
Installation & Upgrading
------------------------
-Flutie is a Rails engine. It works with versions of Rails greater than 3.0.
+Flutie is a Rails engine. It works with versions of Rails greater than 3.0. Flutie is recommended to be run as a gem and included in your Gemfile:
-Flutie is recommended to be run as a gem and included in your Gemfile:
-
- gem "flutie"
-
-### Rails 3.1 & Rails 3.2
-
-After you've bundled, if you are using rails 3.1 or greater with asset pipelining enabled, simply add:
-
- @import 'flutie';
-
-as a sass import in the application stylesheet manifest (app/assets/stylesheets/application.css.scss).
-
-If this is a new Rails 3.1 or 3.2 project you will need to rename the application.css manifest to application.css.scss so it is processed
-by the asset pipeline and sass to perform the @import.
-
-### Rails 3.0
-
-After you've bundled, run the installer:
-
- rake flutie:install
-
-The installer will copy the Flutie stylesheets sass into public/stylesheets/sass/flutie, and a static flutie.css into public/stylesheets/ in your app.
-
-Once Flutie is installed, with your application running (not in production environment) you can browse to /styleguides. This will present you with many standard markup elements that are present in a Rails application, in your default application layout.
-
-Click on the "Default styles" link to view the same markup with a barebones layout that only contains the Flutie stylesheets. Click on "Application styles" to view the markup in your application layout.
-
-To upgrade, bump the gem version in your Gemfile, and then run `rake flutie:install` again to get the latest changes moved into your application.
-
-Flutie registers a :flutie shortcut for stylesheets, so in your layout you can do...
-
- <%= stylesheet_link_tag :flutie, 'admin', :cache => true %>
-
-...this will include all the flutie stylesheets, then the 'admin' stylesheet, and it will cache them all into one file.
-
-#### Sass
-
-If you use Sass in your application, the flutie stylesheets are also available as scss files, installed in public/stylesheets/sass/flutie. These files can be imported into your own sass files for use with the following:
-
- @import "flutie/flutie";
-
-You'll want to import flutie before any of your own styles so that you can do things like extend your classes with flutie classes.
+ gem 'flutie'
Helpers
-------
@@ -96,49 +55,13 @@ Anything which has been added via `content_for(:extra_body_classes)` will be add
<body class="<%= body_class %>">
<body class="widgets widgets-show special-page">
-Custom Styles
--------------
-
-To add custom styles to the styleguide add partials to the app/views/styleguides directory. For example:
-
- app/views/styleguides/_todo_item.erb:
-
- <ol>
- <li class="todo">This is a todo item</li>
- </ol>
-
-Plugin authors can also add to the styleguide by ensuring that their view path is in `ActionController::Base.view_paths` and by placing a partial under the styleguides directory. For example:
-
- ActionController::Base.append_view_path(File.join(File.dirname(__FILE__), 'views'))
-
- my_awesome_plugin/views/styleguides/_pagination.erb:
-
- <div class="pagination">
- <a href="#prev">Previous</a>
- <a href="#next">Next</a>
- </div>
-
Suggestions, Bugs, Refactoring?
-------------------------------
Fork away and create a [Github Issue](http://github.com/thoughtbot/flutie/issues). Please don't send pull requests.
Please see CONTRIBUTING.md for details.
-Development
------------
-
-The actual stylesheet source files are sass, so edit the files in app/assets/stylesheets/.
-To rebuild the static flutie.css file, you can run:
-
- sass --update app/assets/stylesheets/_flutie.scss:public/stylesheets/flutie.css
-
-You can also run a local server which will allow you to view the flutie styleguide:
-
- ruby server.rb
-
-Browsing to localhost at the port output by the above command will show you the styleguide.
-
Credits
-------
@@ -1,103 +0,0 @@
-body {
- color: #333;
- font-size: 100%;
- font-family: "helvetica neue", arial, helvetica, "lucida grande", sans-serif;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: #111;
- font-family: "helvetica neue", Helvetica, arial, sans-serif;
-}
-
-
-/* Misc classes and elements */
-/* Use a .box to create a padded box inside a column. */
-.box {
- background: #eee;
- margin-bottom: 1em;
- margin-bottom: 1rem;
- padding: 1em;
- padding: 1rem;
-}
-
-/* Use this to create a horizontal ruler across a column. */
-hr {
- background: #ddd;
- border: none;
- clear: both;
- color: #ddd;
- float: none;
- height: 1px;
- margin: 0 0 .75rem;
- width: 100%;
-}
-
-hr.space {
- background: #fff;
- color: #fff;
-}
-
-/* for image replacement */
-.ir {
- background-repeat: no-repeat;
- direction: ltr;
- display: block;
- overflow: hidden;
- text-align: left;
- text-indent: -9999px;
-}
-
-/* Hide for both screenreaders and browsers
-css-discuss.incutio.com/wiki/Screenreader_Visibility */
-.hidden {
- display: none;
- visibility: hidden;
-}
-
-/* Hide only visually, but have it available for screenreaders
-www.webaim.org/techniques/css/invisiblecontent/ & j.mp/visuallyhidden */
-.visuallyhidden {
- clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
- clip: rect(1px, 1px, 1px, 1px);
- position: absolute !important;
-}
-
-/* Hide visually and from screenreaders, but maintain layout */
-.invisible {
- visibility: hidden;
-}
-
-/* >> The Magnificent CLEARFIX: Updated to prevent margin-collapsing on child elements << j.mp/bestclearfix */
-.clearfix:before, .clearfix:after {
- content: "\0020";
- display: block;
- height: 0;
- visibility: hidden;
-}
-
-.clearfix:after {
- clear: both;
-}
-
-/* Fix clearfix: blueprintcss.lighthouseapp.com/projects/15318/tickets/5-extra-margin-padding-bottom-of-page */
-.clearfix {
- zoom: 1;
-}
-
-.ie7 img {
- -ms-interpolation-mode: bicubic;
-}
-
-@media print {
- * { background: transparent !important; color: #444 !important; text-shadow: none !important; }
- a, a:visited { color: #444 !important; text-decoration: underline; }
- a:after { content: " (" attr(href) ")"; }
- abbr:after { content: " (" attr(title) ")"; }
- .ir a:after { content: ""; } /* Don't show links for images */
- pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
- thead { display: table-header-group; } /* css-discuss.incutio.com/wiki/Printing_Tables */
- tr, img { page-break-inside: avoid; }
- @page { margin: 0.5cm; }
- p, h2, h3 { orphans: 3; widows: 3; }
- h2, h3{ page-break-after: avoid; }
-}
@@ -1,41 +0,0 @@
-/* Success, error & notice boxes for messages and errors. */
-div.error, div.notice, div.success, #flash_failure, #flash_success, #flash_notice {
- border: 1px solid #ddd;
- -moz-border-radius: .5rem;
- -webkit-border-radius: .5rem;
- border-radius: .5rem;
- margin-bottom: .75em;
- margin-bottom: .75rem;
- padding: .75em;
- padding: .75rem;
-}
-
-div.error, #flash_failure {
- background: #FBE3E4;
- border-color: #FBC2C4;
- color: #D12F19;
-}
-
-div.error a, #flash_failure a {
- color: #D12F19;
-}
-
-div.notice, #flash_notice {
- background: #FFF6BF;
- border-color: #FFD324;
- color: #817134;
-}
-
-div.notice a, #flash_notice a {
- color: #817134;
-}
-
-div.success, #flash_success {
- background: #E6EFC2;
- border-color: #C6D880;
- color: #529214;
-}
-
-div.success a, #flash_success a {
- color: #529214;
-}
@@ -1,7 +0,0 @@
-@import 'reset';
-@import 'defaults';
-@import 'flashes';
-@import 'type';
-@import 'forms';
-@import 'tables';
-@import 'lists';
Oops, something went wrong. Retry.

0 comments on commit e1d9dcb

Please sign in to comment.