From 4929d8b562c4f6300053cfd7d9583106df75b221 Mon Sep 17 00:00:00 2001
From: eperelm2 <emily_perelman@brown.edu>
Date: Tue, 18 Jul 2023 16:06:29 -0400
Subject: continued fixing merge

---
 src/client/views/FilterPanel.scss    | 13 ++++++++-----
 src/client/views/FilterPanel.tsx     |  2 +-
 src/client/views/PropertiesView.scss | 11 +++++++++++
 src/client/views/PropertiesView.tsx  |  5 +++--
 4 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/client/views/FilterPanel.scss b/src/client/views/FilterPanel.scss
index 4f0460659..bb68afed3 100644
--- a/src/client/views/FilterPanel.scss
+++ b/src/client/views/FilterPanel.scss
@@ -135,7 +135,7 @@
 
 .filterBox-addFilter {
     width: 120px;
-    background-color: #e9e9e9;
+    backgroundcolor: #e9e9e9;
     border-radius: 12px;
     padding: 5px;
     margin: 5px;
@@ -199,11 +199,14 @@
    // float:right;
 
    .filterBox-facetHeader-collapse{
-        float: right;
-        justify-items: right;
-        align-items: flex-end;
+        // float: right;
+        // justify-items: right;
+        // align-items: flex-end;
         margin-left: auto;
-        margin-right: 9px;
+      //  margin-right: 9px;
+
+        float: right;
+        font-size: 16;
     }
 
 }
diff --git a/src/client/views/FilterPanel.tsx b/src/client/views/FilterPanel.tsx
index 68d29942b..5d1e5c08d 100644
--- a/src/client/views/FilterPanel.tsx
+++ b/src/client/views/FilterPanel.tsx
@@ -198,7 +198,7 @@ export class FilterPanel extends React.Component<filterProps> {
                                 
                                 <div className = "filterBox-facetHeader-collapse"> 
                                  <AiOutlineMinusSquare/>
-                                 {/* <CiCircleRemove/> */}
+                                 <CiCircleRemove/>
                                   </div>
                                
                             </div>
diff --git a/src/client/views/PropertiesView.scss b/src/client/views/PropertiesView.scss
index 060b506e3..23bf31b95 100644
--- a/src/client/views/PropertiesView.scss
+++ b/src/client/views/PropertiesView.scss
@@ -26,6 +26,17 @@
         padding: 5px 10px;
     }
 
+    .propertiesView-propAndInfoGrouping{
+        display: flex;
+    }
+
+        .propertiesView-info{
+        margin-top: 20;
+        margin-right: 10;
+        float: right;
+        font-size: 20;
+    }
+
 
     .propertiesView-sharing {
         //border-bottom: 1px solid black;
diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx
index cb0663554..045d70591 100644
--- a/src/client/views/PropertiesView.tsx
+++ b/src/client/views/PropertiesView.tsx
@@ -584,7 +584,8 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
  
          return (
              <div>
-                 <div className = "propertiesView-wordType">Type</div>  
+                Type
+                 {/* <div className = "propertiesView-wordType">Type</div>   */}
                  <div className= "currentType"> 
                  <div className='currentType-icon'>
                       {this.currentComponent}
@@ -1734,7 +1735,7 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
                             <div className="propertiesView-title" style={{ width: this.props.width }}>
                                 Properties
                             </div>
-                            <div className = "propertiesView-info" onClick={() => window.open('https://brown-dash.github.io/Dash-Documentation/')}>
+                            <div className = "propertiesView-info" onClick={() => window.open('https://brown-dash.github.io/Dash-Documentation//properties/')}>
                                  <GrCircleInformation/> </div>
 
                         </div>
-- 
cgit v1.2.3-70-g09d2