diff options
| author | Sam Wilkins <abdullah_ahmed@brown.edu> | 2019-04-13 19:14:42 -0400 |
|---|---|---|
| committer | Sam Wilkins <abdullah_ahmed@brown.edu> | 2019-04-13 19:14:42 -0400 |
| commit | 7a1a028d1d3f5602d39f559cb1614abda658a371 (patch) | |
| tree | 5de71b963a2e2e370818591f6e99fba868503ee0 /src/client/views/collections/CollectionTreeView.scss | |
| parent | 35f09470b2939a6640b85c94a9a4ea2551a6ea42 (diff) | |
| parent | b7252aeacbbd73120bc6f80d551f4505646a883b (diff) | |
resolved merge conflicts with master
Diffstat (limited to 'src/client/views/collections/CollectionTreeView.scss')
| -rw-r--r-- | src/client/views/collections/CollectionTreeView.scss | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/client/views/collections/CollectionTreeView.scss b/src/client/views/collections/CollectionTreeView.scss index 4f940e094..8ecc5b67b 100644 --- a/src/client/views/collections/CollectionTreeView.scss +++ b/src/client/views/collections/CollectionTreeView.scss @@ -1,7 +1,9 @@ -@import "../global_variables"; +@import "../globalCssVariables"; .collectionTreeView-dropTarget { - border: 0px solid transparent; + border-width: $COLLECTION_BORDER_WIDTH; + border-color: transparent; + border-style: solid; border-radius: $border-radius; box-sizing: border-box; height: 100%; |