aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/CollectionSchemaView.scss
diff options
context:
space:
mode:
authorSam Wilkins <abdullah_ahmed@brown.edu>2019-04-13 19:14:42 -0400
committerSam Wilkins <abdullah_ahmed@brown.edu>2019-04-13 19:14:42 -0400
commit7a1a028d1d3f5602d39f559cb1614abda658a371 (patch)
tree5de71b963a2e2e370818591f6e99fba868503ee0 /src/client/views/collections/CollectionSchemaView.scss
parent35f09470b2939a6640b85c94a9a4ea2551a6ea42 (diff)
parentb7252aeacbbd73120bc6f80d551f4505646a883b (diff)
resolved merge conflicts with master
Diffstat (limited to 'src/client/views/collections/CollectionSchemaView.scss')
-rw-r--r--src/client/views/collections/CollectionSchemaView.scss6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/client/views/collections/CollectionSchemaView.scss b/src/client/views/collections/CollectionSchemaView.scss
index 9cd6c8a39..c8bfedff4 100644
--- a/src/client/views/collections/CollectionSchemaView.scss
+++ b/src/client/views/collections/CollectionSchemaView.scss
@@ -1,4 +1,4 @@
-@import "../global_variables";
+@import "../globalCssVariables";
//options menu styling
#schemaOptionsMenuBtn {
@@ -58,7 +58,9 @@ ul {
.collectionSchemaView-container {
- border: 1px solid $intermediate-color;
+ border-width: $COLLECTION_BORDER_WIDTH;
+ border-color : $intermediate-color;
+ border-style: solid;
border-radius: $border-radius;
box-sizing: border-box;
position: absolute;