Merge pull request #12 from ClaireM2/main

Final Pull Request

assets/sass/custom.scss

@@ -4,8 +4,8 @@
     display:block; 
     z-index:999; 
     cursor: pointer; 
-
-    -webkit-transition-property: all; 
+    border-bottom-style: none;
+    -webkit-transition-property9: all; 
     -webkit-transition-duration: 0.3s; 
     -webkit-transition-timing-function: ease; 
 } 
@@ -45,22 +45,26 @@ img {vertical-align: middle;}
   max-width: 100%;
   position: relative;
   margin: auto;
-  z-index: -1;
-
-
+ text-align: center;
+  img{
+    width: 100vw;
+    height: 30vw;
+  }
+
 
 }
 
+
+
 /* Caption text */
 .text {
-  color:white;
-  font-size: 25px;
-  padding: 50px 250px;
   position: absolute;
-  bottom: 350px;
-  width: 100%;
-  text-align:left;
-  line-height: 50px;
+  top: 20%;
+  left: 10%;
+  right: 10%;
+  font-size: 1.8vw;
+  line-height: 2.6vw;
+  color:white;
   text-shadow: 2px 2px 0px black;
 }
 
@@ -95,45 +99,256 @@ img {vertical-align: middle;}
   .text {font-size: 11px}
 }
 
-
+/*Publications */
 .figConfigpdf{
     display: inline-table;
-    max-width: 20%;
-    margin-right: 50px;
-
-    p {
-     font-size: medium;
-     margin-top: -15px;
-     line-height: 100%;
-    }
-
+    max-width: 2vw;
+    margin-right: 3vw;
+    margin-left:2vw;
+    h4 {
+      font-size: 1vw;
+      font-size: 1vw; 
+      line-height: 1.3vw; 
+      margin-bottom: 0.5vw;
+      text-align:left;
+      max-width: 100%;
+      color:black;
+
+
+     }
 
 }
