Merge branch 'main' into feat/cpe/feature-toggle

SAP · Oct 16, 2024 · 32f8651 · 32f8651
2 parents f678178 + ffb0892
commit 32f8651
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/packages/control-property-editor/CHANGELOG.md b/packages/control-property-editor/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sap-ux/control-property-editor
 
+## 0.5.19
+
+### Patch Changes
+
+-   0135cea: Update filter bars.
+
 ## 0.5.18
 
 ### Patch Changes

diff --git a/packages/control-property-editor/package.json b/packages/control-property-editor/package.json
@@ -3,7 +3,7 @@
     "displayName": "Control Property Editor",
     "description": "Control Property Editor",
     "license": "Apache-2.0",
-    "version": "0.5.18",
+    "version": "0.5.19",
     "main": "dist/app.js",
     "repository": {
         "type": "git",

diff --git a/packages/control-property-editor/src/i18n/i18n.json b/packages/control-property-editor/src/i18n/i18n.json
@@ -15,7 +15,7 @@
   "LIGHT_THEME_NAME": "Light",
   "DARK_THEME_NAME": "Dark",
   "HIGH_CONTRAST_THEME_NAME": "High Contrast",
-  "SEARCH_OUTLINE": "Search Outline",
+  "SEARCH_OUTLINE": "Filter Outline",
   "NO_CONTROL_FOUND": "No control found",
   "MODIFY_SEARCH_INPUT": "Modify the search input",
   "APP_TITLE": "Control Property Editor",
@@ -42,7 +42,7 @@
   "SELECT_ICON": "Select Icon",
   "NO_CONTROL_SELECTED": "No control selected",
   "PROPERTIES_MODIFY_TEXT": "Select a control on the canvas to see and modify its properties",
-  "SEARCH_PROPERTIES": "Search Properties",
+  "SEARCH_PROPERTIES": "Filter Properties",
   "SHOW_EDITABLE_PROPERTIES": "Show only editable properties",
   "COPIED_TO_CLIPBOARD": "Copied to clipboard",
   "PROPERTY_NAME": "Property name",
@@ -65,7 +65,7 @@
   "CONFIRM_OTHER_CHANGE_DELETE_TITLE": "Confirm change deletion",
   "CONFIRM_DELETE_SUBTEXT": "Are you sure you want to delete all changes for this property? This action cannot be undone.",
   "FIT_PREVIEW": "Fit",
-  "FILTER": "Filter",
+  "FILTER": "Filter Changes",
   "CHANGE_SUMMARY_SAVED_CHANGES": "SAVED CHANGES",
   "CHANGE_SUMMARY_UNSAVED_CHANGES": "UNSAVED CHANGES",
   "CHANGES_DETECTED": "Changes detected!",

diff --git a/packages/control-property-editor/src/panels/changes/ChangesPanel.module.scss b/packages/control-property-editor/src/panels/changes/ChangesPanel.module.scss
@@ -1,9 +1,11 @@
 .filter {
     display: flex;
-    padding: 15px 15px 15px 15px;
+    padding: 19px 15px 15px 15px;
     flex-direction: row;
+    justify-content: center;
     align-items: center;
     background-color: var(--vscode-sideBar-background);
+    border-bottom: 1px solid var(--vscode-menu-separatorBackground);
 }
 
 .noData {

diff --git a/packages/control-property-editor/src/panels/outline/OutlinePanel.scss b/packages/control-property-editor/src/panels/outline/OutlinePanel.scss
@@ -1,9 +1,10 @@
 .filter-outline {
     display: flex;
-    padding: 15px 14px 15px 14px;
+    padding: 15px 15px 15px 15px;
     flex-direction: row;
     align-items: center;
     background-color: var(--vscode-sideBar-background);
+    border-bottom: 1px solid var(--vscode-menu-separatorBackground);
 }
 
 .auto-element-scroller {

diff --git a/packages/control-property-editor/src/panels/outline/Tree.tsx b/packages/control-property-editor/src/panels/outline/Tree.tsx
@@ -23,7 +23,7 @@ interface OutlineNodeItem extends OutlineNode {
 
 export const Tree = (): ReactElement => {
     // padding + height of `Search` bar
-    const SEARCH_HEIGHT = 56;
+    const SEARCH_HEIGHT = 57;
 
     // height of the tree row in a outline
     const TREE_ROW_HEIGHT = 28;

diff --git a/packages/control-property-editor/src/panels/properties/Properties.scss b/packages/control-property-editor/src/panels/properties/Properties.scss
@@ -83,9 +83,10 @@
 }
 .filter-properties {
     display: flex;
-    margin: 0px 15px 10px 15px;
+    padding: 0px 15px 15px 15px;
     flex-direction: row;
     align-items: center;
+    border-bottom: 1px solid var(--vscode-menu-separatorBackground);
 }
 
 .funnel-properties-icon {

diff --git a/packages/control-property-editor/src/panels/properties/PropertiesList.tsx b/packages/control-property-editor/src/panels/properties/PropertiesList.tsx
@@ -123,7 +123,7 @@ export function PropertiesList(): ReactElement {
             <Separator
                 style={{
                     marginTop: '0px',
-                    marginBottom: '20px'
+                    marginBottom: '15px'
                 }}
             />
             <div className="filter-properties">