Skip to content

Commit 5a9fe8b

Browse files
JeffCarverJeffCarver
authored
Merge pull request #15 from Simon-Initiative/dev
Fix the look|attend to page layout and new features
2 parents 0fc308a + 522603c commit 5a9fe8b

58 files changed

Lines changed: 11048 additions & 2609 deletions

Some content is hidden

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

‎Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ GEM
1515
faraday-net_http (>= 2.0, < 3.2)
1616
faraday-net_http (3.1.0)
1717
net-http
18-
ffi (1.16.3-x64-mingw-ucrt)
18+
ffi (1.17.2-x64-mingw-ucrt)
1919
forwardable-extended (2.6.0)
2020
google-protobuf (4.26.1-x64-mingw-ucrt)
2121
rake (>= 13)

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ urlimg: 'https://adaptiveexperiments.github.io/images/'
4949

5050

5151
# Logo size is 600x80 pixels
52-
logo: "easi_logo.png"
52+
logo: "easi_new_logo.png"
5353

5454
# Plugins
5555
plugins:

‎_data/navigation.yml‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,28 @@
66
url: "/about/"
77
side: left
88
dropdown:
9-
- title: "Project Overview"
10-
url: "/overview/"
9+
- title: "Research Support"
10+
url: "/support/"
1111
- title: "Team"
1212
url: "/team/"
13-
- title: "Adaptive Experiment"
14-
url: "/adaptive/"
1513

16-
- title: "Conferences & Events"
14+
- title: "Use Cases"
1715
url: "/"
1816
side: left
1917
dropdown:
20-
- title: "SIPS Workshop"
21-
url: "/workshops/"
22-
- title: "Participate"
23-
url: "/participate/"
24-
25-
26-
- title: "Documentation"
27-
url: "/"
28-
side: left
29-
dropdown:
30-
- title: "MOOClet"
31-
url: "/mooclet/"
18+
- title: "Mathia"
19+
url: 'https://www.carnegielearning.com/solutions/math/mathia'
3220
- title: "UpGrade"
33-
url: "/upgrade/"
21+
url: 'https://www.upgradeplatform.org'
3422
- title: "OLI"
35-
url: "/oli/"
36-
23+
url: 'https://oli.cmu.edu'
24+
- title: "MOOClet"
25+
url: "/mooclet/"
3726

38-
- title: Experiment
27+
- title: Publications
3928
url: "/overview/"
4029
side: left
41-
dropdown:
42-
- title: "A/B Testing"
43-
url: "/mooclet/"
44-
- title: "Contextual Exp"
45-
url: "/mooclet/"
46-
- title: "Non-Contextual"
47-
url: "/mooclet/"
48-
30+
4931
- title: "Contact"
5032
url: "/contact/"
5133
side: left

‎_includes/_masthead.html‎

Lines changed: 76 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,138 +1,140 @@
1-
{% if page.header == NULL and page.header.image_fullwidth == NULL and page.header.pattern == NULL and page.header.background-color == NULL and page.header.title == NULL %}
1+
{% comment %} Masthead with safer Liquid checks and fallback to text brand if no logo set {% endcomment %}
22

