small design changes

llbtl · llbtl · commit 05a1df512142 · 2021-08-23T15:53:09.000+09:00
diff --git a/css/common/frameEditor.css b/css/common/frameEditor.css
@@ -221,7 +221,7 @@
     position: absolute;
     width: 100%;
     height: 300px;
-    bottom: 40px;
+    bottom: 50px;
     background: #F7F7F7;
     border: 0.25px solid #E4E4E4;
     padding: 10px;
@@ -276,7 +276,7 @@
     width: 100%;
     height: 100px;
     position: absolute;
-    bottom: 40px;
+    bottom: 50px;
     background: #F7F7F7;
     border: 0.25px solid #E4E4E4;
     padding: 10px;
@@ -285,7 +285,7 @@
 /* Buttons */
 .vp-fe-btn-box {
     position: relative;
-    height: 40px;
+    height: 50px;
     border-top: 0.25px solid var(--border-gray-color);
 }
 .vp-fe-btn {
diff --git a/css/common/popupPage.css b/css/common/popupPage.css
@@ -55,7 +55,7 @@
     width: 100%;
     height: 100px;
     position: absolute;
-    bottom: 40px;
+    bottom: 50px;
     background: #F7F7F7;
     border: 0.25px solid #E4E4E4;
     padding: 10px;
@@ -67,7 +67,7 @@
     bottom: 25px;
     right: 25px; */
     position: relative;
-    height: 40px;
+    height: 50px;
     border-top: 0.25px solid var(--border-gray-color);
 }
 .vp-pp-btn {
diff --git a/css/common/subsetEditor.css b/css/common/subsetEditor.css
@@ -280,12 +280,8 @@
     width: 100%;
     height: 100px;
     position: absolute;
-<<<<<<< HEAD
-    bottom: 40px;
-    
-=======
     bottom: 50px;
->>>>>>> dd1605b (Small design changes)
+    
     background: #F7F7F7;
     border: 0.25px solid #E4E4E4;
     padding: 10px;
@@ -294,7 +290,7 @@
 /** Buttons */
 .vp-ds-btn-box {
     position: relative;
-    height: 40px;
+    height: 50px;
     border-top: 0.25px solid var(--border-gray-color);
 }
 .vp-ds-btn {
@@ -365,7 +361,7 @@
     position: absolute;
     width: 100%;
     height: 300px;
-    bottom: 40px;
+    bottom: 50px;
     background: #F7F7F7;
     border: 0.25px solid #E4E4E4;
     padding: 10px;
diff --git a/src/api_block/init.js b/src/api_block/init.js
@@ -261,26 +261,10 @@ define([
                 case 'snippets':
                 case 'variable':
                 case 'file':
-<<<<<<< HEAD
-=======
-                    blockContainer.createAppsPage('/nbextensions/visualpython/src/file_io/fileio.js', {
-                        title: 'Read File',
-                        width: '500px'
-                    });
-                    break;
->>>>>>> dd1605b (Small design changes)
                 case 'instance':
                 case 'subset':
                 case 'frame':
                 case 'chart':
-<<<<<<< HEAD
-=======
-                    blockContainer.createAppsPage('/nbextensions/visualpython/src/matplotlib/plot.js', {
-                        title: 'Chart',
-                        width: '530px'
-                    });
-                    break;
->>>>>>> dd1605b (Small design changes)
                 case 'profiling':
                     blockContainer.setSelectBlock(null);
                     blockContainer.createAppsPage(menu, file, config);
