diff --git a/_layouts/projects.html b/_layouts/projects.html deleted file mode 100644 index f7075985..00000000 --- a/_layouts/projects.html +++ /dev/null @@ -1,67 +0,0 @@ ---- -layout: default ---- -
- -
-

{{ page.title | remove: "| Vis Design Lab" }}

-
- -
- - -

We are greatful for support from these organizations.

- - -
- - {% for grant in site.funding reversed %} -
- {% if grant.active %} -
-
Active
-
- {% endif %} - -
- {{ grant.title }} -
-
-

Agency: {{ grant.agency }}

- {% if grant.number %} -

Number: {{grant.number}}

- {%endif%} - {% if grant.program %} -

Program: {{grant.program}}

- {%endif%} -

Period: {{grant.time}}

- - -

Recipient(s):

-
    - {% for recipient in grant.recipients %} -
  • {{ recipient }}
  • - {% endfor %} -
- - {% if page.partners %} -

Partners: {{grant.partners}}

- {%endif%} - -
-
- {% endfor %} -
-
- -
\ No newline at end of file diff --git a/_sass/_base.scss b/_sass/_base.scss new file mode 100644 index 00000000..2f6f3077 --- /dev/null +++ b/_sass/_base.scss @@ -0,0 +1,475 @@ +// Bitters v0.10.0 +// http://bitters.bourbon.io + +// Typography +$sans-serif: $helvetica; +$serif: $georgia; +$base-font-family: $sans-serif; + +// Sizes +$base-font-size: 1em; +$base-line-height: $base-font-size * 1.4; +$unitless-line-height: $base-line-height / ($base-line-height * 0 + 1); // Strip units from line-height: https://developer.mozilla.org/en-US/docs/Web/CSS/line-height#Prefer_unitless_numbers_for_line-height_values +$title-line-height: $base-font-size * 1.25; +$base-border-radius: em(3); + + +// Colors +//$blue:#3376A0; +$blue: #477DCA; +$dark-gray: #333; +$medium-gray: #999; +$light-gray: #DDD; +$light-red: #FBE3E4; +$light-yellow: #FFF6BF; +$light-green: #E6EFC2; +$blue2:#3376A0; +$dark-blue:#2C3E50; + +//$home-color: #AD3A33; +$home-color: #C03A2B; +//$home-color: #149747; +//$team-color: #D44942; +$team-color:#3376A0; +//$team-color: #3DB7DD; +$project-color: #EB0021; +$download-color: #F36229; + +//$publication-color: #D66157; +//$publication-color: #3376A0; +//$publication-color: #48A5D3; +$publication-color: #E58035; +$recent-publications-color:#3376A0; //this is being darkened somewhere... +//$publication-color: #4CB0D8; +//$publication-color: #FDB938; +$presentation-color: $download-color; +$help-color: #B2B2B2; +$neutral-color: $help-color; + + +// Background Color +$base-background-color: white; +$base-body-color: white; + +// Font Colors +$base-font-color: $dark-gray; +$base-accent-color: $blue; + +// Link Colors +$base-link-color: $base-accent-color; +$hover-link-color: darken($base-accent-color, 15); +$base-button-color: $base-link-color; +$hover-button-color: $hover-link-color; + +// Border color +$base-border-color: $light-gray; + +// Flash Colors +$alert-color: $light-yellow; +$error-color: $light-red; +$notice-color: $light-yellow; +$success-color: $light-green; + +// Forms +$form-border-color: $base-border-color; +$form-border-color-hover: darken($base-border-color, 10); +$form-border-color-focus: $base-accent-color; +$form-border-radius: $base-border-radius; +$form-box-shadow: inset 0 1px 3px rgba(0,0,0,0.06); +$form-box-shadow-focus: $form-box-shadow, 0 0 5px rgba(darken($form-border-color-focus, 5), 0.7); +$form-font-size: $base-font-size; +$form-font-family: $base-font-family; + +@import url(https://fonts.googleapis.com/css?family=Montserrat:400,700); +@import url(https://fonts.googleapis.com/css?family=Rokkitt:400,700); +@import url(https://fonts.googleapis.com/css?family=Roboto:300,400,500); +@import url(https://fonts.googleapis.com/css?family=Roboto+Condensed:300,400,700); +@import url(https://fonts.googleapis.com/css?family=Roboto+Slab); +@import url(https://fonts.googleapis.com/css?family=Roboto:300italic); + +$old_sans-serif-font-family: Montserrat, Trebuchet, sans-serif; +$old_serif-font-family: Montserrat, Trebuchet, sans-serif; //Vollkorn, Times, serif; +$old_slab-font-family: Rokkitt, Trebuchet, sans-serif; + +$condensed-font-family: 'Roboto Condensed', Montserrat, sans-serif; +$light-condensed-font-family: 'Roboto Condensed', Montserrat, sans-serif; +$italicized-font-family: Roboto, Montserrat, sans-serif; + +$sans-serif-font-family: Roboto, Trebuchet, sans-serif; +$serif-font-family: Roboto, Trebuchet, sans-serif; //Vollkorn, Times, serif; +$slab-font-family: Roboto Slab, Trebuchet, sans-serif; + +$page-title-font-family: $condensed-font-family; +$page-title-font-weight: 900; +$page-title-font-style: normal; +$page-title-font-size: $base-font-size * 3.5; + +$content-title-font-family: $slab-font-family; +$content-title-font-weight: 400; +$content-title-font-style: normal; + +$page-content-font-family: $serif-font-family; +$page-content-font-weight: 300; +$page-content-font-style: light; +$page-content-font-size: 1.1em; + +//$footer-content-font-family: $sans-serif-font-family; +$footer-content-font-family: $light-condensed-font-family; +$footer-content-font-weight: 400; +$footer-content-font-style: normal; +$footer-content-font-size: .7em; + +$navigation-button-font-family: $condensed-font-family; +$navigation-button-font-weight: 700; +$navigation-button-font-style: bold; +$navigation-button-font-size: $base-font-size * 1.0; + + +body { + -webkit-font-smoothing: antialiased; + background-color: $base-background-color; + color: $base-font-color; + font-family: $base-font-family; + font-size: $base-font-size; + line-height: $unitless-line-height; +} + +h1, h2, h3, h4, h5, h6 { + margin: 0; + text-rendering: optimizeLegibility; // Fix the character spacing for headings + clear: left; +} + +h1, h2, h3, h4, h5, h5 { + font-family: $content-title-font-family; + font-weight: $content-title-font-weight; + font-style: $content-title-font-style; + color:#2C3E50; + margin-top: 15px; + margin-bottom: 10px; + //padding-left: 5px; + padding-bottom: 0px; +} + +h1 { + //font-size: $base-font-size * 1.75; // 16 * 2.25 = 36px + font-size: $base-font-size * 1.3; + //border-bottom: 2px $light-gray solid; +} + +h2 { + font-size: $base-font-size * 1.5; // 16 * 2 = 32px + border-bottom: 2px $light-gray solid; +} + +h3 { + font-size: $base-font-size * 1.15; // 16 * 1.75 = 28px +} + +h4 { + font-size: $base-font-size * 1.1; // 16 * 1.5 = 24px +} + +h5 { + font-size: $base-font-size * 1.05; // 16 * 1.25 = 20px +} + +h6 { + font-size: $base-font-size; +} + +p { + margin: 0 0 ($base-line-height * .5); + color:#2B2F33; +} + +a { + @include transition(color 0.1s linear); + color: $base-link-color; + text-decoration: none; + + &:hover { + color: $hover-link-color; + } + + &:active, &:focus { + color: $hover-link-color; + outline: none; + } +} + +hr { + border-bottom: 1px solid $base-border-color; + border-left: none; + border-right: none; + border-top: none; + margin: $base-line-height 0; +} + +img { + margin: 0; + max-width: 100%; +} + +blockquote { + border-left: 2px solid $base-border-color; + color: lighten($base-font-color, 15); + margin: $base-line-height 0; + padding-left: $base-line-height / 2; +} + +cite { + color: lighten($base-font-color, 25); + font-style: italic; + + &:before { + content: '\2014 \00A0'; + } +} + +.page-header h1 { + font-family: $page-title-font-family; + font-weight: $page-title-font-weight; + font-style: $page-title-font-style; + font-size: $base-font-size * 3; // 16 * 3 = 48px + color: $blue2; +} + + +ul { + margin: 0; + padding: 0; + list-style-type: none; + + &%default-ul { + list-style-type: disc; + margin-bottom: $base-line-height / 2; + padding-left: $base-line-height; + } + + &%default-ol { + list-style-type: decimal; + margin-bottom: $base-line-height / 2; + padding-left: $base-line-height; + } +} + + +@mixin icon-list($color, $icon) { + margin: 0; + padding: 0; + list-style-type: none; + + li { + padding-left: 2em; + padding-bottom: 0.5em; + line-height: $base-font-size * 1.2; + vertical-align: top; + color: $base-font-color; + font-family: $sans-serif-font-family; + font-weight: 400; + font-size: $base-font-size * 0.9; + font-style: normal; + min-height: 2.5em; + + a { + font-weight: 700; + color: darken( $color, 20% ); + } + a:after{ + border-bottom-width: 0; + } + } + li:before { + content: $icon; + color: $color; + font-family: FontAwesome; /* or whatever */ + font-size: $base-font-size * 1.3; + margin-left: -2.2em; + padding-left: 0.8em; + width: 1.25em; + height: 1.5em; + float: left; + display: block; + } + } + + + @mixin reverse-dotted-link-underline() { + a { + -moz-transition: border-bottom-color 0.2s ease-in-out; + -webkit-transition: border-bottom-color 0.2s ease-in-out; + -ms-transition: border-bottom-color 0.2s ease-in-out; + transition: border-bottom-color 0.2s ease-in-out; + //color: #444; + //color: $blue2; + position: relative; + text-decoration: none; + border-bottom: dotted 1px transparent; + } + a:hover { + border-bottom-color: #E64C3C; + } + } + + @mixin pub-list($color) { + margin: 0; + padding: 0; + list-style-type: none; + + li { + padding-left: -0.1em; + padding-bottom: 0.2em; + line-height: $base-font-size * 1.2; + vertical-align: top; + //text-align:right; + color: $base-font-color; + font-family: $condensed-font-family; + font-weight: 400; + font-size: $base-font-size * 0.9; + font-style: normal; + min-height: 2.5em; + + @include reverse-dotted-link-underline(); + a { + font-weight: 700; + //color: darken( $color, 20% ); + color: $color; + } +// a:after{ +// border-bottom-width: 0; +// } + .right-text{ + text-align:right; + } + } + } + + @mixin no-icon-list($color) { + margin: 0; + padding: 0; + list-style-type: none; + + li { + padding-left: -0.1em; + //padding-bottom: 0.5em; + line-height: $base-font-size * 1.2; + vertical-align: top; + //text-align:right; + color: $base-font-color; + font-family: $condensed-font-family; + font-weight: 400; + font-size: $base-font-size * 0.9; + font-style: normal; + min-height: 2.5em; + + a:after{ + border-bottom-width: 0; + } + } + } + + @mixin no-icon-list-images($color) { + margin: 0; + padding: 0; + list-style-type: none; + + li { + padding-left: -0.1em; + //padding-bottom: 0.5em; + line-height: $base-font-size * 1.2; + vertical-align: top; + text-align:center; +// color: $base-font-color; +// font-family: $condensed-font-family; +// font-weight: 400; +// font-size: $base-font-size * 0.9; +// font-style: normal; + min-height: 2.5em; + a{ + border-bottom: none; + } + a:after{ + border-bottom-width: 0; + } + } + } + + +ul.project-icon-list { + @include icon-list($project-color,"\f013"); +} + +ul.release-icon-list { + @include icon-list($download-color,"\f019"); +} + +ul.publication-icon-list { + //@include icon-list($publication-color,"\f02d"); + @include pub-list($recent-publications-color); +} + +ul.institution-icon-list { + @include no-icon-list-images($team-color); +} + +ul.person-icon-list { + @include icon-list($team-color,"\f007"); +} + +ul.funding-icon-list { + @include icon-list($neutral-color,"\f19c"); +} + +ul.source-icon-list { + @include icon-list($neutral-color,"\f09b"); +} + + + +/* + ul.project-list { + margin: 0; + padding: 0; + list-style-type: none; + + li { + padding-left: 2.5em ; + line-height: $base-font-size * 2; + vertical-align: middle; + color: $project-color; + font-family: $sans-serif-font-family; + font-weight: 700; + font-size: $base-font-size; + font-style: normal; + + a { + color: $project-color; + } + } + li:before { + content: "\f013"; + color: $project-color; + font-family: FontAwesome; + display: inline-block; + margin-left: -2em; + padding-left: 0.35em; + margin-right: 0.5em; + width: 1.25em; + height: 1.5em; + } + } +*/ + +dl { + margin-bottom: $base-line-height / 2; + + dt { + font-weight: bold; + margin-top: $base-line-height / 2; + } + + dd { + margin: 0; + } +} diff --git a/_sass/base/_base.scss b/_sass/base/_base.scss deleted file mode 100644 index e2e6c218..00000000 --- a/_sass/base/_base.scss +++ /dev/null @@ -1,24 +0,0 @@ -// Bitters v0.10.0 -// http://bitters.bourbon.io - -// Variables -@import 'variables'; - -// Neat Settings -- uncomment if using Neat -- must be imported before Neat -@import 'grid-settings'; - -// Mixins -@import 'mixins/flash'; - -// Extends -@import 'extends/button'; -@import 'extends/clearfix'; -@import 'extends/hide-text'; - -// Typography and Elements -@import 'typography'; -@import 'forms'; -@import 'tables'; -@import 'lists'; -@import 'flashes'; -@import 'buttons'; \ No newline at end of file diff --git a/_sass/base/_buttons.scss b/_sass/base/_buttons.scss deleted file mode 100644 index 3319426e..00000000 --- a/_sass/base/_buttons.scss +++ /dev/null @@ -1,10 +0,0 @@ -button, -input[type="submit"] { - @extend %button; - @include appearance(none); - border: none; - cursor: pointer; - user-select: none; - vertical-align: middle; - white-space: nowrap; -} diff --git a/_sass/base/_cards.scss b/_sass/base/_cards.scss deleted file mode 100644 index ac21be08..00000000 --- a/_sass/base/_cards.scss +++ /dev/null @@ -1,156 +0,0 @@ -.cards { - @include clearfix; -} - -.card { - $card-border-color: $base-border-color; - $card-border: 1px solid $card-border-color; - $card-background: lighten($card-border-color, 10); - $card-header-background: $card-background; - $card-hover-background: lighten($card-background, 5); - $card-image-background: #fff; - $card-image-hover-background: lighten($card-image-background, 5); - $card-stats-color: lighten($base-accent-color, 10); - - min-height: 350px; - - @include transition (all 0.2s ease-in-out); - background-color: $card-background; - border-radius: $base-border-radius; - border: $card-border; - margin-bottom: $base-line-height; - cursor: pointer; - box-shadow: 0 2px 4px darken($base-body-color, 10); - position: relative; - - @include media($large-screen) { - @include span-columns(4); - @include omega(3n); - } - - .card-image { - overflow: hidden; - max-height: 200px; - - img { - width: 100%; - @include transition (all 0.2s ease-in-out); - background: $card-image-background; - border-top-left-radius: $base-border-radius; - border-top-right-radius: $base-border-radius; - } - } - - .ribbon-wrapper { - $ribbon-size: 85px; - $ribbon-background: $base-accent-color; - @include size($ribbon-size); - overflow: hidden; - position: absolute; - top: -1px; - right: -1px; - - .ribbon { - font-size: .8em; - font-weight: 800; - text-align: center; - @include transform(rotate(45deg)); - position: relative; - padding: 2px 7px; - left: -5px; - top: 15px; - width: 120px; - background-color: $ribbon-background; - color: white; - box-shadow: 0px 0px 3px rgba(0,0,0,0.3); - } - } - - @mixin card-header($color) { - @include transition (all 0.2s ease-in-out); - background-color: $card-header-background; - border-bottom: $card-border; - border-radius: $base-border-radius $base-border-radius 0 0; - padding: $base-line-height/3 $gutter/2; - - a { - display: block; - font-family: $sans-serif-font-family; - font-weight: 700; - color: $color; - } - - &:hover { - background-color: tint( $color, 95% );//$card-hover-background; - } - } - - .card-header-project { - @include card-header($project-color); - } - - .card-header-funding { - @include card-header($neutral-color); - } - - .card-header { - @include card-header($neutral-color); - } - - .card-copy { - padding: $base-line-height/2 $gutter/2; - font-size: .9em; - line-height: 1.5em; - } - - .card-stats { - padding: $base-line-height/2 $gutter/2; - overflow: auto; - - ul li { - display: inline; - color: $card-stats-color; - font-weight: 800; - font-size: 1.2em; - float: left; - border-right: 1px solid transparentize($base-font-color, .8); - line-height: 1.1em; - padding: 0 .7em 0 .7em; - - &:first-child { - padding-left: 0; - } - - &:last-child { - border-right: 0; - } - - span { - color: $base-font-color; - font-size: .7em; - display: block; - font-weight: normal; - } - } - } - - &:hover { - background-color: $card-hover-background; - - .card-image img { - background: $card-image-hover-background; - } - - .card-header { - background-color: $card-hover-background; - } - } - - &:active { - background-color: $card-background; - - .card-header { - background-color: $card-background; - } - } -} \ No newline at end of file diff --git a/_sass/base/_flashes.scss b/_sass/base/_flashes.scss deleted file mode 100644 index 7eeddf1c..00000000 --- a/_sass/base/_flashes.scss +++ /dev/null @@ -1,15 +0,0 @@ -%flash-alert { - @include flash($alert-color); -} - -%flash-error { - @include flash($error-color); -} - -%flash-notice { - @include flash($notice-color); -} - -%flash-success { - @include flash($success-color); -} diff --git a/_sass/base/_forms.scss b/_sass/base/_forms.scss deleted file mode 100644 index f880f277..00000000 --- a/_sass/base/_forms.scss +++ /dev/null @@ -1,78 +0,0 @@ -fieldset { - background: lighten($base-border-color, 10); - border: 1px solid $base-border-color; - margin: 0 0 ($base-line-height / 2) 0; - padding: $base-line-height; -} - -input, -label, -select { - display: block; - font-family: $form-font-family; - font-size: $form-font-size; -} - -label { - font-weight: bold; - margin-bottom: $base-line-height / 4; - - &.required:after { - content: "*"; - } - - abbr { - display: none; - } -} - -textarea, -#{$all-text-inputs}, -select[multiple=multiple] { - @include box-sizing(border-box); - @include transition(border-color); - background-color: white; - border-radius: $form-border-radius; - border: 1px solid $form-border-color; - box-shadow: $form-box-shadow; - font-family: $form-font-family; - font-size: $form-font-size; - margin-bottom: $base-line-height / 2; - padding: ($base-line-height / 3) ($base-line-height / 3); - width: 100%; - - &:hover { - border-color: $form-border-color-hover; - } - - &:focus { - border-color: $form-border-color-focus; - box-shadow: $form-box-shadow-focus; - outline: none; - } -} - -textarea { - resize: vertical; -} - -input[type="search"] { - @include appearance(none); -} - -input[type="checkbox"], input[type="radio"] { - display: inline; - margin-right: $base-line-height / 4; -} - -input[type="file"] { - margin-bottom: $base-line-height / 2; - padding-bottom: ($base-line-height / 3); - width: 100%; -} - -select { - width: auto; - max-width: 100%; - margin-bottom: $base-line-height; -} diff --git a/_sass/base/_grid-items.scss b/_sass/base/_grid-items.scss deleted file mode 100644 index 9032535d..00000000 --- a/_sass/base/_grid-items.scss +++ /dev/null @@ -1,78 +0,0 @@ -@mixin grid-item-columns($columns) { - width: (100% / 12) * $columns; -} - -.grid-items { - $grid-items-background: $base-body-color; - $grid-item-background: darken( $base-body-color, 10%); - $grid-item-border-size: 9px; - $grid-item-columns: 4; - $grid-item-big-columns: 8; - $grid-item-color: white; - $grid-item-height: 14em; - - @include clearfix; - - .grid-item { - @include transition (all 0.2s ease-in-out); - height: $grid-item-height; - background: $grid-item-background; - width: 100%; - overflow: hidden; - float: left; - padding: 2em; - border-top: 0; - border-bottom: $grid-item-border-size solid $grid-items-background; - border-left: $grid-item-border-size /2 solid $grid-items-background; - border-right: $grid-item-border-size /2 solid $grid-items-background; - text-align: center; - cursor: pointer; - - @include media($large-screen) { - @include grid-item-columns($grid-item-columns); - } - - } - - .grid-item img { - display: block; - width: 100%; - //height: 3em; - //margin: auto; - //margin-bottom: 1em; - background-size: cover; - } - - .grid-item h1 { - color: $grid-item-color; - font-size: 1.3em; - margin-bottom: .4em; - } - - .grid-item p { - margin: auto; - color: transparentize($grid-item-color, .3); - @include media($medium-screen) { - max-width: 70%; - } - } - - .grid-item-big { - @include media($large-screen) { - @include grid-item-columns($grid-item-big-columns); - } - p { - @include media($medium-screen) { - max-width: 60%; - } - } - } - - .grid-item-image { - background: url(/images/lake-transparent.png); - background-color: $grid-item-background; - background-repeat: no-repeat; - background-position: top; - background-size: cover; - } -} diff --git a/_sass/base/_grid-settings.scss b/_sass/base/_grid-settings.scss deleted file mode 100644 index 19203721..00000000 --- a/_sass/base/_grid-settings.scss +++ /dev/null @@ -1,14 +0,0 @@ -@import '../neat/neat-helpers'; // or '../neat/neat-helpers' when not in Rails - -// Neat Overrides -// $column: 90px; -// $gutter: 30px; -// $grid-columns: 12; -// $max-width: em(1088); - -// Neat Breakpoints -$medium-screen: em(640); -$large-screen: em(860); - -//$medium-screen-up: new-breakpoint(min-width $medium-screen 4); -//: new-breakpoint(min-width $large-screen 8); \ No newline at end of file diff --git a/_sass/base/_lists.scss b/_sass/base/_lists.scss deleted file mode 100644 index cdd75c29..00000000 --- a/_sass/base/_lists.scss +++ /dev/null @@ -1,238 +0,0 @@ -ul { - margin: 0; - padding: 0; - list-style-type: none; - - &%default-ul { - list-style-type: disc; - margin-bottom: $base-line-height / 2; - padding-left: $base-line-height; - } - - &%default-ol { - list-style-type: decimal; - margin-bottom: $base-line-height / 2; - padding-left: $base-line-height; - } -} - - -@mixin icon-list($color, $icon) { - margin: 0; - padding: 0; - list-style-type: none; - - li { - padding-left: 2em; - padding-bottom: 0.5em; - line-height: $base-font-size * 1.2; - vertical-align: top; - color: $base-font-color; - font-family: $sans-serif-font-family; - font-weight: 400; - font-size: $base-font-size * 0.9; - font-style: normal; - min-height: 2.5em; - - a { - font-weight: 700; - color: darken( $color, 20% ); - } - a:after{ - border-bottom-width: 0; - } - } - li:before { - content: $icon; - color: $color; - font-family: FontAwesome; /* or whatever */ - font-size: $base-font-size * 1.3; - margin-left: -2.2em; - padding-left: 0.8em; - width: 1.25em; - height: 1.5em; - float: left; - display: block; - } - } - - - @mixin reverse-dotted-link-underline() { - a { - -moz-transition: border-bottom-color 0.2s ease-in-out; - -webkit-transition: border-bottom-color 0.2s ease-in-out; - -ms-transition: border-bottom-color 0.2s ease-in-out; - transition: border-bottom-color 0.2s ease-in-out; - //color: #444; - //color: $blue2; - position: relative; - text-decoration: none; - border-bottom: dotted 1px transparent; - } - a:hover { - border-bottom-color: #E64C3C; - } - } - - @mixin pub-list($color) { - margin: 0; - padding: 0; - list-style-type: none; - - li { - padding-left: -0.1em; - padding-bottom: 0.2em; - line-height: $base-font-size * 1.2; - vertical-align: top; - //text-align:right; - color: $base-font-color; - font-family: $condensed-font-family; - font-weight: 400; - font-size: $base-font-size * 0.9; - font-style: normal; - min-height: 2.5em; - - @include reverse-dotted-link-underline(); - a { - font-weight: 700; - //color: darken( $color, 20% ); - color: $color; - } -// a:after{ -// border-bottom-width: 0; -// } - .right-text{ - text-align:right; - } - } - } - - @mixin no-icon-list($color) { - margin: 0; - padding: 0; - list-style-type: none; - - li { - padding-left: -0.1em; - //padding-bottom: 0.5em; - line-height: $base-font-size * 1.2; - vertical-align: top; - //text-align:right; - color: $base-font-color; - font-family: $condensed-font-family; - font-weight: 400; - font-size: $base-font-size * 0.9; - font-style: normal; - min-height: 2.5em; - - a:after{ - border-bottom-width: 0; - } - } - } - - @mixin no-icon-list-images($color) { - margin: 0; - padding: 0; - list-style-type: none; - - li { - padding-left: -0.1em; - //padding-bottom: 0.5em; - line-height: $base-font-size * 1.2; - vertical-align: top; - text-align:center; -// color: $base-font-color; -// font-family: $condensed-font-family; -// font-weight: 400; -// font-size: $base-font-size * 0.9; -// font-style: normal; - min-height: 2.5em; - a{ - border-bottom: none; - } - a:after{ - border-bottom-width: 0; - } - } - } - - -ul.project-icon-list { - @include icon-list($project-color,"\f013"); -} - -ul.release-icon-list { - @include icon-list($download-color,"\f019"); -} - -ul.publication-icon-list { - //@include icon-list($publication-color,"\f02d"); - @include pub-list($recent-publications-color); -} - -ul.institution-icon-list { - @include no-icon-list-images($team-color); -} - -ul.person-icon-list { - @include icon-list($team-color,"\f007"); -} - -ul.funding-icon-list { - @include icon-list($neutral-color,"\f19c"); -} - -ul.source-icon-list { - @include icon-list($neutral-color,"\f09b"); -} - - - -/* - ul.project-list { - margin: 0; - padding: 0; - list-style-type: none; - - li { - padding-left: 2.5em ; - line-height: $base-font-size * 2; - vertical-align: middle; - color: $project-color; - font-family: $sans-serif-font-family; - font-weight: 700; - font-size: $base-font-size; - font-style: normal; - - a { - color: $project-color; - } - } - li:before { - content: "\f013"; - color: $project-color; - font-family: FontAwesome; - display: inline-block; - margin-left: -2em; - padding-left: 0.35em; - margin-right: 0.5em; - width: 1.25em; - height: 1.5em; - } - } -*/ - -dl { - margin-bottom: $base-line-height / 2; - - dt { - font-weight: bold; - margin-top: $base-line-height / 2; - } - - dd { - margin: 0; - } -} - diff --git a/_sass/base/_tables.scss b/_sass/base/_tables.scss deleted file mode 100644 index 31e78f4a..00000000 --- a/_sass/base/_tables.scss +++ /dev/null @@ -1,22 +0,0 @@ -table { - border-collapse: collapse; - margin: ($base-line-height / 2) 0; - table-layout: fixed; - width: 100%; -} - -th { - border-bottom: 1px solid darken($base-border-color, 15%); - font-weight: bold; - padding: ($base-line-height / 2) 0; - text-align: left; -} - -td { - border-bottom: 1px solid $base-border-color; - padding: ($base-line-height / 2) 0; -} - -tr, td, th { - vertical-align: middle; -} diff --git a/_sass/base/_typography.scss b/_sass/base/_typography.scss deleted file mode 100644 index 67d1da70..00000000 --- a/_sass/base/_typography.scss +++ /dev/null @@ -1,154 +0,0 @@ -@import url(https://fonts.googleapis.com/css?family=Montserrat:400,700); -@import url(https://fonts.googleapis.com/css?family=Rokkitt:400,700); -@import url(https://fonts.googleapis.com/css?family=Roboto:300,400,500); -@import url(https://fonts.googleapis.com/css?family=Roboto+Condensed:300,400,700); -@import url(https://fonts.googleapis.com/css?family=Roboto+Slab); -@import url(https://fonts.googleapis.com/css?family=Roboto:300italic); - -$old_sans-serif-font-family: Montserrat, Trebuchet, sans-serif; -$old_serif-font-family: Montserrat, Trebuchet, sans-serif; //Vollkorn, Times, serif; -$old_slab-font-family: Rokkitt, Trebuchet, sans-serif; - -$condensed-font-family: 'Roboto Condensed', Montserrat, sans-serif; -$light-condensed-font-family: 'Roboto Condensed', Montserrat, sans-serif; -$italicized-font-family: Roboto, Montserrat, sans-serif; - -$sans-serif-font-family: Roboto, Trebuchet, sans-serif; -$serif-font-family: Roboto, Trebuchet, sans-serif; //Vollkorn, Times, serif; -$slab-font-family: Roboto Slab, Trebuchet, sans-serif; - -$page-title-font-family: $condensed-font-family; -$page-title-font-weight: 900; -$page-title-font-style: normal; -$page-title-font-size: $base-font-size * 3.5; - -$content-title-font-family: $slab-font-family; -$content-title-font-weight: 400; -$content-title-font-style: normal; - -$page-content-font-family: $serif-font-family; -$page-content-font-weight: 300; -$page-content-font-style: light; -$page-content-font-size: 1.1em; - -//$footer-content-font-family: $sans-serif-font-family; -$footer-content-font-family: $light-condensed-font-family; -$footer-content-font-weight: 400; -$footer-content-font-style: normal; -$footer-content-font-size: .7em; - -$navigation-button-font-family: $condensed-font-family; -$navigation-button-font-weight: 700; -$navigation-button-font-style: bold; -$navigation-button-font-size: $base-font-size * 1.0; - - -body { - -webkit-font-smoothing: antialiased; - background-color: $base-background-color; - color: $base-font-color; - font-family: $base-font-family; - font-size: $base-font-size; - line-height: $unitless-line-height; -} - -h1, h2, h3, h4, h5, h6 { - margin: 0; - text-rendering: optimizeLegibility; // Fix the character spacing for headings - clear: left; -} - -h1, h2, h3, h4, h5, h5 { - font-family: $content-title-font-family; - font-weight: $content-title-font-weight; - font-style: $content-title-font-style; - color:#2C3E50; - margin-top: 15px; - margin-bottom: 10px; - //padding-left: 5px; - padding-bottom: 0px; -} - -h1 { - //font-size: $base-font-size * 1.75; // 16 * 2.25 = 36px - font-size: $base-font-size * 1.3; - //border-bottom: 2px $light-gray solid; -} - -h2 { - font-size: $base-font-size * 1.5; // 16 * 2 = 32px - border-bottom: 2px $light-gray solid; -} - -h3 { - font-size: $base-font-size * 1.15; // 16 * 1.75 = 28px -} - -h4 { - font-size: $base-font-size * 1.1; // 16 * 1.5 = 24px -} - -h5 { - font-size: $base-font-size * 1.05; // 16 * 1.25 = 20px -} - -h6 { - font-size: $base-font-size; -} - -p { - margin: 0 0 ($base-line-height * .5); - color:#2B2F33; -} - -a { - @include transition(color 0.1s linear); - color: $base-link-color; - text-decoration: none; - - &:hover { - color: $hover-link-color; - } - - &:active, &:focus { - color: $hover-link-color; - outline: none; - } -} - -hr { - border-bottom: 1px solid $base-border-color; - border-left: none; - border-right: none; - border-top: none; - margin: $base-line-height 0; -} - -img { - margin: 0; - max-width: 100%; -} - -blockquote { - border-left: 2px solid $base-border-color; - color: lighten($base-font-color, 15); - margin: $base-line-height 0; - padding-left: $base-line-height / 2; -} - -cite { - color: lighten($base-font-color, 25); - font-style: italic; - - &:before { - content: '\2014 \00A0'; - } -} - -.page-header h1 { - font-family: $page-title-font-family; - font-weight: $page-title-font-weight; - font-style: $page-title-font-style; - font-size: $base-font-size * 3; // 16 * 3 = 48px - color: $blue2; -} diff --git a/_sass/base/_typography_safe.scss b/_sass/base/_typography_safe.scss deleted file mode 100644 index 20461f79..00000000 --- a/_sass/base/_typography_safe.scss +++ /dev/null @@ -1,135 +0,0 @@ -@import url(https://fonts.googleapis.com/css?family=Montserrat:400,700); -@import url(https://fonts.googleapis.com/css?family=Rokkitt:400,700); - -$sans-serif-font-family: Montserrat, Trebuchet, sans-serif; -$serif-font-family: Montserrat, Trebuchet, sans-serif; //Vollkorn, Times, serif; -$slab-font-family: Rokkitt, Trebuchet, sans-serif; - -$page-title-font-family: $sans-serif-font-family; -$page-title-font-weight: 900; -$page-title-font-style: normal; -$page-title-font-size: $base-font-size * 3; - -$content-title-font-family: $slab-font-family; -$content-title-font-weight: 700; -$content-title-font-style: normal; - -$page-content-font-family: $serif-font-family; -$page-content-font-weight: 400; -$page-content-font-style: normal; -$page-content-font-size: 1em; - -$footer-content-font-family: $sans-serif-font-family; -$footer-content-font-weight: 400; -$footer-content-font-style: normal; -$footer-content-font-size: .7em; - -$navigation-button-font-family: $sans-serif-font-family; -$navigation-button-font-weight: 700; -$navigation-button-font-style: normal; -$navigation-button-font-size: $base-font-size * 0.9; - - -body { - -webkit-font-smoothing: antialiased; - background-color: $base-background-color; - color: $base-font-color; - font-family: $base-font-family; - font-size: $base-font-size; - line-height: $unitless-line-height; -} - -h1, h2, h3, h4, h5, h6 { - margin: 0; - text-rendering: optimizeLegibility; // Fix the character spacing for headings -} - -h1, h2, h3, h4, h5, h5 { - font-family: $content-title-font-family; - font-weight: $content-title-font-weight; - font-style: $content-title-font-style; - margin-bottom: 10px; - padding-left: 5px; - padding-bottom: 0px; -} - -h1 { - font-size: $base-font-size * 1.75; // 16 * 2.25 = 36px - border-bottom: 2px $light-gray solid; -} - -h2 { - font-size: $base-font-size * 1.5; // 16 * 2 = 32px - border-bottom: 2px $light-gray solid; -} - -h3 { - font-size: $base-font-size * 1.15; // 16 * 1.75 = 28px -} - -h4 { - font-size: $base-font-size * 1.10; // 16 * 1.5 = 24px -} - -h5 { - font-size: $base-font-size * 1.05; // 16 * 1.25 = 20px -} - -h6 { - font-size: $base-font-size; -} - -p { - margin: 0 0 ($base-line-height * .5); -} - -a { - @include transition(color 0.1s linear); - color: $base-link-color; - text-decoration: none; - - &:hover { - color: $hover-link-color; - } - - &:active, &:focus { - color: $hover-link-color; - outline: none; - } -} - -hr { - border-bottom: 1px solid $base-border-color; - border-left: none; - border-right: none; - border-top: none; - margin: $base-line-height 0; -} - -img { - margin: 0; - max-width: 100%; -} - -blockquote { - border-left: 2px solid $base-border-color; - color: lighten($base-font-color, 15); - margin: $base-line-height 0; - padding-left: $base-line-height / 2; -} - -cite { - color: lighten($base-font-color, 25); - font-style: italic; - - &:before { - content: '\2014 \00A0'; - } -} - -.page-header h1 { - font-family: $page-title-font-family; - font-weight: $page-title-font-weight; - font-style: $page-title-font-style; - font-size: $base-font-size * 3; // 16 * 3 = 48px -} diff --git a/_sass/base/_variables.scss b/_sass/base/_variables.scss deleted file mode 100644 index b4d99c4b..00000000 --- a/_sass/base/_variables.scss +++ /dev/null @@ -1,78 +0,0 @@ -// Typography -$sans-serif: $helvetica; -$serif: $georgia; -$base-font-family: $sans-serif; - -// Sizes -$base-font-size: 1em; -$base-line-height: $base-font-size * 1.4; -$unitless-line-height: $base-line-height / ($base-line-height * 0 + 1); // Strip units from line-height: https://developer.mozilla.org/en-US/docs/Web/CSS/line-height#Prefer_unitless_numbers_for_line-height_values -$title-line-height: $base-font-size * 1.25; -$base-border-radius: em(3); - - -// Colors -//$blue:#3376A0; -$blue: #477DCA; -$dark-gray: #333; -$medium-gray: #999; -$light-gray: #DDD; -$light-red: #FBE3E4; -$light-yellow: #FFF6BF; -$light-green: #E6EFC2; -$blue2:#3376A0; -$dark-blue:#2C3E50; - -//$home-color: #AD3A33; -$home-color: #C03A2B; -//$home-color: #149747; -//$team-color: #D44942; -$team-color:#3376A0; -//$team-color: #3DB7DD; -$project-color: #EB0021; -$download-color: #F36229; - -//$publication-color: #D66157; -//$publication-color: #3376A0; -//$publication-color: #48A5D3; -$publication-color: #E58035; -$recent-publications-color:#3376A0; //this is being darkened somewhere... -//$publication-color: #4CB0D8; -//$publication-color: #FDB938; -$presentation-color: $download-color; -$help-color: #B2B2B2; -$neutral-color: $help-color; - - -// Background Color -$base-background-color: white; -$base-body-color: white; - -// Font Colors -$base-font-color: $dark-gray; -$base-accent-color: $blue; - -// Link Colors -$base-link-color: $base-accent-color; -$hover-link-color: darken($base-accent-color, 15); -$base-button-color: $base-link-color; -$hover-button-color: $hover-link-color; - -// Border color -$base-border-color: $light-gray; - -// Flash Colors -$alert-color: $light-yellow; -$error-color: $light-red; -$notice-color: $light-yellow; -$success-color: $light-green; - -// Forms -$form-border-color: $base-border-color; -$form-border-color-hover: darken($base-border-color, 10); -$form-border-color-focus: $base-accent-color; -$form-border-radius: $base-border-radius; -$form-box-shadow: inset 0 1px 3px rgba(0,0,0,0.06); -$form-box-shadow-focus: $form-box-shadow, 0 0 5px rgba(darken($form-border-color-focus, 5), 0.7); -$form-font-size: $base-font-size; -$form-font-family: $base-font-family; diff --git a/_sass/base/extends/_button.scss b/_sass/base/extends/_button.scss deleted file mode 100644 index b8d98b84..00000000 --- a/_sass/base/extends/_button.scss +++ /dev/null @@ -1,17 +0,0 @@ -%button { - -webkit-font-smoothing: antialiased; - background-color: $base-button-color; - border-radius: $base-border-radius; - color: white; - display: inline-block; - font-size: $base-font-size; - font-weight: bold; - line-height: 1; - padding: .75em 1em; - text-decoration: none; - - &:hover { - background-color: $hover-button-color; - color: white; - } -} diff --git a/_sass/base/extends/_clearfix.scss b/_sass/base/extends/_clearfix.scss deleted file mode 100644 index 22ac1795..00000000 --- a/_sass/base/extends/_clearfix.scss +++ /dev/null @@ -1,3 +0,0 @@ -%clearfix { - @include clearfix; -} diff --git a/_sass/base/extends/_hide-text.scss b/_sass/base/extends/_hide-text.scss deleted file mode 100644 index a41a1234..00000000 --- a/_sass/base/extends/_hide-text.scss +++ /dev/null @@ -1,3 +0,0 @@ -%hide-text { - @include hide-text; -} diff --git a/_sass/base/mixins/_flash.scss b/_sass/base/mixins/_flash.scss deleted file mode 100644 index 55afd614..00000000 --- a/_sass/base/mixins/_flash.scss +++ /dev/null @@ -1,15 +0,0 @@ -@mixin flash($color) { - background: $color; - color: darken($color, 60); - font-weight: bold; - margin-bottom: $base-line-height / 2; - padding: $base-line-height / 2; - - a { - color: darken($color, 70); - - &:hover { - color: darken($color, 90); - } - } -} diff --git a/_sass/neat/_neat.scss b/_sass/neat/_neat.scss index e93d636e..dddfcfba 100644 --- a/_sass/neat/_neat.scss +++ b/_sass/neat/_neat.scss @@ -7,15 +7,8 @@ // Grid @import "grid/private"; -@import "grid/reset"; @import "grid/grid"; @import "grid/omega"; @import "grid/outer-container"; @import "grid/span-columns"; -@import "grid/row"; -@import "grid/shift"; -@import "grid/pad"; -@import "grid/fill-parent"; @import "grid/media"; -@import "grid/to-deprecate"; -@import "grid/visual-grid"; diff --git a/_sass/neat/grid/_fill-parent.scss b/_sass/neat/grid/_fill-parent.scss deleted file mode 100644 index 859c9779..00000000 --- a/_sass/neat/grid/_fill-parent.scss +++ /dev/null @@ -1,7 +0,0 @@ -@mixin fill-parent() { - width: 100%; - - @if $border-box-sizing == false { - @include box-sizing(border-box); - } -} diff --git a/_sass/neat/grid/_pad.scss b/_sass/neat/grid/_pad.scss deleted file mode 100644 index 3ef5d80e..00000000 --- a/_sass/neat/grid/_pad.scss +++ /dev/null @@ -1,8 +0,0 @@ -@mixin pad($padding: flex-gutter()) { - $padding-list: null; - @each $value in $padding { - $value: if($value == 'default', flex-gutter(), $value); - $padding-list: join($padding-list, $value); - } - padding: $padding-list; -} diff --git a/_sass/neat/grid/_reset.scss b/_sass/neat/grid/_reset.scss deleted file mode 100644 index 496c4a77..00000000 --- a/_sass/neat/grid/_reset.scss +++ /dev/null @@ -1,12 +0,0 @@ -@mixin reset-display { - $container-display-table: false !global; -} - -@mixin reset-layout-direction { - $layout-direction: $default-layout-direction !global; -} - -@mixin reset-all { - @include reset-display; - @include reset-layout-direction; -} diff --git a/_sass/neat/grid/_row.scss b/_sass/neat/grid/_row.scss deleted file mode 100644 index 81da6d36..00000000 --- a/_sass/neat/grid/_row.scss +++ /dev/null @@ -1,17 +0,0 @@ -@mixin row($display: block, $direction: $default-layout-direction) { - @include clearfix; - $layout-direction: $direction !global; - - @if $display == table { - display: table; - @include fill-parent; - table-layout: fixed; - $container-display-table: true !global; - } - - @else { - display: block; - $container-display-table: false !global; - } -} - diff --git a/_sass/neat/grid/_shift.scss b/_sass/neat/grid/_shift.scss deleted file mode 100644 index 1d27b9b7..00000000 --- a/_sass/neat/grid/_shift.scss +++ /dev/null @@ -1,16 +0,0 @@ -@mixin shift($n-columns: 1) { - @include shift-in-context($n-columns); -} - -@mixin shift-in-context($shift: $columns of $container-columns) { - $n-columns: nth($shift, 1); - $parent-columns: container-shift($shift) !global; - - $direction: get-direction($layout-direction, $default-layout-direction); - $opposite-direction: get-opposite-direction($direction); - - margin-#{$opposite-direction}: $n-columns * flex-grid(1, $parent-columns) + $n-columns * flex-gutter($parent-columns); - - // Reset nesting context - $parent-columns: $grid-columns !global; -} diff --git a/_sass/neat/grid/_to-deprecate.scss b/_sass/neat/grid/_to-deprecate.scss deleted file mode 100644 index d0a681fd..00000000 --- a/_sass/neat/grid/_to-deprecate.scss +++ /dev/null @@ -1,57 +0,0 @@ -@mixin breakpoint($query:$feature $value $columns, $total-columns: $grid-columns) { - @warn "The breakpoint() mixin was renamed to media() in Neat 1.0. Please update your project with the new syntax before the next version bump."; - - @if length($query) == 1 { - @media screen and ($default-feature: nth($query, 1)) { - $default-grid-columns: $grid-columns; - $grid-columns: $total-columns; - @content; - $grid-columns: $default-grid-columns; - } - } - - @else if length($query) == 2 { - @media screen and (nth($query, 1): nth($query, 2)) { - $default-grid-columns: $grid-columns; - $grid-columns: $total-columns; - @content; - $grid-columns: $default-grid-columns; - } - } - - @else if length($query) == 3 { - @media screen and (nth($query, 1): nth($query, 2)) { - $default-grid-columns: $grid-columns; - $grid-columns: nth($query, 3); - @content; - $grid-columns: $default-grid-columns; - } - } - - @else if length($query) == 4 { - @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) { - $default-grid-columns: $grid-columns; - $grid-columns: $total-columns; - @content; - $grid-columns: $default-grid-columns; - } - } - - @else if length($query) == 5 { - @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) { - $default-grid-columns: $grid-columns; - $grid-columns: nth($query, 5); - @content; - $grid-columns: $default-grid-columns; - } - } - - @else { - @warn "Wrong number of arguments for breakpoint(). Read the documentation for more details."; - } -} - -@mixin nth-omega($nth, $display: block, $direction: default) { - @warn "The nth-omega() mixin is deprecated. Please use omega() instead."; - @include omega($nth $display, $direction); -} diff --git a/_sass/neat/grid/_visual-grid.scss b/_sass/neat/grid/_visual-grid.scss deleted file mode 100644 index 1c822fd3..00000000 --- a/_sass/neat/grid/_visual-grid.scss +++ /dev/null @@ -1,41 +0,0 @@ -@mixin grid-column-gradient($values...) { - background-image: deprecated-webkit-gradient(linear, left top, left bottom, $values); - background-image: -webkit-linear-gradient(left, $values); - background-image: -moz-linear-gradient(left, $values); - background-image: -ms-linear-gradient(left, $values); - background-image: -o-linear-gradient(left, $values); - background-image: unquote("linear-gradient(left, #{$values})"); -} - -@if $visual-grid == true or $visual-grid == yes { - body:before { - content: ''; - display: inline-block; - @include grid-column-gradient(gradient-stops($grid-columns)); - height: 100%; - left: 0; - margin: 0 auto; - max-width: $max-width; - opacity: $visual-grid-opacity; - position: fixed; - right: 0; - width: 100%; - pointer-events: none; - - @if $visual-grid-index == back { - z-index: -1; - } - - @else if $visual-grid-index == front { - z-index: 9999; - } - - @each $breakpoint in $visual-grid-breakpoints { - @if $breakpoint != nil { - @include media($breakpoint) { - @include grid-column-gradient(gradient-stops($grid-columns)); - } - } - } - } -} diff --git a/css/site.scss b/css/site.scss index 987bd096..f9f4c7ac 100644 --- a/css/site.scss +++ b/css/site.scss @@ -1,12 +1,18 @@ --- --- +// scss-lint:disable LeadingZero +// scss-lint:disable IdSelector +// scss-lint:disable HexNotation +// scss-lint:disable ColorVariable +// scss-lint:disable ColorKeyword +// scss-lint:disable NestingDepth +// scss-lint:disable SelectorDepth + @import '../_sass/bourbon/bourbon'; -@import '../_sass/base/base'; +@import '../_sass/base'; @import '../_sass/neat/neat'; -@import '../_sass/base/cards'; - $small-display-columns: 4; $medium-display-columns: 12; $large-display-columns: 12; @@ -15,7 +21,7 @@ $small-display: new-breakpoint(max-width 749px $small-display-columns); $medium-display: new-breakpoint(min-width 750px max-width 1199px $medium-display-columns); $large-display: new-breakpoint(min-width 1200px $large-display-columns); -/* site specific changes that do not fit into base */ +// Site specific changes that do not fit into base @mixin navigation-button($color) { color: $dark-blue; @@ -29,165 +35,137 @@ $large-display: new-breakpoint(min-width 1200px $large-display-columns); width: 80px; &:last-child { - margin-right: 0px; + margin-right: 0; } a { - display: block; - height: 28px; - padding: 3px 0px; - color: $dark-blue; - border-bottom: 2px $color solid; + color: $dark-blue; + display: block; height: 30px; - //background-color: #444; + padding: 3px 0; - transition-property: background-color, color; + transition-delay: 25ms; transition-duration: 500ms; + transition-property: background-color, color; transition-timing-function: ease; - transition-delay: 25ms; - &:focus, &:hover, &:active, &.active { - //background-color: darken( $color, 20% ); - //color: #2C3E50; - //color: darken( $color, 20% ); - height: 30px; + &:focus, + &:hover, + &:active, + &.active { border-bottom: 5px $color solid; + height: 30px; } } @include media($small-display) { margin-right: 40px; width: auto; - } - - // @include media($medium-display) { - // width: 100px; - // } } .nav-icon { - margin-right: 0.2em; display: inline-block; + margin-right: 0.2em; @include media($medium-display) { - margin-right: 0em; + margin-right: 0; } @include media($small-display) { - margin-right: 0em; + margin-right: 0; } } .nav-text { display: inline-block; - - @include media($medium-display) { - /*display: none;*/ - } - - @include media($small-display) { - /*display: none;*/ - } - } .banner { display: block; - //height: 40px; - margin-top: 40px; margin-bottom: 40px; - //margin-bottom: 20px; - //padding-bottom:20px; - width: 100%; + margin-top: 40px; min-height: 20px; + width: 100%; img { border: 2px solid $dark-blue; } .home-image { - padding-top: 50px; + margin-bottom: 250px; padding-bottom: 50px; - padding-left: 0px; - padding-right: 0px; + padding-left: 0; + padding-right: 0; + padding-top: 50px; width: 100%; - margin-bottom: 250px; + @include media($small-display) { margin-bottom: 100px; } } - #left-banner-image-title, #top-right-banner-image-title, #bottom-right-banner-image-title { + #left-banner-image-title, + #top-right-banner-image-title, + #bottom-right-banner-image-title { line-height: $base-line-height; } .banner-image-title { + color: #3376A0; + display: block; font-family: $condensed-font-family; font-weight: 500; - color: #3376A0; margin-left: 2px; - display: block; max-width: 95%; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + white-space: nowrap; + @include media($small-display) { display: none; } } #main-banner-image { - line-height: $base-font-size; @include span-columns(8); float: left; - margin-top: $base-line-height; + line-height: $base-font-size; margin-right: 1%; - // margin-bottom: 5px; - // padding: 15px; - // padding-bottom: 44px; - // border: 2px solid $dark-blue; + margin-top: $base-line-height; + @include media($medium-display) { margin-right: 0.9%; - // padding: 18px; - // padding-bottom: 48px; } + @include media($small-display) { @include span-columns(12 of 12); margin-bottom: 1.5%; - // margin-top: 15px; - // margin-bottom: 5px; - // padding: 15px; } } #top-right-banner-image { - line-height: $base-font-size; @include span-columns(4); - margin-right: 0; + line-height: $base-font-size; margin-bottom: 0.9%; - // padding: 10px; - // border: 2px solid $dark-blue; + margin-right: 0; + @include media($medium-display) { margin-bottom: 0.7%; - } + @include media($small-display) { @include span-columns(49 of 100); margin-right: 2%; - // margin-bottom: 15px; } } #bottom-right-banner-image { - line-height: $base-font-size; @include span-columns(4); - // padding: 10px; + line-height: $base-font-size; margin-right: 0; - // border: 2px solid $dark-blue; @include media($medium-display) { - } @include media($small-display) { @include span-columns(49 of 100); @@ -203,31 +181,31 @@ $large-display: new-breakpoint(min-width 1200px $large-display-columns); width: 100%; @include media($small-display) { - margin-left: 0px; height: 35px; + margin-left: 0; } } .navigation-buttons { display: block; float: left; - padding-top: 65px; padding-bottom: 15px; + padding-top: 65px; @include media($small-display) { - margin-left: 0px; - padding-top: 0px; + margin-left: 0; padding-bottom: 15px; + padding-top: 0; } } .logo { float: right; - margin-right: 0px; + margin-right: 0; @include media($small-display) { + margin-right: 0; padding-top: 5px; - margin-right: 0px; } } @@ -244,18 +222,17 @@ $large-display: new-breakpoint(min-width 1200px $large-display-columns); @include clearfix; } - body { + margin: 30px auto 0; width: 750px; - margin: 30px auto 0px auto; @include media($large-display) { width: 1200px; } @include media($small-display) { + margin: 10px auto 0; width: 300px; - margin: 10px auto 0px auto; } } @@ -267,7 +244,6 @@ body { @include navigation-button($team-color); } - .publications-button { @include navigation-button($home-color); width: 120px; @@ -277,7 +253,6 @@ body { @include navigation-button($team-color); } - .culture-button { @include navigation-button($home-color); } @@ -286,55 +261,31 @@ body { @include navigation-button($team-color); } - - .project-button { @include navigation-button($home-color); } .award { - color: $publication-color + color: $publication-color; } -/*@mixin page-title($color) { - @include span-columns(12); - @include omega(); - color: $color; - background-color: tint($color,95%); - padding: 30px 0px 0px 0px; - border-bottom: 4px $color solid; - margin-bottom: 20px; - - h1 { - font-family: $page-title-font-family; - font-weight: $page-title-font-weight; - font-style: $page-title-font-style; - font-size: $page-title-font-size; - border-bottom: none; - margin-bottom: 0px; - } -}*/ - @mixin page-title($color) { @include span-columns(12); @include omega(); color: $color; - //background-color: tint($color,95%); - padding: 0px 0px 0px 0px; - //border-bottom: 4px $color solid; + padding: 0; margin-bottom: 20px; h1 { + border-bottom: 0; font-family: $page-title-font-family; - font-weight: $page-title-font-weight; - font-style: $page-title-font-style; font-size: $page-title-font-size; - border-bottom: none; - margin-bottom: 0px; + font-style: $page-title-font-style; + font-weight: $page-title-font-weight; + margin-bottom: 0; } } - @mixin subpage-title($color) { @include page-title($color); @@ -404,55 +355,30 @@ body { @mixin dotted-link-underline() { a { - -moz-transition: border-bottom-color 0.2s ease-in-out; - -webkit-transition: border-bottom-color 0.2s ease-in-out; - -ms-transition: border-bottom-color 0.2s ease-in-out; - transition: border-bottom-color 0.2s ease-in-out; - //color: #444; - //color: $blue2; + border-bottom: dotted 1px #E64C3C; //note: use of :after code below unfortuenatly doesn't work with line breaks... using fall-back position: relative; text-decoration: none; - border-bottom: dotted 1px #E64C3C; //note: use of :after code below unfortuenatly doesn't work with line breaks... using fall-back + transition: border-bottom-color 0.2s ease-in-out; } + a:hover { border-bottom-color: transparent; } - - // a:after{ - // position: absolute; - // left: 0; - // bottom: 2px; - // content: ''; - // width: 100%; - // border-bottom-width: 1px; - // border-bottom-style: dotted; - // display: inline; - // color: #E64C3C; - // } - // a:hover:after{ - // color: transparent; - // } - } @mixin reverse-dotted-link-underline() { a { - -moz-transition: border-bottom-color 0.2s ease-in-out; - -webkit-transition: border-bottom-color 0.2s ease-in-out; - -ms-transition: border-bottom-color 0.2s ease-in-out; - transition: border-bottom-color 0.2s ease-in-out; - //color: #444; - //color: $blue2; + border-bottom: dotted 1px transparent; position: relative; text-decoration: none; - border-bottom: dotted 1px transparent; + transition: border-bottom-color 0.2s ease-in-out; } + a:hover { border-bottom-color: #E64C3C; } } - @mixin page-content() { // for small displays as single column @include single-column-content(); @@ -481,14 +407,13 @@ body { text-rendering: optimizeLegibility; // Fix the character spacing for headings .right-icon { + float: right; + a { color: inherit; font-size: $base-font-size * 0.75; } - - float: right; } - } @mixin page-meta() { @@ -501,22 +426,11 @@ body { p { a { + border-bottom: dotted 1px #E64C3C; color: #444; position: relative; text-decoration: none; - border-bottom: dotted 1px #E64C3C; } - - // a:after{ - // position: absolute; - // left: 0; - // bottom: 0; - // content: ''; - // width: 100%; - // border-bottom-width: 1px; - // border-bottom-style: dotted; - // display: inline; - // } } font-family: $page-content-font-family; @@ -526,7 +440,6 @@ body { text-rendering: optimizeLegibility; // Fix the character spacing for headings } - .project-content { @include page-content(); @include span-columns(12); @@ -609,6 +522,10 @@ body { .post-meta { @include page-meta(); + + color: #636363; + font-size: 14px; + font-style: italic; } .blog-page { @@ -617,168 +534,114 @@ body { @include omega(); } - .blog-teaser { - - float: left; - //background-color: lightgrey; + margin-bottom: 10px; @include media($large-display) { + @include span-columns(5.7); height: 550px; overflow: hidden; - @include span-columns(5.7); - } + @include media($medium-display) { @include span-columns(12); } + @include media(small-display) { @include span-columns(12); } - margin-bottom: 10px; - } -.blog-teaser:nth-child(even) -{ +.blog-teaser:nth-child(even) { @include media($large-display) { - float:right; + float: right; } } -a.project-website { +.project-website { @include reverse-dotted-link-underline; + color: $dark-blue; font-family: $condensed-font-family; font-size: 1em; font-weight: 700; - color: $dark-blue; } .all-news-link { @include dotted-link-underline; a { + color: $dark-blue; font-family: $condensed-font-family; font-size: 1em; font-weight: 700; - color: $dark-blue; } } +.post-list-link { + color: #444; + font-size: 0.9em; + font-style: italic; + position: relative; + text-decoration: none; +} +.post-list-item { + margin-bottom: 10px; - a.post-list-link { - font-style: italic; - font-size: 0.9em; - color: #444; - position: relative; - text-decoration: none; - } - - // a.post-list-link:after{ - // position: absolute; - // left: 0px; - // bottom: 0; - // content: ''; - // width: 100%; - // border-bottom-width: 1px; - // //border-bottom-style: solid; - // } - - .post-list-item { + p { margin-bottom: 10px; - - p { - margin-bottom: 10px; - //display: inline; - } - - - - b { - color: #3376A0; - } - } - // nested fonts in the blog posts should be - .post-list-item h2 { - font-size: $base-font-size; + b { + color: #3376A0; } - .post-list-item h3 { + h2, + h3, + h4 { font-size: $base-font-size; } +} - .post-list-item h4 { - font-size: $base-font-size; +.post-list-title { + color: $dark-blue;// #F1F2F2; + display: block; + font-family: $condensed-font-family; + font-size: 1.2em; + font-style: normal; + font-weight: 700; + margin-bottom: 15px; + padding: 5px; + padding-left: 0; + + .right-text { + font-size: 1em; + font-weight: 400; + padding-left: 10px; + white-space: nowrap; } - .post-list-title { - color: $dark-blue;// #F1F2F2; - //color: lighten(#F1F2F2,0.5); - //background: lighten($home-color, 30%); - - //border-color: $home-color; - //font-family: $sans-serif-font-family; - font-family: $condensed-font-family; - font-weight: 700; + a { + border-bottom: 2px $home-color solid; + color: $dark-blue; + display: flex; font-style: normal; - display: block; - font-size: 1.2em; - padding: 5px; - padding-left: 0px; - margin-bottom: 15px; - - - - - .right-text { - font-size: 1em; - font-weight: 400; - white-space:nowrap; - padding-left: 10px; - } + justify-content: space-between; + padding: 3px 0; - a { - display: flex; - justify-content: space-between; - font-style: normal; - //display: block; - //height: 28px; - padding: 3px 0px; - color: $dark-blue; - - border-bottom: 2px $home-color solid; - //height: 30px; - //background-color: #444; - - transition-property: background-color, color; - transition-duration: 500ms; - transition-timing-function: ease; - transition-delay: 25ms; - - &:focus, &:hover, &:active, &.active { - //height: 30px; - border-bottom: 5px $home-color solid; - } + transition-delay: 25ms; + transition-duration: 500ms; + transition-property: background-color, color; + transition-timing-function: ease; + + &:focus, + &:hover, + &:active, + &.active { + border-bottom: 5px $home-color solid; } - } - - /*.post-list-excerpt { - height:160px; - overflow:hidden; - }*/ - - - -// author and date for a blog post -.post-meta { - font-size: 14px; - font-style: italic; - color: #636363; } .publication-content { @@ -790,6 +653,24 @@ a.project-website { .publication-content-main { @include page-content(); @include span-columns(8); + + .citation { + p { + .paper-title { + color: $blue2; + font-family: $condensed-font-family; + font-weight: 700; + } + + .paper-citation { + font-family: $italicized-font-family; + } + } + } + + i { + color: $blue2; + } } .publication-content-aside { @@ -811,8 +692,24 @@ a.project-website { @include media($large-display) { width: 100%; } + + p { + color: $blue2; + font-size: 0.9em; + } + } + + i { + color: $blue2; + } + + h1 { + padding-top: 0; } + h1:first-child { + margin-top: 0; + } } .publications-content { @@ -832,7 +729,6 @@ a.project-website { @include page-meta(); } - .download-content { @include page-content(); } @@ -841,30 +737,22 @@ a.project-website { @include page-meta(); } - @mixin desaturation($percentage) { - -webkit-filter: grayscale($percentage); - -moz-filter: grayscale($percentage); filter: grayscale($percentage); } @mixin border-radius($radius) { - -webkit-border-radius: $radius; - -moz-border-radius: $radius; - -ms-border-radius: $radius; border-radius: $radius; } -@mixin box-shadow($top, $left, $blur, $color, $inset:"") { - -webkit-box-shadow: $top $left $blur $color #{$inset}; - -moz-box-shadow: $top $left $blur $color #{$inset}; +@mixin box-shadow($top, $left, $blur, $color, $inset: '') { box-shadow: $top $left $blur $color #{$inset}; } .paper-list-block { - min-height: 120px; - margin-bottom: 20px; display: block; + margin-bottom: 20px; + min-height: 120px; @include media($medium-display) { margin-bottom: 40px; @@ -872,15 +760,11 @@ a.project-website { .paper-image-small { @include span-columns(2.5); - margin-top: 5px; - margin-right: 20px; - margin-bottom: 20px; @include box-shadow(1px, 1px, 4px, transparentize(black, 0.75)); @include border-radius(3px); - - @include media($large-display) - { - } + margin-bottom: 20px; + margin-right: 20px; + margin-top: 5px; @include media($medium-display) { @include span-columns(3.5); @@ -894,38 +778,30 @@ a.project-website { .project-image-small { @include span-columns(1); - //float: left; - margin-top: 5px; - margin-right: 20px; - margin-bottom: 20px; @include box-shadow(1px, 1px, 4px, transparentize(black, 0.75)); @include border-radius(3px); - - // @include media($medium-display) { - // @include span-columns(1.5); - // } + margin-bottom: 20px; + margin-right: 20px; + margin-top: 5px; @include media($small-display) { display: none; - // @include span-columns(1.5); - // margin: 10px 0; - // //width: 80%; } } - p.pubs { + .pubs { margin: 0 0 0 1.3em; @include media($small-display) { - margin: 0.5em 0 2em 0; + margin: 0.5em 0 2em; width: 100%; } } p { @include span-columns(9); - font-size: 0.9em; font-family: $light-condensed-font-family; + font-size: 0.9em; font-weight: 300; @include media($medium-display) { @@ -936,7 +812,6 @@ a.project-website { width: 100%; } - .paper-title { @include reverse-dotted-link-underline; @@ -945,16 +820,10 @@ a.project-website { font-weight: 700; } - a:after { - border-bottom-width: 0px; + a::after { + border-bottom-width: 0; } } - - /* - @include span-columns(10); - @include omega; - @include single-column-content(); - */ } .paper-author { @@ -969,45 +838,11 @@ a.project-website { font-size: $page-content-font-size * 0.8; font-weight: 300; margin-bottom: 10px; -} - -.talk p { - margin-bottom: 0; -} - - -/*.paper-title { - font-family:$condensed-font-family; - color:$blue2; - font-weight:700; - a{ - font-weight:700; - } -}*/ - - -// Uncomment this for a sticky footer. -// -/* -.wrapper-for-content-outside-of-footer { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -4em; -} -html, body { - height: 100%; -} - -.footer-2, .push { - height: 17em; - - @include media($large-screen) { - height: 4em; - } + p { + margin-bottom: 0; + } } -*/ $footer-border-color: $light-gray; @@ -1015,22 +850,22 @@ footer { @include span-columns(12); @include omega(); - .footer-content { - @include span-columns(12); - @include omega(); - @include single-column-content(); - } - $footer-background: $base-background-color; $footer-color: black; $footer-link-color: $footer-color; //transparentize($footer-color, .6); $footer-disclaimer-color: $footer-color; //transparentize($footer-color, .6); background: $footer-background; - width: 100%; + border-top: 4px solid $footer-border-color; margin-top: 15px; padding-top: 15px; - border-top: 4px solid $footer-border-color; + width: 100%; + + .footer-content { + @include span-columns(12); + @include omega(); + @include single-column-content(); + } .logo-footer-svg { height: 50px; @@ -1060,34 +895,33 @@ footer { @include media($small-display) { display: none; } - } ul { display: inline-block; - margin-right: auto; - margin-left: auto; margin-bottom: 0.5em; + margin-left: auto; + margin-right: auto; } - @mixin footer-list($padding-default,$padding-small) { + @mixin footer-list($padding-default, $padding-small) { float: right; position: relative; left: -50%; ul { - position: relative; left: 50%; + position: relative; li { - opacity: 0.73; float: left; - padding-right: $padding-default; + opacity: 0.73; padding-left: $padding-default; + padding-right: $padding-default; @include media(small-display) { - padding-right: $padding-small; padding-left: $padding-small; + padding-right: $padding-small; } &:last-child { @@ -1123,16 +957,14 @@ footer { opacity: 0.33; p { - text-align: center; - font-family: $sans-serif-font-family; font-size: $footer-content-font-size * 1.2; font-weight: 700; + text-align: center; } } } - .video { margin: auto; margin-left: 0; @@ -1143,25 +975,25 @@ footer { } .video-wrapper { - position: relative; - padding-bottom: 56.25%; // For ratio 16:9. 75% if ratio is 4:3 height: 0; + padding-bottom: 56.25%; // For ratio 16:9. 75% if ratio is 4:3 + position: relative; } iframe:not(.skip-absolute) { + height: 100%; + left: 0; position: absolute; top: 0; - left: 0; width: 100%; - height: 100%; } .centered { - position: fixed; - top: 50%; left: 50%; - margin-top: -163px; margin-left: -100px; + margin-top: -163px; + position: fixed; + top: 50%; } .logo-404-svg { @@ -1169,94 +1001,43 @@ iframe:not(.skip-absolute) { } .message-404 { - text-align: center; - margin-top: 20px; + color: black; font-family: $page-content-font-family; font-size: $page-content-font-size * 2; - font-weight: 700; font-style: normal; - color: black; + font-weight: 700; + margin-top: 20px; + text-align: center; a { color: black; - &:hover, &:active, &:visited { + &:hover, + &:active, + &:visited { color: black; } } } .rule { - display: block; border-top: 4px solid $footer-border-color; + display: block; + height: 24px; margin-left: 100px; margin-right: 100px; - height: 24px; - padding-top: 20px; padding-bottom: 5px; -} - -.publication-content-main { - .citation { - p { - .paper-title { - font-weight: 700; - font-family: $condensed-font-family; - color: $blue2; - - } - - .paper-citation { - font-family: $italicized-font-family; - } - } - - } - - i { - color: $blue2; - } - -} - -.publication-content-aside { - i { - color: $blue2; - } - - h1 { - padding-top: 0px; - - } - h1:first-child { - margin-top: 0px; - } - - .video { - p { - font-size: 0.9em; - color: $blue2; - } - } + padding-top: 20px; } .paper-image-small-aside { - width: auto; + border: 2px solid $dark-blue; height: auto; - //float: left; - margin-right: 20px; margin-bottom: 20px; - border: 2px solid $dark-blue; - //@include box-shadow( 1px, 1px, 4px, transparentize( black, 0.75) ); - //@include border-radius( 3px ); - - /* - @include span-columns(2); - @include single-column-content(); - */ + margin-right: 20px; + width: auto; } - .institution-logo { height: 80px; @@ -1266,58 +1047,52 @@ iframe:not(.skip-absolute) { } // publication's bib entry -pre.bibtex { - padding: 20px; - overflow-x: auto; +.bibtex { background: #f3f3f3; color: #636363; + overflow-x: auto; + padding: 20px; } // team page in separate sass file @import '../_sass/team'; .social { - padding: 15px; display: block; margin: auto; + padding: 15px; } - // Extra, copyright-free images at the bottom of a publications page. .supplement-image { - border: 2px solid $base-font-color + border: 2px solid $base-font-color; } .supplement-image-div { + max-width: 100%; padding-bottom: 15px; width: 350px; - max-width: 100%; - // height: 310px; - @include media($large-display) { - float: right - } -} -.supplement-image-div:nth-of-type(2n) { - @include media($large-display) { - float: left - } -} + @include media($large-display) { + float: right; + } -.supplement-image-div a:link { - text-decoration: none; - color: #2B2F33; + a { + color: #2B2F33; + text-decoration: none; + } } -.supplement-image-div a:visited { - text-decoration: none; - color: #2B2F33; +.supplement-image-div:nth-of-type(2n) { + @include media($large-display) { + float: left; + } } .supplement-image-caption { height: 40px; } -.fa{ - min-width: 18px +.fa { + min-width: 18px; }