Merge 4d46152 into 9b1c236

microsoft · Nov 5, 2018 · e75df60 · e75df60
2 parents 9b1c236 + 4d46152
commit e75df60
Show file tree

Hide file tree

Showing 9 changed files with 246 additions and 230 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app/client/src/ui/editor/emulator/parts/chat/chat.scss b/packages/app/client/src/ui/editor/emulator/parts/chat/chat.scss
@@ -6,11 +6,7 @@
     .wc-chatview-panel {
       flex: 1;
       position: relative;
-      &::-webkit-scrollbar-thumb {
-        background-color: blue;
-        color: red;
-      }
-
+
       p {
         margin-bottom: 0;
         margin-top: 0;
@@ -66,6 +62,10 @@
         padding: 0 16px;
       }
 
+      .wc-message-wrapper.clickable {
+        margin-top: 2px;
+      }
+
       .wc-list ul {
         padding: 0;
       }

diff --git a/packages/app/client/src/ui/editor/emulator/parts/inspector/inspector.scss b/packages/app/client/src/ui/editor/emulator/parts/inspector/inspector.scss
@@ -32,7 +32,7 @@
 .inspector-container {
   box-sizing: border-box;
   font-family: var(--monospace-font-family);
-  height: 100%;
+  height: calc(100% - 4px);
   margin: 2px;
   padding: 0 0 18px 0;
   overflow-y: auto;

diff --git a/packages/app/client/src/ui/editor/welcomePage/welcomePage.scss b/packages/app/client/src/ui/editor/welcomePage/welcomePage.scss
@@ -42,7 +42,7 @@
   border: var(--my-bots-well-border);
 
   &::-webkit-scrollbar-thumb {
-    background-color: transparent
+    background-color: transparent;
   }
 
   &:hover {

diff --git a/packages/app/client/src/ui/shell/explorer/endpointExplorer/endpointExplorer.tsx b/packages/app/client/src/ui/shell/explorer/endpointExplorer/endpointExplorer.tsx
@@ -59,11 +59,14 @@ export class EndpointExplorer extends ServicePane<EndpointProps> {
         return (
           <li
             className={ styles.message }
+            data-index={ index }
             key={ index }
             onClick={ this.onLinkClick }
             onKeyPress={ this.onHandleKeyPress }
-            data-index={ index }
-            tabIndex={ 0 }>{ model.name }
+            tabIndex={ 0 }
+            title={ model.endpoint } 
+          >
+            { model.name }
           </li>);
       });
   }

diff --git a/packages/app/client/src/ui/shell/explorer/resourceExplorer/resourceExplorer.tsx b/packages/app/client/src/ui/shell/explorer/resourceExplorer/resourceExplorer.tsx
@@ -44,25 +44,29 @@ export class ResourceExplorer extends ServicePane<ResourceExplorerProps, Resourc
       const mutable = fileToRename.id === file.id;
       if (!mutable) {
         return (
-          <li key={ `file_${ index }` }
-              data-index={ index }
-              onClick={ this.onLinkClick }
-              onKeyPress={ this.onLinkKeyPress }
-              className={ styles.link }
-              tabIndex={ 0 }>
+          <li 
+            className={ styles.link }
+            data-index={ index }
+            key={ `file_${ index }` }
+            onClick={ this.onLinkClick }
+            onKeyPress={ this.onLinkKeyPress }
+            tabIndex={ 0 }
+            title={ file.path }
+          >
             { file.name }
           </li>);
       }
 
       return (
         <li key={ `file_${ index }` } className={ styles.link }>
           <input
-            type="text"
-            ref={ this.editableInputRef }
+            defaultValue={ fileToRename.name }
             onChange={ this.onInputChange }
             onBlur={ this.onInputBlur }
             onKeyUp={ this.onInputKeyUp }
-            defaultValue={ fileToRename.name }/>
+            type="text"
+            ref={ this.editableInputRef }
+          />
         </li>);
     });
   }

diff --git a/packages/app/client/src/ui/shell/explorer/servicePane/servicePane.scss b/packages/app/client/src/ui/shell/explorer/servicePane/servicePane.scss
@@ -52,9 +52,9 @@
 
 .service-pane-list {
   margin: 0;
-  overflow: auto;
   max-height: 400px;
   padding: 2px 0 2px 0;
+
   & > li {
     border: 1px solid transparent;
     color: var(--list-item-color);
@@ -63,6 +63,8 @@
     font-size: 13px;
     line-height: 22px;
     min-height: 22px;
+    overflow: hidden;
+    text-overflow: ellipsis;
     white-space: nowrap;
 
     &:hover {
@@ -72,6 +74,7 @@
     &:focus {
       background-color: var(--focused-list-item);
     }
+
     &[data-selected], &:active {
       background-color: var(--focused-selected-list-item-bg);
       border: var(--list-item-hover-border);

diff --git a/packages/app/client/src/ui/shell/explorer/servicesExplorer/servicesExplorer.tsx b/packages/app/client/src/ui/shell/explorer/servicesExplorer/servicesExplorer.tsx
@@ -141,7 +141,9 @@ export class ServicesExplorer extends ServicePane<ServicesExplorerProps> {
           onDoubleClick={ this.onLinkClick }
           onKeyPress={ this.onHandleKeyPress }
           data-index={ index }
-          tabIndex={ 0 }>
+          tabIndex={ 0 }
+          title={ service.name }
+        >
           { label } <span>- { serviceTypeLabels[service.type] }</span>
         </li>
       );

diff --git a/packages/app/client/src/ui/styles/globals.scss b/packages/app/client/src/ui/styles/globals.scss
@@ -74,8 +74,8 @@
   }
 
   ::-webkit-scrollbar {
-    width: 10px;
-    height: 10px;
+    width: 8px;
+    height: 8px;
   }
 
   ::-webkit-scrollbar-track {