3+
{%- assign header = page.header -%}
4+
5+
{% if header == nil or header == empty %}
36
<div id="masthead-no-image-header">
4-
<div class="row">
5-
<div class="small-12 columns">
6-
<a id="logo" href="{{ '/' | absolute_url }}" title="{{ site.title }} – {{ site.slogan }}">
7-
<img src="{{ site.url }}{{ site.baseurl }}/assets/img/{{ site.logo }}" alt="{{ site.title }} – {{ site.slogan }}">
8-
</a>
9-
</div><!-- /.small-12.columns -->
10-
</div><!-- /.row -->
7+
<div class="row">
8+
<div class="small-12 columns">
9+
{% if site.logo and site.logo != "" %}
10+
<a id="logo" href="{{ '/' | absolute_url }}" title="{{ site.title }} – {{ site.slogan }}">
11+
<img src="{{ '/assets/img/' | absolute_url }}{{ site.logo }}" alt="{{ site.title }} – {{ site.slogan }}">
12+
</a>
13+
{% else %}
14+
<a id="logo-text" href="{{ '/' | relative_url }}" title="{{ site.title }} – {{ site.slogan }}">
15+
<span class="site-title-text">{{ site.slogan | default: "Experiments-As-A-Service-Infrastructure" }}</span>
16+
</a>
17+
<style>
18+
.site-title-text { font-weight:700; color:#0f172a; font-size:1rem; text-decoration:none; }
19+
</style>
20+
{% endif %}
21+
</div><!-- /.small-12.columns -->
22+
</div><!-- /.row -->
1123
</div><!-- /#masthead -->
1224

1325
{% if page.breadcrumb == true %}
1426
{% include _breadcrumb.html %}
1527
{% endif %}
1628

29+
{% elsif header.title %}
1730

18-
19-
20-
21-
{% elsif page.header.title %}
22-
23-
<div id="masthead-with-text" style="{% if page.header.background-color %}background: {{ page.header.background-color }};{% endif %} {% if page.header.image_fullwidth %}{% elsif page.header.pattern %}background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.4)), url('{{ site.urlimg }}/{{ page.header.pattern }}'){% endif %}">
24-
<div class="row">
25-
<div class="small-12 columns">
26-
<div class="masthead-title">{{ page.header.title }}</div>
27-
</div><!-- /.small-12.columns -->
28-
</div><!-- /.row -->
31+
<div id="masthead-with-text" style="{% if header['background-color'] %}background: {{ header['background-color'] }};{% endif %} {% if header.image_fullwidth %}{% elsif header.pattern %}background: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.4)), url('{{ site.urlimg }}/{{ header.pattern }}'){% endif %}">
32+
<div class="row">
33+
<div class="small-12 columns">
34+
<div class="masthead-title">{{ header.title }}</div>
35+
</div><!-- /.small-12.columns -->
36+
</div><!-- /.row -->
2937
</div><!-- /#masthead -->
3038

3139
{% if page.breadcrumb == true %}
3240
{% include _breadcrumb.html %}
3341
{% endif %}
3442

35-
{% if page.header.caption_url && page.header.caption %}
43+
{% if header.caption_url and header.caption %}
3644
<div class="masthead-caption">
37-
<a href="{{ page.header.caption_url }}">{{ page.header.caption }}</a>
45+
<a href="{{ header.caption_url }}">{{ header.caption }}</a>
3846
</div>
39-
{% elsif page.header.caption %}
47+
{% elsif header.caption %}
4048
<div class="masthead-caption">
41-
{{ page.header.caption }}
49+
{{ header.caption }}
4250
</div>
4351
{% endif %}
4452

45-
46-
47-
48-
49-
{% elsif page.header.image_fullwidth %}
53+
{% elsif header.image_fullwidth %}
5054

5155
<div id="masthead">
52-
<div class="row">
53-
<div class="small-12 columns">
54-
<a id="logo" href="{{ '/' | absolute_url }}" title="{{ site.title }} – {{ site.slogan }}">
55-
<img src="{{ site.url }}{{ site.baseurl }}/assets/img/{{ site.logo }}" alt="{{ site.title }} – {{ site.slogan }}">
56-
</a>
57-
</div><!-- /.small-12.columns -->
58-
</div><!-- /.row -->
56+
<div class="row">
57+
<div class="small-12 columns">
58+
{% if site.logo and site.logo != "" %}
59+
<a id="logo" href="{{ '/' | absolute_url }}" title="{{ site.title }} – {{ site.slogan }}">
60+
<img src="{{ '/assets/img/' | absolute_url }}{{ site.logo }}" alt="{{ site.title }} – {{ site.slogan }}">
61+
</a>
62+
{% else %}
63+
<a id="logo-text" href="{{ '/' | relative_url }}" title="{{ site.title }} – {{ site.slogan }}">
64+
<span class="site-title-text">{{ site.slogan | default: "Experiments-As-A-Service-Infrastructure" }}</span>
65+
</a>
66+
{% endif %}
67+
</div><!-- /.small-12.columns -->
68+
</div><!-- /.row -->
5969
</div><!-- /#masthead -->
6070

6171
{% if page.breadcrumb == true %}
6272
{% include _breadcrumb.html %}
6373
{% endif %}
6474

65-
{% if page.header.caption_url && page.header.caption %}
75+
{% if header.caption_url and header.caption %}
6676
<div class="masthead-caption">
67-
<a href="{{ page.header.caption_url }}">{{ page.header.caption }}</a>
77+
<a href="{{ header.caption_url }}">{{ header.caption }}</a>
6878
</div>
69-
{% elsif page.header.caption %}
79+
{% elsif header.caption %}
7080
<div class="masthead-caption">
71-
{{ page.header.caption }}
81+
{{ header.caption }}
7282
</div>
7383
{% endif %}
7484

85+
{% elsif header.pattern %}
7586

76-
77-
78-
79-
{% elsif page.header.pattern %}
80-
81-
<div id="masthead-with-pattern" style="background: url('{{ site.urlimg }}/{{ page.header.pattern }}')">
82-
<div class="row">
83-
<figure class="small-12 columns">
84-
<img src="{{ site.urlimg }}/{{ page.header.image }}" alt="{{ site.title }}">
85-
</figure><!-- /.small-12.columns -->
86-
</div><!-- /.row -->
87+
<div id="masthead-with-pattern" style="background: url('{{ site.urlimg }}/{{ header.pattern }}')">
88+
<div class="row">
89+
<figure class="small-12 columns">
90+
{% if header.image %}
91+
<img src="{{ site.urlimg }}/{{ header.image }}" alt="{{ site.title }}">
92+
{% endif %}
93+
</figure><!-- /.small-12.columns -->
94+
</div><!-- /.row -->
8795
</div><!-- /#masthead -->
8896

8997
{% if page.breadcrumb == true %}
9098
{% include _breadcrumb.html %}
9199
{% endif %}
92100

93-
{% if page.header.caption_url && page.header.caption %}
101+
{% if header.caption_url and header.caption %}
94102
<div class="masthead-caption">
95-
<a href="{{ page.header.caption_url }}">{{ page.header.caption }}</a>
103+
<a href="{{ header.caption_url }}">{{ header.caption }}</a>
96104
</div>
97-
{% elsif page.header.caption %}
105+
{% elsif header.caption %}
98106
<div class="masthead-caption">
99-
{{ page.header.caption }}
107+
{{ header.caption }}
100108
</div>
101109
{% endif %}
102110

111+
{% elsif header['background-color'] %}
103112

104-
105-
106-
107-
{% elsif page.header.background-color %}
108-
109-
<div id="masthead-with-background-color" style="background: {{ page.header.background-color }};">
110-
<div class="row">
111-
<figure class="small-12 columns">
112-
<img src="{{ site.urlimg }}/{{ page.header.image }}" alt="{{ site.title }}">
113-
</figure><!-- /.small-12.columns -->
114-
</div><!-- /.row -->
113+
<div id="masthead-with-background-color" style="background: {{ header['background-color'] }};">
114+
<div class="row">
115+
<figure class="small-12 columns">
116+
{% if header.image %}
117+
<img src="{{ site.urlimg }}/{{ header.image }}" alt="{{ site.title }}">
118+
{% endif %}
119+
</figure><!-- /.small-12.columns -->
120+
</div><!-- /.row -->
115121
</div><!-- /#masthead -->
116122

117123
{% if page.breadcrumb == true %}
118124
{% include _breadcrumb.html %}
119125
{% endif %}
120126

121-
{% if page.header.caption_url && page.header.caption %}
127+
{% if header.caption_url and header.caption %}
122128
<div class="masthead-caption">
123-
<a href="{{ page.header.caption_url }}">{{ page.header.caption }}</a>
129+
<a href="{{ header.caption_url }}">{{ header.caption }}</a>
124130
</div>
125-
{% elsif page.header.caption %}
131+
{% elsif header.caption %}
126132
<div class="masthead-caption">
127-
{{ page.header.caption }}
133+
{{ header.caption }}
128134
</div>
129135
{% endif %}
130136

131-
132-
133-
134-
135-
{% elsif page.header == false %}
137+
{% elsif header == false %}
136138

137139
{% if page.breadcrumb == true %}
138140
{% include _breadcrumb.html %}

‎_includes/_navigation.html‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
1818

1919
____ _ __ __ _ __ _ __ _
2020
/ __ \(_)___ _/ /_ / /_ / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
21-
/ /_/ / / __ `/ __ \/ __/ / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
21+
/ /_/ / / __ `/ __/\/ __/ / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
2222
/ _, _/ / /_/ / / / / /_ / /| / /_/ /| |/ / / /_/ / /_/ / /_/ / /_/ / / / /
2323
/_/ |_/_/\__, /_/ /_/\__/ /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
2424
/____/ /____/
@@ -44,15 +44,23 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
4444
{% if link.side == 'right' %}
4545
{% comment %} If right side WITHOUT dropdown menu do {% endcomment %}
4646
{% if link.dropdown == nil %}
47-
<li class="divider"></li>
48-
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
47+
<li class="{% if link.url == page.url %} active{% elsif page.homepage == true and link.url == '/' %} active{% endif %}">
48+
{% if link.url contains 'http' %}
49+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ link.url }}" target="_blank">{{ link.title | escape }}</a>
50+
{% else %}
51+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ link.url | relative_url }}">{{ link.title | escape }}</a>
52+
{% endif %}
53+
</li>
4954

