diff --git a/Gemfile.lock b/Gemfile.lock index 50aa6836..2e8a6d36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GIT - remote: git://github.com/flori/json.git + remote: https://github.com/flori/json.git revision: 7f4cfd853f2c919d854fb95548a19980feff17e8 branch: v1.8 specs: @@ -149,4 +149,4 @@ DEPENDENCIES wdm (~> 0.1.0) BUNDLED WITH - 2.0.1 + 2.0.2 diff --git a/source/projects.html.erb b/source/projects.html.erb index 6f50214c..aa508522 100644 --- a/source/projects.html.erb +++ b/source/projects.html.erb @@ -14,19 +14,27 @@ title: Projects

Current Projects

<% data.projects.each do |project| %> +
- <% link_to "/projects/#{project[0].split('-')[1]}" do %> - - <% end %> + <% link_to "/projects/#{project[0].split('-')[1]}" do %> + + + <% end %> +
<% link_to "/projects/#{project[0].split('-')[1]}" do %>

<%= project[1].name %>

<% end %> - <%= project[1].tagline %>
+ <% end %>
+ @@ -39,13 +47,19 @@ title: Projects <% data.pastprojects.each do |project| %>
<% link_to "/projects/#{project[0].split('-')[1]}" do %> - + + + + <% end %>
<% link_to "/projects/#{project[0].split('-')[1]}" do %>

<%= project[1].name %>

<% end %> - <%= project[1].tagline %>
<% end %> @@ -53,12 +67,14 @@ title: Projects

Research, Events and Outreach

- <% data.small_projects.each do |project| %> -
-

<%= project.name %>

- <%= project.tagline %> -
- <% end %> + + <% data.small_projects.each do |project| %> +
+

<%= project.name %>