+.figConfigpdf figcaption{
+  position:relative;
+  p {
+    font-size: 1vw; 
+    line-height: 1.3vw; 
+    margin-bottom: 3vw;
+    text-align:left;
+    max-width: 100%;
+    color:black;
+   }
 
-.figConfigpdf h4 {
-    line-height: 100%;
 }
 
+
 .figConfig{
     display: inline-table;
     max-width: 20%;
     margin-right: 50px;
-
-    p {
-     font-size: medium;
-     margin-top: -15px;
-     line-height: 100%;
+    p{
+      font-size: 1vw; 
+      line-height: 1.3vw; 
+      margin-bottom: 2vw;
+      text-align:left;
+      max-width: 100%;
+      color:black;
     }
-
-
 }
 
 .figConfig img {
-    max-width: 380px;
-    min-width: 380px;
+    max-width: 20vw;
+    min-width: 20vw;
 }
 
 
-.figConfig h4 {
-    line-height: 100%;
+/*For sidebar Info*/
+.SidebarFig{
+
+
+  .caption{
+    font-size: 0.9vw; 
+    line-height: 1.3vw; 
+    margin-bottom: 2vw;
+    color:black;
+  }
+
+
+}
+
+.SidebarFig h4{
+  font-size: 1vw;
+}
+
+.SidebarVideo{
+  width:30vw;
+  height:10vw;
+
+
+}
+
+
+
+
+#cta {
+  text-align: center;
+  padding: 3.5em 0;
+
+  header {
+      h2 {
+          display: inline-block;
+          vertical-align: left;
+          margin: 0;
+      }
+      p{
+        color:white;
+        text-align: right;
+        margin-top: -8%;
+        max-width:100%;
+        font-size: 1.5vw;
+      }
+      .button { 
+
+          vertical-align: left;
+          margin-left: 1em;
+      }
+
+
+  }
+}
+a.imageLink{
+  position:relative;
+  right: 35vw;
+  top: -1vw;
+  z-index: 1;
+  max-width: 12vw;
+
+}
+#nav {
+  cursor: default;
+  background-color: black;
+  @include vendor('background-image', ('linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.3))', 'url("images/bg01.png")'));
+  padding: 0;
+
+  &:after {
+      content: '';
+      display: block;
+      width: 100%;
+      height: 0.75em;
+      background-color: _palette(accent, bg);
+      background-image: url("images/bg01.png");
+  }
+
+  > ul {
+      margin: 0;
+
+      > li {
+          position: relative;
+          display: inline-block;
+          margin-left: 1em;
+
+          a {
+              color: _palette(obscure, fg);
+              text-decoration: none;
+              border: 0;
+              display: block;
+              padding: 1.5em 0.5em 1.35em 0.5em;
+          }
+
+          &:first-child {
+              margin-left: 0;
+          }
+
+          &:hover {
+              a {
+                  color: _palette(accent, fg);
+              }
+          }
+
+          &.current {
+              font-weight: 600;
+
+              &:before {
+                  @include vendor('transform', 'rotateZ(45deg)');
+                  width: 0.75em;
+                  height: 0.75em;
+                  content: '';
+                  display: block;
+                  position: absolute;
+                  bottom: -0.5em;
+                  left: 50%;
+                  margin-left: -0.375em;
+                  background-color: _palette(accent, bg);
+                  background-image: url("images/bg01.png");
+              }
+
+              a {
+                  color: _palette(accent, fg);
+
+              }
+          }
+
+          &.active {
+              a {
+                  color: white;
+                  background-color: black;
+              }
+
+              &.current {
+                  &:before {
+                    background-color: black;
+                      opacity: 0;
+                  }
+
+              }
+              &.opener{
+                  background-color: black;
+              }
+          }
+
+          > ul {
+              display: none;
+              background-color: black;
+
+          }
+      }
+  }
+}
+
+header {
+  p {
+      color: _palette(fg-light);
+      font-size: 1em;
+      position: relative;
+      margin-top: -1.25em;
+      margin-bottom: 0.25em;
+      font-style:italic;
+  }
+
+  &.major {
+      text-align: center;
+      margin: 0 0 2em 0;
+
+      h2 {
+          font-size: 2.25em;
+      }
+
+      p {
+          position: relative;
+          border-top: solid 1px _palette(border);
+          padding: 1em 0 0 0;
+          margin: 0;
+          top: -1em;
+          font-size: 1.5em;
+          letter-spacing: -0.025em;
+      }
+  }
+}
+
+
+.PlaylistFig{
+  display: inline-table;
+  max-width: 30%;
+  margin-bottom: 3vw;
+
+
+  p{
+    max-width:100%;
+    font-size:1vw;
+    line-height:1.2vw;
+  }
+  h4{
+    margin-bottom:0.1vw;
+  }
+
 }

config/_default/menus.toml

@@ -9,6 +9,16 @@
 
 [[main]]
     parent = "ARCHIVES"
-    name = "OFFICE HOURS"
-     url = "/tags/office hours/"
+    name = "PLAYLISTS"
+     url = "/tags/playlists/"
     weight = 64
+[[main]]
+    parent = "ARCHIVES"
+    name = "QUOTES"
+     url = "/archives/quotes/"
+    weight = 65
+[[main]]
+    parent = "ARCHIVES"
+    name = "ACCOMPLISHMENTS"
+     url = "/archives/accomplishments/"
+    weight = 66

content/ABOUT/About.md

@@ -7,14 +7,14 @@ image: images/VOLTTRON-Device-Better2.jpg
 image_alt: "Hello!"
 
 sidebar_left: AboutSidebar
-sidebar_right: AboutSidebar2
+
 
 ---
-Inexpensive, small-scale computers—such as the Raspberry Pi—can have VOLTTRON™ installed as a controller.
+Inexpensive, small-scale computers—such as the Raspberry Pi—can have Eclipse VOLTTRON installed as a controller.
 
-### About VOLTTRON™
-VOLTTRON™, developed at Pacific Northwest National Laboratory and available as an open-source tool, provides an environment where data and devices connect seamlessly and securely to make decisions based on user needs and preferences.
+### About Eclipse VOLTTRON
+Eclipse VOLTTRON, developed at Pacific Northwest National Laboratory and available as an open-source tool, provides an environment where data and devices connect seamlessly and securely to make decisions based on user needs and preferences.
 
-Business, research and academic communities agree that VOLTTRON™ is an important and versatile resource for improving building system performance and creating a more flexible and reliable power grid. But the technology’s adaptability has significantly expanded its potential beyond buildings and the grid; users are applying the platform in ways not originally envisioned.
+Business, research and academic communities agree that Eclipse VOLTTRON is an important and versatile resource for improving building system performance and creating a more flexible and reliable power grid. But the technology’s adaptability has significantly expanded its potential beyond buildings and the grid; users are applying the platform in ways not originally envisioned.
 
-VOLTTRON™ is open source and publicly available from GitHub, and its ongoing development benefits from a highly collaborative approach. The U.S. Department of Energy views the technology as a central component of buildings-grid integration, and provides funding support. Updates and other advances are carried out by a PNNL research team working in concert with an active nationwide community of users.
+Eclipse VOLTTRON is open source and publicly available from GitHub, and its ongoing development benefits from a highly collaborative approach. The U.S. Department of Energy views the technology as a central component of buildings-grid integration, and provides funding support. Updates and other advances are carried out by a PNNL research team working in concert with an active nationwide community of users.