diff options
| author | Stanley Yip <stanley_yip@brown.edu> | 2019-10-15 17:29:57 -0400 |
|---|---|---|
| committer | Stanley Yip <stanley_yip@brown.edu> | 2019-10-15 17:29:57 -0400 |
| commit | 462cd06a1bff6e510132a4434a72fd7b4245cfdf (patch) | |
| tree | ae0b591ab435559a597938b9b89863a3b07600eb /src/client/views/MainView.scss | |
| parent | 0be39316bd21939201ee0e15950cc7855c9c13ba (diff) | |
good enough for stanley to start texting i think
Diffstat (limited to 'src/client/views/MainView.scss')
| -rw-r--r-- | src/client/views/MainView.scss | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss index a6b28f488..25af67161 100644 --- a/src/client/views/MainView.scss +++ b/src/client/views/MainView.scss @@ -34,15 +34,9 @@ display: flex; flex-direction: column; position: absolute; -<<<<<<< HEAD width: 100%; height: 100%; - border: black 1px solid; -======= - width:100%; - height:100%; ->>>>>>> 33811c112c7e479813908ba10f72813954a3e289 .documentView-node-topmost { background: lightgrey; } @@ -73,13 +67,8 @@ .mainView-expandFlyoutButton { position: absolute; -<<<<<<< HEAD top: 100px; right: 30px; -======= - top: 5px; - right: 5px; ->>>>>>> 33811c112c7e479813908ba10f72813954a3e289 cursor: pointer; } |