+ +
+ <% end %> +
diff --git a/source/stylesheets/pages/_projects.scss b/source/stylesheets/pages/_projects.scss index 9f378af0..caea446d 100644 --- a/source/stylesheets/pages/_projects.scss +++ b/source/stylesheets/pages/_projects.scss @@ -1,10 +1,15 @@ +$boxsize: (100% / 4); + .projects-page { .sidebar-box { - @include sidebar-box($columns: 5, $side: right); + //removing this include removes the gray side bar on the page background + //@include sidebar-box($columns: 5, $side: right); + padding-bottom: 4rem; @media screen and (max-width: $medium-breakpoint){ padding: rem-calc(0 20); + padding-bottom: 4rem; } @media screen and (max-width: $small-breakpoint){ @@ -20,8 +25,32 @@ } } + .otherprojects { + padding-top: 2rem; + width: 50%; + padding-right: 1rem + } + + .projectname { + width: 100%; + text-align: center; + font-size: 1.2rem; + font-weight: 300; + padding: .5%; + } + + .overlay { + opacity: 0; + // background-color: $light-gray; + text-align: center; + color: black; + transition: opacity $transition-speed; + height: inherit; + + } + .projects-list { - @include grid-column($columns: 12); + //@include grid-column($columns: 12); padding: rem-calc(72-9 0); display: flex; flex-wrap: wrap; @@ -31,59 +60,78 @@ } &__project { - padding-right: 1rem; + padding-right: 2rem; margin-top: rem-calc(48); - width: 50%; + padding-top: 2rem; + height: 240px; + width: (100% / 4); //alter size of past projects @media screen and (max-width: $small-breakpoint){ width: 100%; - padding: rem-calc(0 0); + padding: rem-calc(20 20); + height: 300px; } + &__logo { float: left; - width: percentage(2/6); - padding-top: percentage(2/6); + width: 100%; + height: 100%; + //padding-top: percentage(2/6); background-color: $light-gray; background-position: center center; background-repeat: no-repeat; background-size: 45% 65%; opacity: 1; transition: opacity $transition-speed; - &:hover { opacity: .8 } + &:hover { + opacity: .8 + } } &__text { - float: left; - width: percentage(4/6); - padding-left: rem-calc(16); + //float: left; + //width: percentage(4/6); + //padding-top: rem-calc(16); + text-align: center; } &__name { margin-top: rem-calc(-5); + font-size: larger; opacity: 1; transition: opacity $transition-speed; &:hover { opacity: .8 } } &__tagline { - font-size: rem-calc(20); + // font-size: rem-calc(20); + width: inherit - 2rem; + //height: inherit; + text-align: center; + height: inherit; + padding-top: 20%; + padding-left: 2%; + padding-right: 2%; } } &--current-projects { - @include grid-column($columns: 6); + //@include grid-column($columns: 3); - @media screen and (max-width: $small-breakpoint){ + @media screen { width: 100%; padding: rem-calc(20 0); } - - .projects-list__project { - width: 100%; - } + } } + .projects-list__project__logo:hover .overlay{ + opacity: .8; + font-weight: 400; + } + + .choose-project { @include grid-column($columns: 4, $offset: 2); padding: rem-calc(72-9 0); diff --git a/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/hooks/fsmonitor-watchman.sample b/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/hooks/fsmonitor-watchman.sample new file mode 100755 index 00000000..e673bb39 --- /dev/null +++ b/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/hooks/fsmonitor-watchman.sample @@ -0,0 +1,114 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 1) and a time in nanoseconds +# formatted as a string and outputs to stdout all files that have been +# modified since the given time. Paths must be relative to the root of +# the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $time) = @ARGV; + +# Check the hook interface version + +if ($version == 1) { + # convert nanoseconds to seconds + $time = int $time / 1000000000; +} else { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree; +if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $git_work_tree = Win32::GetCwd(); + $git_work_tree =~ tr/\\/\//; +} else { + require Cwd; + $git_work_tree = Cwd::cwd(); +} + +my $retry = 1; + +launch_watchman(); + +sub launch_watchman { + + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $time but were not transient (ie created after + # $time but no longer exist). + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + # + # The category of transient files that we want to ignore will have a + # creation clock (cclock) newer than $time_t value and will also not + # currently exist. + + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $time, + "fields": ["name"], + "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] + }] + END + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + my $json_pkg; + eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; + } or do { + require JSON::PP; + $json_pkg = "JSON::PP"; + }; + + my $o = $json_pkg->new->utf8->decode($response); + + if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { + print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; + $retry--; + qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + print "/\0"; + eval { launch_watchman() }; + exit 0; + } + + die "Watchman: $o->{error}.\n" . + "Falling back to scanning...\n" if $o->{error}; + + binmode STDOUT, ":utf8"; + local $, = "\0"; + print @{$o->{files}}; +} diff --git a/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/hooks/pre-commit.sample b/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/hooks/pre-commit.sample index 68d62d54..6a756416 100755 --- a/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/hooks/pre-commit.sample +++ b/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/hooks/pre-commit.sample @@ -12,7 +12,7 @@ then against=HEAD else # Initial commit: diff against an empty tree object - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 + against=$(git hash-object -t tree /dev/null) fi # If you want to allow non-ASCII filenames set this variable to true. diff --git a/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-4e2ae80d5272fdb3ba05ff821fa1d05704b7d5c2.idx b/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-493cad39993b63b7e82fa05183a579a89f474971.idx similarity index 57% rename from vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-4e2ae80d5272fdb3ba05ff821fa1d05704b7d5c2.idx rename to vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-493cad39993b63b7e82fa05183a579a89f474971.idx index 020ef9ff..c167b566 100644 Binary files a/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-4e2ae80d5272fdb3ba05ff821fa1d05704b7d5c2.idx and b/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-493cad39993b63b7e82fa05183a579a89f474971.idx differ diff --git a/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-4e2ae80d5272fdb3ba05ff821fa1d05704b7d5c2.pack b/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-493cad39993b63b7e82fa05183a579a89f474971.pack similarity index 90% rename from vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-4e2ae80d5272fdb3ba05ff821fa1d05704b7d5c2.pack rename to vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-493cad39993b63b7e82fa05183a579a89f474971.pack index 8438b661..59aad36f 100644 Binary files a/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-4e2ae80d5272fdb3ba05ff821fa1d05704b7d5c2.pack and b/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/objects/pack/pack-493cad39993b63b7e82fa05183a579a89f474971.pack differ diff --git a/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/packed-refs b/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/packed-refs index fb4ffcfb..026723ad 100644 --- a/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/packed-refs +++ b/vendor/bundle/ruby/2.3.0/cache/bundler/git/json-132b69a65294080c4cd99e3339a5eccf62b169e7/packed-refs @@ -2,7 +2,7 @@ 79fa7f352bae842017c885101a556875600fb468 refs/heads/fix-additions-problem-v1.5.5 3ce359bbf308354b86e94248fc13dfd4b23c792e refs/heads/fix-additions-problem-v1.6.8 d85896768c0276cec317fa0851a46845e68dfacc refs/heads/gh-pages -463473c6c37b3a14fde4c2d21403d6dc8500c185 refs/heads/master +8d8e1aa70297d55034e3f6a4ce2f32300294b2a4 refs/heads/master d76588541a65fd7c56e5c990fb7ba39eabeef277 refs/heads/raise-error-on-invalid-utf8 23d86cde3397dd6a3b59cd0534ea8c066054af10 refs/heads/replace-nan 7f4cfd853f2c919d854fb95548a19980feff17e8 refs/heads/v1.8