5055
{% comment %} If right side WITH dropdown menu do {% endcomment %}
5156
{% else %}
5257

53-
<li class="divider"></li>
5458
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
55-
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
59+
{% if link.url contains 'http' %}
60+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ link.url }}" target="_blank">{{ link.title | escape }}</a>
61+
{% else %}
62+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ link.url | relative_url }}">{{ link.title | escape }}</a>
63+
{% endif %}
5664

5765
<ul class="dropdown">
5866
{% for dropdown_link in link.dropdown %}
@@ -63,7 +71,11 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
6371
{% assign domain = site.url %}
6472
{% endif %}
6573

66-
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
74+
{% if dropdown_link.url contains 'http' %}
75+
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ dropdown_link.url }}" target="_blank">{{ dropdown_link.title | escape }}</a></li>
76+
{% else %}
77+
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ dropdown_link.url | relative_url }}">{{ dropdown_link.title | escape }}</a></li>
78+
{% endif %}
6779
{% endfor %}
6880
</ul>
6981

@@ -102,14 +114,24 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
102114

103115
{% comment %} If left side WITHOUT dropdown menu do {% endcomment %}
104116
{% if link.dropdown == nil %}
105-
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
117+
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}>
118+
{% if link.url contains 'http' %}
119+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ link.url }}" target="_blank">{{ link.title | escape }}</a>
120+
{% else %}
121+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ link.url | relative_url }}">{{ link.title | escape }}</a>
122+
{% endif %}
123+
</li>
106124
<li class="divider"></li>
107125

