diff --git a/app/assets/stylesheets/atoms/_a-form-label.sass b/app/assets/stylesheets/atoms/_a-form-label.sass index 133036d874c..0ebe92efc3d 100644 --- a/app/assets/stylesheets/atoms/_a-form-label.sass +++ b/app/assets/stylesheets/atoms/_a-form-label.sass @@ -9,6 +9,9 @@ transform: scale(.7) &.is-sm +text-block(.75rem 1.5) + &.is-inline + margin-bottom: 0 + margin-right: .5rem .form-item__label-checkbox +position(relative) diff --git a/app/assets/stylesheets/shared/blocks/card/_card-header.sass b/app/assets/stylesheets/shared/blocks/card/_card-header.sass index 2d136e745d7..6ff9ac16212 100644 --- a/app/assets/stylesheets/shared/blocks/card/_card-header.sass +++ b/app/assets/stylesheets/shared/blocks/card/_card-header.sass @@ -41,3 +41,6 @@ +text-block(.8125rem 1.4) +media-breakpoint-down(sm) font-size: .75rem + +.card-header__action + display: flex diff --git a/app/controllers/current_user/bookmarks_controller.rb b/app/controllers/current_user/bookmarks_controller.rb index a3b7aa0a744..33c243ea694 100644 --- a/app/controllers/current_user/bookmarks_controller.rb +++ b/app/controllers/current_user/bookmarks_controller.rb @@ -6,4 +6,9 @@ class CurrentUser::BookmarksController < ApplicationController def index @user = current_user end + + def destroy + Bookmark.find(params[:id]).destroy + redirect_to root_path, notice: 'Bookmarkを削除しました。' + end end diff --git a/app/javascript/bookmark-button.vue b/app/javascript/bookmark-button.vue index 555632f5c65..c4e1e24e7f7 100644 --- a/app/javascript/bookmark-button.vue +++ b/app/javascript/bookmark-button.vue @@ -1,6 +1,6 @@