Skip to content

Commit 7d029fe

Browse files
craig8craig8
authored
Merge pull request eclipse-volttron#12 from ClaireM2/main
Final Pull Request
2 parents de720fc + 8c85002 commit 7d029fe

File tree

163 files changed

+1819
-7195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+1819
-7195
lines changed

‎assets/sass/custom.scss

Lines changed: 250 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
display:block;
55
z-index:999;
66
cursor: pointer;
7-
8-
-webkit-transition-property: all;
7+
border-bottom-style: none;
8+
-webkit-transition-property9: all;
99
-webkit-transition-duration: 0.3s;
1010
-webkit-transition-timing-function: ease;
1111
}
@@ -45,22 +45,26 @@ img {vertical-align: middle;}
4545
max-width: 100%;
4646
position: relative;
4747
margin: auto;
48-
z-index: -1;
49-
50-
48+
text-align: center;
49+
img{
50+
width: 100vw;
51+
height: 30vw;
52+
}
53+
5154

5255
}
5356

57+
58+
5459
/* Caption text */
5560
.text {
56-
color:white;
57-
font-size: 25px;
58-
padding: 50px 250px;
5961
position: absolute;
60-
bottom: 350px;
61-
width: 100%;
62-
text-align:left;
63-
line-height: 50px;
62+
top: 20%;
63+
left: 10%;
64+
right: 10%;
65+
font-size: 1.8vw;
66+
line-height: 2.6vw;
67+
color:white;
6468
text-shadow: 2px 2px 0px black;
6569
}
6670

@@ -95,45 +99,256 @@ img {vertical-align: middle;}
9599
.text {font-size: 11px}
96100
}
97101

