Merge branch 'dev' into megan/htmlQueueLayerNav

megatera · web-flow · commit 96e9f571bc8e · 2022-03-05T15:48:57.000-08:00
diff --git a/src/components/dashboard_items/ComponentDetails.vue b/src/components/dashboard_items/ComponentDetails.vue
@@ -141,7 +141,6 @@ i {
 
 .q-tab-panel {
   height: 100%;
-  // matchs the code editor bg
   background: $subprimary;
   padding-top: 20px;
 }
@@ -158,6 +157,7 @@ i {
 
 .toolbar-background {
   background: black;
+  
 }
 
 #store-cards {
diff --git a/src/components/file_system_interface/ExportProject.vue b/src/components/file_system_interface/ExportProject.vue
@@ -10,11 +10,11 @@ Description:
   -->
 
 <template>
-  <q-btn class="export-btn" color="secondary" label="Export">
-    <q-menu class="dropdown">
+  <q-btn class="nav-btn" color="secondary" label="Export">
+    <q-menu class="dropdown" :offset="[0, 15]">
       <div class="settings-dropdown column items-center"> 
       <p class="center">Export:</p>
-      <q-btn class="menu-btn" no-caps color="secondary" label="Current Project" @click="exportProject"/> 
+      <q-btn class="menu-btn" no-caps color="secondary" label="Project" @click="exportProject"/> 
       <q-btn class="menu-btn" no-caps color="secondary" label="Active Component" @click="handleExportComponent" :disabled="!activeComponent.trim()"/> 
       </div>
     </q-menu>
@@ -523,19 +523,16 @@ export default {
 </script>
 
 <style>
-.export-btn {
-  min-height: 10px !important;
-  width: auto;
-  font-size: 11px;
+.nav-btn {
+  min-height: 30px !important;
   text-transform: capitalize;
-  padding: 3px 8px;
 }
 .center{
   display:inline-block;
   text-align: center;
-  margin-top: 5px;
+  margin-top: 10px;
+  margin-bottom: 5px;
   font-weight: bold;
-  background-color: rgb(100, 99, 99);
   color: white;
   box-sizing: border-box;
 }
diff --git a/src/components/file_system_interface/OpenProjectComponent.vue b/src/components/file_system_interface/OpenProjectComponent.vue
@@ -5,12 +5,12 @@ Description:
   -->
 
 <template>
-    <q-btn class="export-btn" color="secondary" label="Import">
-    <q-menu class="dropdown">
+    <q-btn class="nav-btn" color="secondary" label="Import">
+    <q-menu :offset="[0, 15]" class="dropdown">
       <div class="settings-dropdown column items-center"> 
       <p class="center">Import:</p>
       <q-btn class="menu-btn" no-caps color="secondary" label="Project" @click="openProjectJSON"/> 
-      <!-- <ImportComponent title="Component"/> -->
+      <ImportComponent class="import-comp" no-caps title="Component"/>
       <!-- <q-btn class="menu-btn" no-caps color="secondary" label="Component" @click="exportProject"/>  -->
       </div>
     </q-menu>
@@ -70,8 +70,12 @@ export default {
   margin-right: 0.2rem;
 }
 .menu-btn{
-  width: 85%;
+  width: 80%;
+  margin: 10px 0px;
+}
+
+.import-comp{
+  width: 80% !important;
   margin: 10px 0px;
-  box-shadow:inset 0 -0.6em 0 -0.35em rgba(0,0,0,0.17);
 }
 </style>
diff --git a/src/components/file_system_interface/SaveProjectComponent.vue b/src/components/file_system_interface/SaveProjectComponent.vue
@@ -7,7 +7,7 @@ Description:
 
 <template>
   <q-btn
-    class="export-btn"
+    class="nav-btn"
     color="secondary"
     label="Save"
     @click="saveProjectJSON"
diff --git a/src/components/home_sidebar_items/ComponentTab/CreateComponent.vue b/src/components/home_sidebar_items/ComponentTab/CreateComponent.vue
@@ -180,7 +180,6 @@ export default {
     flex-direction: column;
     justify-content: flex-start;
     align-items: stretch;
-    margin: 4px;
   }
   .create-component-form {
     display: flex;
diff --git a/src/components/home_sidebar_items/ComponentTab/ImportComponent.vue b/src/components/home_sidebar_items/ComponentTab/ImportComponent.vue
@@ -257,9 +257,8 @@ export default {
 
 <style scoped>
 #import-component-btn{
-  width: 85%;
+  width: 100%;
   margin: 10px 0px;
-  box-shadow:inset 0 -0.6em 0 -0.35em rgba(0,0,0,0.17);
 }
 </style>
 
diff --git a/src/components/slack_login/SlackLoginWindow.vue b/src/components/slack_login/SlackLoginWindow.vue
@@ -1,5 +1,15 @@
 <!--<template v-if="show">-->
 <template>
+  <q-btn class="menu-btn" color= "purple" no-caps @click="openLogin">
+    <!-- Slack logo -->
+    <svg xmlns="http://www.w3.org/2000/svg" style="height: 20px; width: 20px; margin-right: 12px" viewBox="0 0 122.8 122.8">
+      <path d="M25.8 77.6c0 7.1-5.8 12.9-12.9 12.9S0 84.7 0 77.6s5.8-12.9 12.9-12.9h12.9v12.9zm6.5 0c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9v32.3c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9V77.6z" fill="#e01e5a" ></path>
+      <path d="M45.2 25.8c-7.1 0-12.9-5.8-12.9-12.9S38.1 0 45.2 0s12.9 5.8 12.9 12.9v12.9H45.2zm0 6.5c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9H12.9C5.8 58.1 0 52.3 0 45.2s5.8-12.9 12.9-12.9h32.3z" fill="#36c5f0"></path>
+      <path d="M97 45.2c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9-5.8 12.9-12.9 12.9H97V45.2zm-6.5 0c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9V12.9C64.7 5.8 70.5 0 77.6 0s12.9 5.8 12.9 12.9v32.3z" fill="#2eb67d"></path>
+      <path d="M77.6 97c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9-12.9-5.8-12.9-12.9V97h12.9zm0-6.5c-7.1 0-12.9-5.8-12.9-12.9s5.8-12.9 12.9-12.9h32.3c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9H77.6z" fill="#ecb22e" ></path>
+    </svg>
+      Slack Login
+  </q-btn>
   <div>
     <!-- <div>
       <q-btn class="glossy bg-black openModalBtn" size="5px" @click="openLogin">
@@ -13,36 +23,7 @@
     <!--
         Skip button:
         -->
-                <q-btn
-              class="menu-btn"
-              color= "purple"
-              no-caps
-              @click="openLogin"
-            >
-                 <svg
-                xmlns="http://www.w3.org/2000/svg"
-                style="height: 20px; width: 20px; margin-right: 12px"
-                viewBox="0 0 122.8 122.8"
-              >
-                <path
-                  d="M25.8 77.6c0 7.1-5.8 12.9-12.9 12.9S0 84.7 0 77.6s5.8-12.9 12.9-12.9h12.9v12.9zm6.5 0c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9v32.3c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9V77.6z"
-                  fill="#e01e5a"
-                ></path>
-                <path 
-                  d="M45.2 25.8c-7.1 0-12.9-5.8-12.9-12.9S38.1 0 45.2 0s12.9 5.8 12.9 12.9v12.9H45.2zm0 6.5c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9H12.9C5.8 58.1 0 52.3 0 45.2s5.8-12.9 12.9-12.9h32.3z"
-                  fill="#36c5f0"
-                ></path>
-                <path
-                  d="M97 45.2c0-7.1 5.8-12.9 12.9-12.9s12.9 5.8 12.9 12.9-5.8 12.9-12.9 12.9H97V45.2zm-6.5 0c0 7.1-5.8 12.9-12.9 12.9s-12.9-5.8-12.9-12.9V12.9C64.7 5.8 70.5 0 77.6 0s12.9 5.8 12.9 12.9v32.3z"
-                  fill="#2eb67d"
-                ></path>
-                <path
-                  d="M77.6 97c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9-12.9-5.8-12.9-12.9V97h12.9zm0-6.5c-7.1 0-12.9-5.8-12.9-12.9s5.8-12.9 12.9-12.9h32.3c7.1 0 12.9 5.8 12.9 12.9s-5.8 12.9-12.9 12.9H77.6z"
-                  fill="#ecb22e"
-                ></path>
-              </svg>
-              Slack Login
-            </q-btn>
+
 
     <q-dialog
       v-model="showLogin"
@@ -181,6 +162,7 @@ export default {
   color: $menutext;
   background-color: purple;
   margin-bottom: 10px;
+  width: 100%
 
 }
 
@@ -189,7 +171,7 @@ export default {
   background-color: $subprimary;
   border: 1px solid $subprimary;
   text-decoration: underline;
-  margin-top: 30px;
+  margin-top: 20px;
 }
 
 #skipButton:hover {
@@ -211,8 +193,8 @@ export default {
   border: 1px solid #289ead;
 }
 .menu-btn{
-  width: 100%;
-  margin-bottom:20px;
+  width: 80%;
+  margin: 10px 0px;
 }
 
 
diff --git a/src/css/app.scss b/src/css/app.scss
@@ -25,7 +25,8 @@ main {
 }
 .q-btn {
     align-items: center;
-    height: 42px;
+    height: 20px;
+    width: 65px;
 }
 .q-item {
     background: $subsecondary;  
diff --git a/src/layouts/MyLayout.vue b/src/layouts/MyLayout.vue

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,6 @@ i {`
`141`	`141`
`142`	`142`	`.q-tab-panel {`
`143`	`143`	`height: 100%;`
`144`		`- // matchs the code editor bg`
`145`	`144`	`background: $subprimary;`
`146`	`145`	`padding-top: 20px;`
`147`	`146`	`}`
`@@ -158,6 +157,7 @@ i {`
`158`	`157`
`159`	`158`	`.toolbar-background {`
`160`	`159`	`background: black;`
	`160`	`+`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`#store-cards {`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,6 @@ export default {`
`180`	`180`	`flex-direction: column;`
`181`	`181`	`justify-content: flex-start;`
`182`	`182`	`align-items: stretch;`
`183`		`- margin: 4px;`
`184`	`183`	`}`
`185`	`184`	`.create-component-form {`
`186`	`185`	`display: flex;`
Original file line number	Diff line number	Diff line change
`@@ -257,9 +257,8 @@ export default {`
`257`	`257`
`258`	`258`	`<style scoped>`
`259`	`259`	`#import-component-btn{`
`260`		`- width: 85%;`
	`260`	`+ width: 100%;`
`261`	`261`	`margin: 10px 0px;`
`262`		`- box-shadow:inset 0 -0.6em 0 -0.35em rgba(0,0,0,0.17);`
`263`	`262`	`}`
`264`	`263`	`</style>`
`265`	`264`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ main {`
`25`	`25`	`}`
`26`	`26`	`.q-btn {`
`27`	`27`	`align-items: center;`
`28`		`- height: 42px;`
	`28`	`+ height: 20px;`
	`29`	`+ width: 65px;`
`29`	`30`	`}`
`30`	`31`	`.q-item {`
`31`	`32`	`background: $subsecondary;`