Skip to content

Commit 6a131af

Browse files
authored
Merge pull request #2 from Deepakgthomas/development
Development
2 parents a36d439 + 936e7e2 commit 6a131af

File tree

9 files changed

+53
-24
lines changed

9 files changed

+53
-24
lines changed

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/.idea/
2+
/_site
3+
/.sass-cache
4+
/.jekyll-metadata
5+
/Gemfile.lock
6+
/.bundle
7+
/vendor
8+
.DS_Store
9+
*~

.travis.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
language: ruby
2+
rvm:
3+
- 2.4.2
4+
script: "./_scripts/cibuild"
5+
env:
6+
global:
7+
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
8+
matrix:
9+
secure: hMs/MC74mITE29JFQLj8gVgb5ZoaTUQ8lteFXPqkA2OljTXAzcApvM4Dq46VMIuCsDa+mb8CqFHBXL/y/l13j5wvZJ2IF7XmMKiUDfMBKK733XH0slvAhBKlY7VR0tseFp6KSXPsj9cxwv410re1sJqWoPRV4fjKxYSfvfP0P9VwrGLqfMuL+zPQLkkOx1bR8xcylPX9dPB02t2/LvAmXCG0vLMEmiee7HQmkzey2VZaMpiZqq4sXCYKe91DNyAUkmuDLK4v/cZR6NnqsqGugJ721TdHzsjM9cqWSQCdYtRrLemhrN8Kkb4TYaZZ3pu9BqAHs5gcQfAexneV5tuZ+fNFO8Tco/Q1cRzipqa9mkSLRvpjMkiE4OQECAT1+dOijTDrTmZQFMB79yZhevYPF/HfCx+pGpf+AaWRAGHD+BhHqdeDKOOCAbT9QF7h5nTHLuncaO/vKYAidqBVDYB5Bjh3LswUhhzjWIvue+Hl0zYyObmyMYeHoYLBTnT2ncY+RDY1UNNUxz1fszSimT7KeGbkEsHrXvCJ6tf7OkCDunrik9/OyKTyBoKLpervu8WWypY7CbMDmi314QJgxOdT8r8kclnhDSY0Mw7y552sRteFAF6Vvza7WfPE2hTv26Zh1XzK78lRTRJgekGO1/hVtFbKuv3jcYAARcHmBUeLMVM=
10+
sudo: false
11+
deploy:
12+
provider: pages
13+
skip_cleanup: true
14+
github_token: $GITHUB_TOKEN
15+
repo: lab-design/lab-design.github.io
16+
target_branch: master
17+
local_dir: _site
18+
on:
19+
branch: master

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Open Gemfile in your preferred editor and replace the content with:
12
source "https://rubygems.org"
23

34
# Hello! This is where you manage which Jekyll version is used to run.

_config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
# You can create any custom variable you would like, and they will be accessible
1515
# in the templates via {{ site.myvariable }}.
1616
title: Laboratory for Software Design
17-
email: hridesh@iastate.edu
17+
email: hrajan@tulane.edu # Updated to Tulane email
1818
description: >
1919
TODO
2020
baseurl: "" # the subpath of your site, e.g. /blog
21-
url: "https://lab-design.github.io/"
21+
url: "https://lab-design.github.io/" # Keep the GitHub Pages URL
2222

2323
# Build settings
2424
markdown: kramdown
@@ -30,7 +30,6 @@ exclude:
3030
- _citation_styles
3131
- README.md
3232

33-
3433
collections:
3534
papers: # Declare the `papers` collection, and output a page for every item.
3635
output: true
@@ -53,7 +52,8 @@ static_files:
5352

5453
scholar:
5554
source: .
56-
# Plugins
55+
56+
# Plugins (using the modern approach instead of 'gems')
5757
plugins:
5858
- jekyll-paginate
5959
- jekyll-scholar