98-
102+
/*Publications */
99103
.figConfigpdf{
100104
display: inline-table;
101-
max-width: 20%;
102-
margin-right: 50px;
103-
104-
p {
105-
font-size: medium;
106-
margin-top: -15px;
107-
line-height: 100%;
108-
}
109-
105+
max-width: 2vw;
106+
margin-right: 3vw;
107+
margin-left:2vw;
108+
h4 {
109+
font-size: 1vw;
110+
font-size: 1vw;
111+
line-height: 1.3vw;
112+
margin-bottom: 0.5vw;
113+
text-align:left;
114+
max-width: 100%;
115+
color:black;
116+
117+
118+
}
110119

111120
}
121+
.figConfigpdf figcaption{
122+
position:relative;
123+
p {
124+
font-size: 1vw;
125+
line-height: 1.3vw;
126+
margin-bottom: 3vw;
127+
text-align:left;
128+
max-width: 100%;
129+
color:black;
130+
}
112131

113-
.figConfigpdf h4 {
114-
line-height: 100%;
115132
}
116133

134+
117135
.figConfig{
118136
display: inline-table;
119137
max-width: 20%;
120138
margin-right: 50px;
121-
122-
p {
123-
font-size: medium;
124-
margin-top: -15px;
125-
line-height: 100%;
139+
p{
140+
font-size: 1vw;
141+
line-height: 1.3vw;
142+
margin-bottom: 2vw;
143+
text-align:left;
144+
max-width: 100%;
145+
color:black;
126146
}
127-
128-
129147
}
130148

131149
.figConfig img {
132-
max-width: 380px;
133-
min-width: 380px;
150+
max-width: 20vw;
151+
min-width: 20vw;
134152
}
135153

136154

137-
.figConfig h4 {
138-
line-height: 100%;
155+
/*For sidebar Info*/
156+
.SidebarFig{
157+
158+
159+
.caption{
160+
font-size: 0.9vw;
161+
line-height: 1.3vw;
162+
margin-bottom: 2vw;
163+
color:black;
164+
}
165+
166+
167+
}
168+
169+
.SidebarFig h4{
170+
font-size: 1vw;
171+
}
172+
173+
.SidebarVideo{
174+
width:30vw;
175+
height:10vw;
176+
177+
178+
}
179+
180+
181+
182+
183+
#cta {
184+
text-align: center;
185+
padding: 3.5em 0;
186+
187+
header {
188+
h2 {
189+
display: inline-block;
190+
vertical-align: left;
191+
margin: 0;
192+
}
193+
p{
194+
color:white;
195+
text-align: right;
196+
margin-top: -8%;
197+
max-width:100%;
198+
font-size: 1.5vw;
199+
}
200+
.button {
201+
202+
vertical-align: left;
203+
margin-left: 1em;
204+
}
205+
206+
207+
}
208+
}
209+
a.imageLink{
210+
position:relative;
211+
right: 35vw;
212+
top: -1vw;
213+
z-index: 1;
214+
max-width: 12vw;
215+
216+
}
217+
#nav {
218+
cursor: default;
219+
background-color: black;
220+
@include vendor('background-image', ('linear-gradient(top, rgba(0,0,0,0), rgba(0,0,0,0.3))', 'url("images/bg01.png")'));
221+
padding: 0;
222+
223+
&:after {
224+
content: '';
225+
display: block;
226+
width: 100%;
227+
height: 0.75em;
228+
background-color: _palette(accent, bg);
229+
background-image: url("images/bg01.png");
230+
}
231+
232+
> ul {
233+
margin: 0;
234+
235+
> li {
236+
position: relative;
237+
display: inline-block;
238+
margin-left: 1em;
239+
240+
a {
241+
color: _palette(obscure, fg);
242+
text-decoration: none;
243+
border: 0;
244+
display: block;
245+
padding: 1.5em 0.5em 1.35em 0.5em;
246+
}
247+
248+
&:first-child {
249+
margin-left: 0;
250+
}
251+
252+
&:hover {
253+
a {
254+
color: _palette(accent, fg);
255+
}
256+
}
257+
258+
&.current {
259+
font-weight: 600;
260+
261+
&:before {
262+
@include vendor('transform', 'rotateZ(45deg)');
263+
width: 0.75em;
264+
height: 0.75em;
265+
content: '';
266+
display: block;
267+
position: absolute;
268+
bottom: -0.5em;
269+
left: 50%;
270+
margin-left: -0.375em;
271+
background-color: _palette(accent, bg);
272+
background-image: url("images/bg01.png");
273+
}
274+
275+
a {
276+
color: _palette(accent, fg);
277+
278+
}
279+
}
280+
281+
&.active {
282+
a {
283+
color: white;
284+
background-color: black;
285+
}
286+
287+
&.current {
288+
&:before {
289+
background-color: black;
290+
opacity: 0;
291+
}
292+
293+
}
294+
&.opener{
295+
background-color: black;
296+
}
297+
}
298+
299+
> ul {
300+
display: none;
301+
background-color: black;
302+
303+
}
304+
}
305+
}
306+
}
307+
308+
header {
309+
p {
310+
color: _palette(fg-light);
311+
font-size: 1em;
312+
position: relative;
313+
margin-top: -1.25em;
314+
margin-bottom: 0.25em;
315+
font-style:italic;
316+
}
317+
318+
&.major {
319+
text-align: center;
320+
margin: 0 0 2em 0;
321+
322+
h2 {
323+
font-size: 2.25em;
324+
}
325+
326+
p {
327+
position: relative;
328+
border-top: solid 1px _palette(border);
329+
padding: 1em 0 0 0;
330+
margin: 0;
331+
top: -1em;
332+
font-size: 1.5em;
333+
letter-spacing: -0.025em;
334+
}
335+
}
336+
}
337+
338+
339+
.PlaylistFig{
340+
display: inline-table;
341+
max-width: 30%;
342+
margin-bottom: 3vw;
343+
344+
345+
p{
346+
max-width:100%;
347+
font-size:1vw;
348+
line-height:1.2vw;
349+
}
350+
h4{
351+
margin-bottom:0.1vw;
352+
}
353+
139354
}

‎config/_default/menus.toml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99

1010
[[main]]
1111
parent = "ARCHIVES"
12-
name = "OFFICE HOURS"
13-
url = "/tags/office hours/"
12+
name = "PLAYLISTS"
13+
url = "/tags/playlists/"
1414
weight = 64
15+
[[main]]
16+
parent = "ARCHIVES"
17+
name = "QUOTES"
18+
url = "/archives/quotes/"
19+
weight = 65
20+
[[main]]
21+
parent = "ARCHIVES"
22+
name = "ACCOMPLISHMENTS"
23+
url = "/archives/accomplishments/"
24+
weight = 66

‎content/ABOUT/About.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ image: images/VOLTTRON-Device-Better2.jpg
77
image_alt: "Hello!"
88

99
sidebar_left: AboutSidebar
10-
sidebar_right: AboutSidebar2
10+
1111

1212
---
13-
Inexpensive, small-scale computers—such as the Raspberry Pi—can have VOLTTRON™ installed as a controller.
13+
Inexpensive, small-scale computers—such as the Raspberry Pi—can have Eclipse VOLTTRON installed as a controller.
1414

15-
### About VOLTTRON™
16-
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.
15+
### About Eclipse VOLTTRON
16+
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.
1717

18-
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.
18+
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.
1919

20-
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.
20+
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.

0 commit comments

Comments
 (0)