Skip to content

Commit

Permalink
Create components folder for reused SCSS
Browse files Browse the repository at this point in the history
* Add normalize-rails gem, remove normailze vendor file
  • Loading branch information
smharley committed Sep 23, 2016
1 parent 6911c7e commit c960964
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 31 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ gem "haml-rails"
gem "high_voltage"
gem "inifile"
gem "jquery-rails", "~> 4.0.0"
gem 'rails-assets-lodash', source: 'https://rails-assets.org'
gem "rails-assets-lodash", source: "https://rails-assets.org"
gem "normalize-rails"
gem "neat"
gem "octokit"
gem "omniauth-github"
Expand Down
1 change: 1 addition & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ DEPENDENCIES
jquery-rails (~> 4.0.0)
launchy
neat
normalize-rails
octokit
omniauth-github
paranoia (~> 2.0)
Expand Down
13 changes: 4 additions & 9 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
@import "bourbon";
@import "neat";
@import "normalize";
@import "normalize-rails";
@import "font-awesome";

@import "base/base";

@import "application/helpers";

@import "toggle_switch";
@import "components/components";
@import "pages/pages";
@import "accounts/show";
@import "application/footer";
@import "application/header";
@import "home/index";
@import "repos/repos";

@import "accounts/show";
@import "sessions/new";
19 changes: 0 additions & 19 deletions app/assets/stylesheets/application/_helpers.scss

This file was deleted.

8 changes: 8 additions & 0 deletions app/assets/stylesheets/base/_helpers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,11 @@
text-align: center;
vertical-align: middle;
}

.pull-left {
float: left;
}

.pull-right {
float: right;
}
4 changes: 4 additions & 0 deletions app/assets/stylesheets/base/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,7 @@ em.code {
margin: 1em 0 2em;
white-space: pre-wrap;
}

figure {
margin: 0;
}
3 changes: 3 additions & 0 deletions app/assets/stylesheets/components/_components.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "footer";
@import "header";
@import "toggle_switch";
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions app/assets/stylesheets/pages/_pages.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
@import "builds";
@import "docs";
@import "home";
2 changes: 0 additions & 2 deletions vendor/assets/stylesheets/_normalize.scss

This file was deleted.

0 comments on commit c960964

Please sign in to comment.