diff options
| author | laurawilsonri <laura_wilson@brown.edu> | 2019-02-16 15:45:32 -0500 |
|---|---|---|
| committer | laurawilsonri <laura_wilson@brown.edu> | 2019-02-16 15:45:32 -0500 |
| commit | 784eb6e6ba1daf00d3c74239f88669b669e9739c (patch) | |
| tree | a036e639a901f2b7a6f00b892448b5a4a4609641 /src/client/views/collections/CollectionFreeFormView.scss | |
| parent | c835f47a32336c12e6ad7497b72694bb06dc2487 (diff) | |
| parent | 3f98d6ec6050e7faa15179871f0d9669c1188a78 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into improveText
Diffstat (limited to 'src/client/views/collections/CollectionFreeFormView.scss')
| -rw-r--r-- | src/client/views/collections/CollectionFreeFormView.scss | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/client/views/collections/CollectionFreeFormView.scss b/src/client/views/collections/CollectionFreeFormView.scss index 78d332322..fa1372925 100644 --- a/src/client/views/collections/CollectionFreeFormView.scss +++ b/src/client/views/collections/CollectionFreeFormView.scss @@ -1,4 +1,6 @@ .collectionfreeformview-container { + border-style: solid; + box-sizing: border-box; position: relative; top: 0; left: 0; @@ -10,6 +12,7 @@ top: 0; left: 0; } +<<<<<<< HEAD } .border { @@ -28,4 +31,6 @@ #prevCursor { animation: blink 1s infinite; +======= +>>>>>>> 3f98d6ec6050e7faa15179871f0d9669c1188a78 }
\ No newline at end of file |