Skip to content

Commit 30da8d4

Browse files
committed
feature/Remove card wrapper from tabs
1 parent d2dd8b5 commit 30da8d4

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

app/assets/stylesheets/follow.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
.follow {
1010
&--container {
1111
display: block;
12-
padding: 8px;
1312

1413
&:hover {
1514
background-color: $color-light;

app/assets/stylesheets/list-item.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
border: 1px solid $color-light;
66
border-radius: 5px;
77
margin: 16px 0px;
8+
background-color: #fcfdff;
89
}
910
}

app/javascript/home.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<h3 slot="header">New Snippet</h3>
55
<new-snippet :languages="[]" slot="body" />
66
</modal>
7+
78
<snippet-preview
89
v-for="snippet in snippetz"
910
:key="snippet.id"
@@ -14,14 +15,15 @@
1415

1516
<script>
1617
import marked from 'marked'
18+
import Card from './card';
1719
import Modal from './modal'
1820
import NewSnippet from './new-snippet'
1921
import SnippetPreview from './snippet-preview'
2022
2123
import { EventBus } from './event-bus';
2224
2325
export default {
24-
components: { Modal, NewSnippet, SnippetPreview },
26+
components: { Card, Modal, NewSnippet, SnippetPreview },
2527
2628
props: {
2729
snippets: { type: Array, required: true },

app/javascript/snippet-preview.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222

2323
<script>
2424
import ActionButtonBar from './action-button-bar';
25-
import Card from './card';
2625
import CodeHighlight from './code-highlight';
26+
import Card from './card';
2727
import SnippetHeader from './snippet-header';
2828
import UserPreview from './user-preview';
2929
3030
export default {
3131
components: {
3232
ActionButtonBar,
33-
Card,
3433
CodeHighlight,
34+
Card,
3535
SnippetHeader,
3636
UserPreview
3737
},

app/views/users/show.html.erb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/>
66
</card>
77

8-
<card>
8+
<%# <card> %>
99
<tabs>
1010
<tab name="<%= @user.snippets_count %> Snippets" selected="true">
1111
<% @user.snippets.order(created_at: :desc).each do |snippet| %>
@@ -17,23 +17,23 @@
1717
</tab>
1818
<tab name="<%= @followers.size %> Followers">
1919
<% @followers.each_with_index do |follower, index| %>
20-
<list-item>
20+
<card>
2121
<a href="<%= user_path(follower)%>" class="follow--container">
2222
<user-preview :user="<%= follower.serialize.to_json %>"></user-preview>
2323
<span class="follow--description"><%= follower.description %></span>
2424
</a>
25-
</list-item>
25+
</card>
2626
<% end %>
2727
</tab>
2828
<tab name="<%= @following.size %> Following">
2929
<% @following.each_with_index do |following_user, index| %>
30-
<list-item>
30+
<card>
3131
<a href="<%= user_path(following_user)%>" class="follow--container">
3232
<user-preview :user="<%= following_user.serialize.to_json %>"></user-preview>
3333
<span class="follow--description"><%= following_user.description %></span>
3434
</a>
35-
</list-item>
35+
</card>
3636
<% end %>
3737
</tab>
3838
</tabs>
39-
</card>
39+
<%# </card> %>

0 commit comments

Comments
 (0)