Skip to content

Commit 6b57385

Browse files
Fixed the spacing for items since that last solution broke something else...
1 parent 37d6cfa commit 6b57385

2 files changed

Lines changed: 17 additions & 11 deletions

File tree

app/scripts/store/dimStoreItems.directive.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
template: [
2020
'<div>',
2121
' <div class="items {{ vm.store.id }}" data-type="item" data-character="{{ vm.store.id }}">',
22-
' <div ng-repeat="key in vm.keys" ng-init="value = vm.categories[key]" class="section {{ key.toLowerCase() }}" ui-on-drop="vm.onDrop($data, $event, false)" drop-channel="{{ value.join(\',\') }}">',
22+
' <div ng-repeat="key in vm.keys" ng-init="value = vm.categories[key]" class="section {{ key.toLowerCase() }}" ui-on-drop="vm.onDrop($data, $event, false)" drop-channel="{{ value }}">',
2323
' <div class="title">',
2424
' <span>{{ key }}</span>',
2525
' <span class="bucket-count" ng-if="vm.store.id === \'vault\'">{{ vm.sortSize[key] }}/{{ key === \'Weapons\' ? 36 : 24 }} </span>',
2626
' </div>',
2727
' <div ng-repeat="type in value" class="sub-section sort-{{ type.toLowerCase() }}" ng-class="vm.data[vm.orderedTypes[type]] ? \'\' : \'empty\'">',
28-
' <div ng-class="vm.styles[type].equipped" ng-if="vm.store.id !== \'vault\' && vm.data[vm.orderedTypes[type]].equipped" ui-on-drop="vm.onDrop($data, $event, true)" drop-channel="{{ value.join(\',\') }}">',
28+
' <div ng-class="vm.styles[type].equipped" ng-if="vm.store.id !== \'vault\'" ui-on-drop="vm.onDrop($data, $event, true)" drop-channel="{{ type }}">',
2929
' <div ng-repeat="item in vm.data[vm.orderedTypes[type]].equipped track by item.index" dim-store-item store-data="vm.store" item-data="item"></div>',
3030
' </div>',
3131
' <div ng-class="vm.styles[type].unequipped">',

app/styles/main.css

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ img.void {
224224
}
225225
.sub-section {
226226
margin-bottom: 20px;
227+
position: relative;
227228
}
228229
.equippable {
229230
display: inline-block;
@@ -235,21 +236,27 @@ img.void {
235236
.vault .unequippable {
236237
width: 208px;
237238
}
239+
240+
.sub-section {
241+
clear: both;
242+
}
238243
.equipped {
239244
width: 52px;
240245
margin-right: 12px;
241246
}
242-
.unequipped {
247+
.guardian .unequipped {
243248
width: 156px;
244249
}
245250
.vault .unequipped {
246251
width: 208px;
247252
}
248-
.equipped.on-drag-enter .item {
249-
box-shadow: 0 0 10px #ddd;
253+
.sub-section.on-drag-enter {
254+
box-shadow: 0 0 10px rgba(170,170,170,.5);;
255+
background-color: rgba(170,170,170,.5);;
250256
}
251-
.equipped.on-drag-hover .item {
252-
box-shadow: 0 0 10px 2px #fff;
257+
.sub-section.on-drag-hover {
258+
box-shadow: 0 0 10px 2px rgba(200,200,200,.5);;
259+
background-color: rgba(200,200,200,.5);
253260
}
254261
.item-target {
255262
vertical-align: top;
@@ -266,13 +273,13 @@ img.void {
266273
display: inline-block;
267274
box-shadow: none;
268275
}
269-
.unequipped.on-drag-enter .item-target, .unequippable.on-drag-enter .item-target {
276+
/*.unequipped.on-drag-enter .item-target, .unequippable.on-drag-enter .item-target {
270277
display: inline-block;
271278
box-shadow: 0 0 10px #ccc;
272279
}
273280
.unequipped.on-drag-hover .item-target, .unequippable.on-drag-enter .item-target {
274281
box-shadow: 0 0 10px 2px #eee;
275-
}
282+
}*/
276283
.counter {
277284
position: absolute;
278285
bottom: -2px;
@@ -307,10 +314,9 @@ img.void {
307314
border-color: transparent transparent #b184c5 transparent;
308315
}
309316
.item {
310-
margin: 2px;
317+
margin: 0 2px;
311318
position: relative;
312319
display: inline-block;
313-
float: left;
314320
width: 44px;
315321
height: 44px;
316322
background-color: #5c7183;

0 commit comments

Comments
 (0)