Skip to content

Commit 348a10f

Browse files
committed
Merge branch 'resizable-sections' of github.com:ideo/shape into resizable-sections
2 parents 3fc2d63 + 8fce54a commit 348a10f

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

app/controllers/api/v1/collection_cards_controller.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ class Api::V1::CollectionCardsController < Api::V1::BaseController
88
]
99
load_and_authorize_resource except: %i[
1010
index
11+
ids
1112
move
1213
replace
1314
update_card_filter
1415
]
1516
# this is skipped to enable viewable_by_anyone public capability, permissions are still checked via cancan
1617
skip_before_action :check_api_authentication!, only: %i[
1718
index
19+
ids
1820
]
1921
before_action :load_and_authorize_parent_collection, only: %i[
2022
create

app/javascript/ui/grid/shared.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,19 @@ export const SectionCardWrapper = styled.div`
166166
height: 100%;
167167
width: 100%;
168168
background: ${props => props.backgroundColor};
169+
170+
${props =>
171+
props.selected &&
172+
`
173+
&:before {
174+
${highlightedCardCss}
175+
}
176+
`};
177+
169178
.sectionInner {
170179
border-radius: ${props => props.theme.zoomLevel * 2}px;
171180
position: absolute;
172181
cursor: grab;
173-
${props =>
174-
props.selected &&
175-
`
176-
&:before {
177-
${highlightedCardCss}
178-
}
179-
`};
180182
}
181183
182184
.styled-name {

0 commit comments

Comments
 (0)