Merge branch 'bb-revisions' into 'master'

Big Bang Revisions

See merge request platform-one/private/bullhorn/platform1-site!83

src/components/Base/Tooltip.vue

+<template>
+  <v-tooltip
+    :left="left"
+    :right="right"
+    :top="top || (!left && !right && !bottom)"
+    :bottom="bottom"
+  >
+    <template v-slot:activator="{ on, attrs }">
+      <span v-bind="attrs" v-on="on" class="text">{{ text }}</span>
+    </template>
+    <span>{{ tooltip }}</span>
+  </v-tooltip>
+</template>
+<script>
+export default {
+  name: "Wave",
+  props: {
+    text: {
+      type: String,
+      default: ""
+    },
+    tooltip: {
+      type: String,
+      default: ""
+    },
+    left: {
+      type: Boolean,
+      default: false
+    },
+    right: {
+      type: Boolean,
+      default: false
+    },
+    top: {
+      type: Boolean,
+      default: false
+    },
+    bottom: {
+      type: Boolean,
+      default: false
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.text {
+  border-bottom: 1px dotted #333;
+}
+</style>

src/components/ServicesSummary.vue

@@ -41,7 +41,7 @@
           <div class="text">
             Platform One provides a chat app for IL2 (Public) and IL4 (FOUO)
             communication to DoD users around the world. No-hassle video
-            teleconferencing for the DOD
+            teleconferencing for the DoD
           </div>
           <ExternalLink class="mt-4" href="https://chat.collab.cdl.af.mil/">
             Chat

src/scss/variables.scss

@@ -14,7 +14,6 @@ $p1-yellow: #f7be16;
 
 $bottom-bg: #031727;
 
-
 $link-color: #53b9f9;
 $link-hover-color: #0056b3;
 
@@ -32,7 +31,7 @@ $font-size-root: 16px;
 $btn-letter-spacing: normal;
 $btn-sizes: (
   "default": 40,
-  "large": 70,
+  "large": 70
 );
 $btn-font-weight: 600;
 
@@ -41,9 +40,11 @@ $btn-font-sizes: (
   "small": 0.75rem,
   "default": 0.75rem,
   "large": 1rem,
-  "x-large": 1.125rem,
+  "x-large": 1.125rem
 );
 
+$tooltip-background-color: rgba(0, 0, 0, 0.95);
+
 // $headings: (
 //   "h1": (
 //     "size": 5rem,

src/views/BigBang.vue

@@ -64,7 +64,9 @@
             <KeyboardSettingsIcon class="logo" />
             <h4>P1 TRAINING FOR OPS TEAMS</h4>
             <div class="text">
-              We train platform ops team for SRE work.
+              We train platform ops team for
+              <Tooltip text="SRE" tooltip="Site Reliability Engineering" />
+              work.
             </div>
           </div>
           <div class="col-md-6 col-lg-4 card-container">
@@ -78,7 +80,7 @@
       </div>
       <h2 class="mt-sm-16 pt-sm-16">How Do We Do It?</h2>
 
-      <div class="image-wrapper pt-16" @click="() => showImg(0)">
+      <div class="image-wrapper pt-4" @click="() => showImg(0)">
         <img
           class="img-fluid"
           src="@/assets/images/Big Bang Architecture.png"
@@ -152,10 +154,10 @@
 
       <div class="my-4">
         <h2 class="my-6 mt-sm-12">THE BIG BANG STAGES</h2>
+        <h3>Stage 1</h3>
         <p class="mx-lg-16">
-          <b>Stage 1</b> - We execute the Big Bang IaC/CaC Package to create a
-          software factory with the tools required to build and deploy
-          applications.
+          We execute the Big Bang IaC/CaC Package to create a software factory
+          with the tools required to build and deploy applications.
         </p>
         <div class="image-wrapper" @click="() => showImg(1)">
           <img
@@ -163,11 +165,14 @@
             src="@/assets/images/Big Bang Graphics-03.png"
           />
         </div>
+        <h3 class="mt-4">Stage 2</h3>
         <p class="mx-lg-16 px-lg-16">
-          <b>Stage 2</b> - You bring your own (BYO) ATO environments, pipelines,
-          and C-ATO, but use the IAC/CAC from Big Bang to stand up your own
-          software factory to automate the testing and deployment of the mission
-          application.
+          Using the Big Bang IaC/CaC, you get to go fast because you get an ATO
+          ready platform (kubernetes cluster and pipeline), with approved Iron
+          Bank containers. This helps you to set up your own software factory by
+          automating the testing and deployment of mission applications.
+          Platform One will assist you with Big Bang IaC/CaC Approving Official
+          (AO) reciprocity.
         </p>
         <div class="image-wrapper" @click="() => showImg(2)">
           <img
@@ -283,6 +288,7 @@
 <script>
 import PageHeader from "@/components/PageHeader";
 import Wave from "@/components/Wave";
+import Tooltip from "@/components/Base/Tooltip";
 import VueEasyLightbox from "vue-easy-lightbox";
 import WorkshopIcon from "@/assets/images/icons/Icon_Workshop.svg";
 import ResidencyIcon from "@/assets/images/icons/Icon_Residency.svg";
@@ -298,6 +304,7 @@ export default {
   components: {
     PageHeader,
     Wave,
+    Tooltip,
     VueEasyLightbox,
     WorkshopIcon,
     ResidencyIcon,

src/views/Services.vue

@@ -64,7 +64,7 @@
         <div class="col-lg-5">
           <h4>
             PLATFORM ONE CONTINUOUS INTEGRATION / CONTINUOUS DELIVERY (CI/CD)
-            WITH INFRASTRUCTURE AS CODE (IAC)
+            WITH INFRASTRUCTURE AS CODE (IaC)
           </h4>
           <div class="pl-4 pr-16">
             <ul>