108126
{% comment %} If left side WITH dropdown menu do {% endcomment %}
109127
{% else %}
110128

111129
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
112-
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
130+
{% if link.url contains 'http' %}
131+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ link.url }}" target="_blank">{{ link.title | escape }}</a>
132+
{% else %}
133+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ link.url | relative_url }}">{{ link.title | escape }}</a>
134+
{% endif %}
113135

114136
<ul class="dropdown">
115137
{% for dropdown_link in link.dropdown %}
@@ -120,7 +142,11 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
120142
{% assign domain = site.url %}
121143
{% endif %}
122144

123-
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
145+
{% if dropdown_link.url contains 'http' %}
146+
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ dropdown_link.url }}" target="_blank">{{ dropdown_link.title | escape }}</a></li>
147+
{% else %}
148+
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ dropdown_link.url | relative_url }}">{{ dropdown_link.title | escape }}</a></li>
149+
{% endif %}
124150
{% endfor %}
125151
</ul>
126152

‎_sass/_07_layout.scss‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,13 @@ body.video p,
3636
body.video a,
3737
body.video blockquote:before,
3838
body.video blockquote:after,
39-
body.video cite a, { color: #fff; }
40-
body.video cite a:visited, { color: #fff; }
41-
body.video cite { color: #fff; }
39+
body.video cite a,
40+
body.video cite a:visited {
41+
color: #fff;
42+
}
43+
body.video cite {
44+
color: #fff;
45+
}
4246

4347

4448

0 commit comments

Comments
 (0)