Skip to content

Commit

Permalink
updated logo, fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
edsilv committed Jun 8, 2020
1 parent 45ed585 commit 85dac1a
Show file tree
Hide file tree
Showing 13 changed files with 5,893 additions and 304 deletions.
19 changes: 12 additions & 7 deletions css/styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Start Bootstrap - v1.0.0 (https://github.com/UniversalViewer/universalviewer.github.io#readme)
* Copyright 2013-2018 Edward Silverton <[email protected]> (http://edsilv.com)
* Copyright 2013-2020 Edward Silverton <[email protected]> (http://edsilv.com)
* Licensed under ()
*/
body.home header {
Expand Down Expand Up @@ -33,7 +33,7 @@ body.home header .header-content .header-content-inner hr {
margin: 30px auto;
}
body.home header .header-content .header-content-inner p {
font-weight: 400;
font-weight: bold;
color: rgba(255, 255, 255, 0.95);
font-size: 18px;
margin-bottom: 50px;
Expand Down Expand Up @@ -144,7 +144,7 @@ body.home .call-to-action h2 {
}
body.home span.explanatory {
display: block;
font-size: 12px;
font-size: 14px;
}
body.home #moreinfo {
padding-bottom: 0px;
Expand Down Expand Up @@ -193,7 +193,7 @@ body {
width: 100%;
}
body {
font-family: 'Merriweather', 'Helvetica Neue', Arial, sans-serif;
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
webkit-tap-highlight-color: #222222;
}
hr {
Expand Down Expand Up @@ -223,7 +223,7 @@ h3,
h4,
h5,
h6 {
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
font-family: 'Inter', sans-serif;
}
p {
font-size: 16px;
Expand All @@ -249,14 +249,14 @@ aside {
.navbar-default {
background-color: white;
border-color: rgba(34, 34, 34, 0.05);
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
font-family: 'Inter', sans-serif;
-webkit-transition: all 0.35s;
-moz-transition: all 0.35s;
transition: all 0.35s;
}
.navbar-default .navbar-header .navbar-brand {
color: #3e114e;
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
font-family: 'Inter', sans-serif;
font-weight: 700;
text-transform: uppercase;
}
Expand Down Expand Up @@ -344,6 +344,11 @@ aside {
padding-right: 0;
padding-left: 0;
}
@media (min-width: 1200px) {
.col-lg-3 {
width: 24%;
}
}
.btn-default {
color: #222222;
background-color: white;
Expand Down
4 changes: 2 additions & 2 deletions css/styles.min.css

Large diffs are not rendered by default.

Binary file removed img/_header.jpg
Binary file not shown.
Binary file modified img/_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!-- Custom Fonts -->
<link href="/vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;700&display=swap" rel="stylesheet">

<!-- Plugin CSS -->
<link href="/vendor/magnific-popup/magnific-popup.css" rel="stylesheet">
Expand Down Expand Up @@ -348,10 +348,10 @@ <h2 class="section-heading">Get In Touch</h2>
<a href="https://docs.google.com/forms/d/e/1FAIpQLSeHLD0kng5aXvGFsNN_tJGsZMTnp08Hv2F6kdGsJRb6bT0NWw/viewform">Join the UV Slack</a>
<span class="explanatory">This is where most of the conversation happens</span>
</p>
<p>
<!-- <p>
<a href="https://groups.google.com/forum/#!forum/universalviewer">Join the UV Google Group</a>
<span class="explanatory">A good place to ask questions if you are just trying out the UV</span>
</p>
</p> -->
<p>
<a href="https://twitter.com/universalviewer">Follow the UV on Twitter</a>
<span class="explanatory">A good way to keep informed of notable developments</span>
Expand Down
2 changes: 1 addition & 1 deletion js/index.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions less/home.less
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ body.home {
margin: 30px auto;
}
p {
font-weight: 400;
font-weight: bold;
color: fade(white, 95%);
font-size: 18px;
margin-bottom: 50px;
Expand Down Expand Up @@ -150,7 +150,7 @@ body.home {

span.explanatory {
display: block;
font-size: 12px;
font-size: 14px;
}

#moreinfo {
Expand Down
128 changes: 66 additions & 62 deletions less/mixins.less
Original file line number Diff line number Diff line change
@@ -1,63 +1,67 @@
// Mixins

.transition-all() {
-webkit-transition: all 0.35s;
-moz-transition: all 0.35s;
transition: all 0.35s;
}

.background-cover() {
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
-o-background-size: cover;
}

.button-variant(@color; @background; @border) {
color: @color;
background-color: @background;
border-color: @border;
.transition-all;

&:hover,
&:focus,
&.focus,
&:active,
&.active,
.open > .dropdown-toggle& {
color: @color;
background-color: darken(@background, 5%);
border-color: darken(@border, 7%);
}
&:active,
&.active,
.open > .dropdown-toggle& {
background-image: none;
}
&.disabled,
&[disabled],
fieldset[disabled] & {
&,
&:hover,
&:focus,
&.focus,
&:active,
&.active {
background-color: @background;
border-color: @border;
}
}

.badge {
color: @background;
background-color: @color;
}
}

.sans-serif-font() {
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
}

.serif-font() {
font-family: 'Merriweather', 'Helvetica Neue', Arial, sans-serif;
// Mixins

.transition-all() {
-webkit-transition: all 0.35s;
-moz-transition: all 0.35s;
transition: all 0.35s;
}

.background-cover() {
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
-o-background-size: cover;
}

.button-variant(@color; @background; @border) {
color: @color;
background-color: @background;
border-color: @border;
.transition-all;

&:hover,
&:focus,
&.focus,
&:active,
&.active,
.open > .dropdown-toggle& {
color: @color;
background-color: darken(@background, 5%);
border-color: darken(@border, 7%);
}
&:active,
&.active,
.open > .dropdown-toggle& {
background-image: none;
}
&.disabled,
&[disabled],
fieldset[disabled] & {
&,
&:hover,
&:focus,
&.focus,
&:active,
&.active {
background-color: @background;
border-color: @border;
}
}

.badge {
color: @background;
background-color: @color;
}
}

.header-font() {
font-family: 'Inter', sans-serif;
}

.sans-serif-font() {
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
}

.serif-font() {
font-family: 'Merriweather', 'Helvetica Neue', Arial, sans-serif;
}
Loading

0 comments on commit 85dac1a

Please sign in to comment.