Skip to content

Commit

Permalink
Style emoji with flexbox
Browse files Browse the repository at this point in the history
  • Loading branch information
Anule Ndukwu committed Jan 29, 2019
1 parent 66acdc4 commit 55b4561
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 22 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
cfa-styleguide (0.5.6)
cfa-styleguide (0.5.7)
autoprefixer-rails
bourbon
jquery-rails
Expand Down Expand Up @@ -55,7 +55,7 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
arel (9.0.0)
autoprefixer-rails (9.4.6)
autoprefixer-rails (9.4.7)
execjs
bourbon (5.1.0)
sass (~> 3.4)
Expand Down
5 changes: 5 additions & 0 deletions app/assets/stylesheets/atoms/_emoji-specs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,8 @@
width: 1.8em;
height: 1.8em;
}

.emoji-container {
display: flex;
flex-wrap: wrap;
}
18 changes: 6 additions & 12 deletions app/controllers/cfa/styleguide/pages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,16 @@ def emojis
classes = Dir.chdir(File.expand_path('../../../assets/stylesheets/atoms', File.dirname(__FILE__))) do
File.read('_emoji.scss').scan(/\.(\S*) {.*/)
end
emojis = []
emoji_pairs = []
@emojis = []
@emoji_pairs = []

classes.each do |c|
if c[0].include?('emoji-pair')
emoji_pairs.push(c[0])
classes.each do |css_class|
if css_class[0].include?('emoji-pair')
@emoji_pairs.push(css_class[0])
else
emojis.push(c[0])
@emojis.push(css_class[0])
end
end

emojis
emoji_pairs

@emojis = emojis
@emoji_pairs = emoji_pairs
end
end
end
Expand Down
14 changes: 7 additions & 7 deletions app/views/cfa/styleguide/pages/emojis.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
<p class="text--help">Emojis</p>
</div>
<div class="grid__item width-three-fourths">
<div class="grid">
<% @emojis.each do |c| %>
<div class="emoji-container">
<% @emojis.each do |css_class| %>
<div class="grid__item width-one-sixth">
<div class="emoji emoji--big <%= "#{c}" %>"></div>
<p><%= c %></p>
<div class="emoji emoji--big <%= "#{css_class}" %>"></div>
<p class="text--help"><%= css_class %></p>
</div>
<% end %>
</div>
Expand All @@ -47,10 +47,10 @@
</div>
<div class="grid__item width-three-fourths">
<div class="grid">
<% @emoji_pairs.each do |c| %>
<% @emoji_pairs.each do |css_class| %>
<div class="grid__item width-one-fourth">
<div class="emoji emoji--big <%= "#{c}" %>"></div>
<p><%= c %></p>
<div class="emoji emoji--big <%= "#{css_class}" %>"></div>
<p class="text--help"><%= css_class %></p>
</div>
<% end %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion lib/cfa/styleguide/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Cfa
module Styleguide
VERSION = "0.5.6"
VERSION = "0.5.7"
end
end

0 comments on commit 55b4561

Please sign in to comment.