Merge branch 'LB-201' of...

Merge branch 'LB-201' of https://code.il2.dso.mil/platform-one/products/bullhorn/launchboard-fe into LB-201

src/components/EditableInput.vue

@@ -167,9 +167,7 @@ export default {
 .mt-n5px {
   margin-top: -5px;
 }
-.theme--dark.v-text-field.no-border
-  > .v-input__control
-  > .v-input__slot:before {
+.theme--dark.v-text-field > .v-input__control > .v-input__slot:before {
   border-color: transparent !important;
   display: none;
 }

src/components/LaunchboardSettings.vue

@@ -13,7 +13,7 @@
               <v-btn
                 icon
                 color="secondary"
-                class="no-border no-link"
+                class="no-link"
                 v-bind="attrs"
                 v-on="on"
                 href="https://login.dso.mil/auth/realms/baby-yoda/account/"

src/components/NavBar.vue

@@ -41,12 +41,7 @@
           </router-link>
         </div>
       </v-toolbar-items>
-      <v-btn
-        icon
-        class="no-border no-link nav-item"
-        id="settings-button"
-        to="/settings"
-      >
+      <v-btn icon class="no-link nav-item" id="settings-button" to="/settings">
         <v-icon>mdi-cog</v-icon>
       </v-btn>
       <v-app-bar-nav-icon

src/components/ProjectsSummary.vue

@@ -61,12 +61,7 @@
               <!-- dots menu visible in xs -->
               <v-menu left content-class="project-summary-menu">
                 <template v-slot:activator="{ on, attrs }">
-                  <v-btn
-                    icon
-                    v-bind="attrs"
-                    v-on="on"
-                    class="d-sm-none no-border"
-                  >
+                  <v-btn icon v-bind="attrs" v-on="on" class="d-sm-none">
                     <v-icon>mdi-dots-vertical</v-icon>
                   </v-btn>
                 </template>
@@ -136,7 +131,6 @@
                       v-on="on"
                       @click.native.stop
                       color="secondary"
-                      class="no-border"
                     >
                       <v-icon small>$vuetify.icons.gitlab</v-icon>
                     </v-btn>
@@ -154,7 +148,6 @@
                       v-on="on"
                       @click.native.stop
                       color="secondary"
-                      class="no-border"
                     >
                       <GitLabIcon class="icon small" icon="rocket" />
                     </v-btn>
@@ -172,7 +165,6 @@
                       v-on="on"
                       @click.native.stop
                       color="secondary"
-                      class="no-border"
                     >
                       <v-icon small>$vuetify.icons.jira</v-icon>
                     </v-btn>
@@ -190,7 +182,6 @@
                       v-on="on"
                       @click.native.stop
                       color="secondary"
-                      class="no-border"
                     >
                       <v-icon small>$vuetify.icons.confluence</v-icon>
                     </v-btn>

src/components/Section.vue

@@ -5,7 +5,6 @@
       <v-spacer />
       <slot name="header-right"></slot>
       <v-btn
-        class="no-border"
         v-if="!hideCollapse && !hideCollapseButton"
         icon
         @click="isCollapsed = !isCollapsed"

src/scss/custom.scss

@@ -65,6 +65,7 @@ body {
   .v-btn {
     height: 40px;
     text-transform: uppercase;
+    border: none !important;
 
     &:not(.v-btn--round).v-size--default {
       min-width: 160px;
@@ -73,10 +74,6 @@ body {
     &.primary {
       color: $primary-button-text-color !important;
     }
-
-    &.no-border {
-      border: none !important;
-    }
   }
 
   // some text areas have a label too close to the text field

src/views/Launchboard.vue

@@ -36,7 +36,11 @@
             <HelpDeskSummary slot="content" />
           </Section>
         </v-col>
-        <v-col cols="12" lg="6" class="d-flex flex-column py-0 pt-lg-3">
+        <v-col
+          cols="12"
+          lg="6"
+          class="d-flex flex-column py-0 pt-lg-3 mt-6 mt-lg-0"
+        >
           <Section>
             <h4 slot="header" class="ma-0 pl-5 text-left">
               <TutorialTooltip tooltipName="projects">
@@ -49,7 +53,6 @@
               <v-tooltip top>
                 <template v-slot:activator="{ on, attrs }">
                   <v-btn
-                    class="no-border"
                     icon
                     v-bind="attrs"
                     v-on="on"

src/views/Projects.vue

@@ -9,7 +9,6 @@
               <v-tooltip top>
                 <template v-slot:activator="{ on, attrs }">
                   <v-btn
-                    class="no-border"
                     icon
                     v-bind="attrs"
                     v-on="on"

src/views/Team.vue

@@ -22,7 +22,7 @@
         <v-btn
           v-if="canEdit && !loading && permission"
           color="secondary"
-          class="no-border mr-4"
+          class="mr-4"
           @click="exportTeams"
         >
           Export List
@@ -30,7 +30,6 @@
         <v-btn
           v-if="canEdit && !loading && permission"
           color="primary"
-          class="no-border"
           @click="state.showEditDialog = true"
         >
           Edit Team Details

src/views/super-admin/Personnel.vue

@@ -31,7 +31,7 @@
               <template v-slot:activator="{ on, attrs }">
                 <v-btn
                   color="secondary"
-                  class="no-border no-link ml-2 light-btn"
+                  class="no-link ml-2"
                   target="_blank"
                   @click="isExporting = true"
                   v-bind="attrs"
@@ -58,13 +58,12 @@
 
                 <v-card-actions>
                   <v-spacer></v-spacer>
-                  <v-btn color="" text @click="isExporting = false">
+                  <v-btn color="secondary" text @click="isExporting = false">
                     Cancel
                   </v-btn>
                   <v-btn
+                    color="primary"
                     :loading="isExportingActive"
-                    text
-                    class="light-btn"
                     @click="exportList"
                   >
                     Export List

src/views/super-admin/Teams.vue

@@ -40,7 +40,7 @@
                 <v-col cols="12" md="8" class="text-right px-0">
                   <v-btn
                     color="secondary"
-                    class="no-border mr-0 mr-sm-2 mb-6 mb-sm-0"
+                    class="mr-0 mr-sm-2 mb-6 mb-sm-0"
                     :block="$vuetify.breakpoint.xs"
                     @click="exportTeams"
                   >
@@ -48,7 +48,7 @@
                   </v-btn>
                   <v-btn
                     color="primary"
-                    class="no-border mb-6 mb-sm-0"
+                    class="mb-6 mb-sm-0"
                     :block="$vuetify.breakpoint.xs"
                     :disabled="state.isUndoingDelete"
                     @click="state.isAdding = true"

src/views/super-admin/Training.vue

@@ -157,7 +157,7 @@
                   <v-btn
                     icon
                     color="secondary"
-                    class="no-border no-link ml-2"
+                    class="no-link ml-2"
                     v-bind="attrs"
                     v-on="on"
                     :href="`mailto:${item.instructors[0].email},${item.instructors[1].email}`"