_includes/footer.html

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,26 @@
2020
<div class="row">
2121
<div class="col-12">
2222
<div class="row">
23-
<div class="col-xs-12 col-lg-3 isu-logo-wrapper">
23+
<div class="col-xs-12 col-lg-3 tulane-logo-wrapper">
2424
<a href="http://www.iastate.edu">
25-
<img src="/img/isu-stacked.svg" alt="Iowa State University" class="isu-logo">
25+
<img src="/img/tulane-logo.png" alt="Tulane University" class="tulane-logo">
2626
</a>
2727
</div>
2828
<div class="col-xs-12 col-sm-6 col-md-5 col-lg-4">
2929
<p>
3030
<b>Laboratory for Software Design</b>
3131
</p>
32-
<p>115-2 Atanasoff Hall</p>
33-
<p>Ames, IA, 50011-1040, USA</p>
34-
<p>Phone: (515) 294-6168</p>
35-
<p>E-Mail: hridesh@iastate.edu</p>
32+
<p>201 Lindy Claiborne Boggs Center</p>
33+
<p>6823 St. Charles Avenue</p>
34+
<p>New Orleans, LA 70118-5698</p>
35+
<p>Phone: (504) 865-5764</p>
36+
<p>E-Mail: hrajan@tulane.edu</p>
3637
</div>
3738
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4">
3839
<p>
39-
Copyright &copy;
40-
{{ site.time | date: '%Y' }}
41-
Iowa State University of Science and Technology. All rights reserved.<BR>
40+
Copyright &copy;
41+
{{ site.time | date: '%Y' }}
42+
Tulane University. All rights reserved.
4243
<div class="d-none d-lg-block" style="margin-top: 0">
4344
The research and educational activities described on these pages has been supported in part by the
4445
<a href="http://www.nsf.gov">US National Science Foundation (NSF)</a>.

_includes/header.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
<div class="row">
77
<div class="flex-separate col-12">
88
<a href="/" class="nav-link">
9-
<span id="isu-logo">Iowa State University</span>
10-
<span class="d-none d-sm-block">Laboratory for Software Design</span>
11-
<span class="small d-block d-sm-none">Laboratory for Software Design</span>
9+
<img src="/img/tulane-sse-logo.png" alt="Tulane School of Science and Engineering" id="header-logo"
10+
style="height: 60px; margin: 10px 0; background-color: white; padding: 5px; border-radius: 4px;"/>
1211
</a>
1312
<button class="navbar-toggler d-block d-sm-none" type="button" data-toggle="collapse" data-target="#collapseNav">&#9776;</button>
1413
</div>
@@ -32,4 +31,4 @@
3231
</nav>
3332
</div>
3433

35-
</header>
34+
</header>

css/design.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body {
66
}
77

88
.news-card .card-title, .home-page-highlighted-paper-card .card-title {
9-
color: #c00;
9+
color: #006747;
1010
}
1111

1212
.card {
@@ -29,7 +29,7 @@ body {
2929
}
3030

3131
.brand-bg-color {
32-
background-color: #c00;
32+
background-color: #006747;
3333
padding-top: 0.5rem;
3434
}
3535

@@ -44,7 +44,7 @@ body {
4444
}
4545

4646
#isu-logo {
47-
background-image: url("/img/isu-logo.svg");
47+
background-image: url("/img/tulane-logo.png");
4848
background-position: left center;
4949
background-size: contain;
5050
background-repeat: no-repeat;
@@ -187,7 +187,7 @@ nav .navbar {
187187
list-style-type: none;
188188
}
189189

190-
$button-active-color: #c00;
190+
$button-active-color: #006747;
191191

192192
.paper-btns.btn-group {
193193
display: flex;
@@ -249,7 +249,7 @@ $button-active-color: #c00;
249249
}
250250

251251
.paper_card_header .paper_card_header_name:hover, .grant_card_header .grant_card_header_name:hover {
252-
color: #c00;
252+
color: #006747;
253253
}
254254

255255
.paper_card .padded-inner-card-block {
@@ -306,11 +306,11 @@ footer {
306306
vertical-align: top;
307307
}
308308

309-
footer .isu-logo {
309+
footer .tulane-logo {
310310
width: 170px;
311311
}
312312

313-
footer .isu-logo-wrapper {
313+
footer .tulane-logo-wrapper {
314314
text-align: center;
315315
}
316316

img/tulane-logo.png

39.6 KB
Loading

img/tulane-sse-logo.png

15.7 KB
Loading

0 commit comments

Comments
 (0)