Skip to content

add viewport and edit some style #40

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

Open
minhyeok4dev wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

add viewport and edit some style #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion app/assets/stylesheets/funds.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
.gift-image {
width: 100%;
height: 647px;
background-size: cover;
background-size: cover;
background-position: center;
}

#description {
Expand Down
5 changes: 4 additions & 1 deletion app/assets/stylesheets/gifts.scss.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@
border-top-left-radius: 6px;
border-top-right-radius: 6px;
width: 100%;
height: 300px;
height: 250px;
background-position: center;
background-size: 100%;
background-repeat: no-repeat;
}

.gift-info {
Expand Down
4 changes: 2 additions & 2 deletions app/views/friends/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</div>
<div class="friends-grid">
<div class="row">
<div class="col-sm-4 col-md-2">
<div class="col-sm-4 col-md-2 col-xs-6">
<%= link_to new_friend_path(uid: @user.uid, name: @user.name) do %>
<div class="thumbnail">
<img src="http://graph.facebook.com/<%= @user.uid %>/picture?height=192&width=192">
Expand All @@ -17,7 +17,7 @@
</div>

<% (@friends*200).each do |f| %>
<div class="col-sm-4 col-md-2">
<div class="col-sm-4 col-md-2 col-xs-6">
<%= link_to new_friend_path(uid: f['id'], name: f['name']) do %>
<div class="thumbnail">
<img src="http://graph.facebook.com/<%= f["id"] %>/picture?height=192&width=192">
Expand Down
2 changes: 1 addition & 1 deletion app/views/gifts/_gift.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="col-md-3 gift-card" data-toggle="modal" data-target="#new-fund" data-gift-id="<%= gift.id %>" data-friend-id="<%= params[:friend_id] %>">
<div class="col-md-3 gift-card col-xs-6" data-toggle="modal" data-target="#new-fund" data-gift-id="<%= gift.id %>" data-friend-id="<%= params[:friend_id] %>">
<div class="recommendation-item">
<div class="gift-image" style="background-image: url(<%= gift.image %>)"></div>
<div class="gift-info">
Expand Down
1 change: 1 addition & 0 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
<meta name="viewport" content="width=device-width, user-scalable=no">
<meta name="title" content="Macaron Gift">
<meta name="description" content="선물 모금에 참여해요!">
<meta name="keywords" content="선물, 생일, 친구">
Expand Down