Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Newbannerwithbutton #193

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Newbannerwithbutton #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4823551
Created new banner on the homepage, first draft. Used borders from os…
mollymccarthy03 Feb 15, 2024
e4da9b7
Merge remote-tracking branch 'upstream/master' into savebannertest
mollymccarthy03 Feb 22, 2024
7e7b030
Made get started button, added padding to the banner, made the text i…
mollymccarthy03 Feb 22, 2024
0cf567b
Make colors white
CannonLock Feb 23, 2024
3b49951
Tweak index page
CannonLock Feb 23, 2024
917595f
Tweak index page
CannonLock Feb 23, 2024
593ff5e
Tweak index page
CannonLock Feb 23, 2024
41c1584
New banner with a sign up button
mollymccarthy03 Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions _includes/layout/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<header>
<div class="py-1 bg-primary">
<div class="container-lg py-1">
<a href="https://portal.osg-htc.org/application" class="text-decoration-none border border-1 bg-light rounded py-1 p-2 me-2">Sign Up</a><span class="text-light">Harness the capacity of the OSPool today!</span>
</div>
</div>
<nav class="navbar navbar-expand-md navbar-dark bg-dark">
<div class="container-xxl">
<a class="navbar-brand pt-1 pb-1" href="{{ '/' | relative_url }}"><img height="55" src="{{ '/assets/images/logos/OSG-logo.svg' | relative_url }}" alt="OSG logo"></a>
Expand All @@ -8,7 +13,7 @@
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item dropdown active">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link dropdown-toggle text-white" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
About
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
Expand All @@ -23,7 +28,7 @@
</div>
</li>
<li class="nav-item dropdown active">
<a class="nav-link dropdown-toggle" href="#" id="services-dropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link dropdown-toggle text-white" href="#" id="services-dropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Services
</a>
<div class="dropdown-menu" aria-labelledby="services-dropdown">
Expand All @@ -35,7 +40,7 @@
</div>
</li>
<li class="nav-item dropdown active">
<a class="nav-link dropdown-toggle" href="#" id="campusNavLink" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link dropdown-toggle text-white" href="#" id="campusNavLink" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Campuses
</a>
<div class="dropdown-menu" aria-labelledby="campusNavLink">
Expand All @@ -44,7 +49,7 @@
</div>
</li>
<li class="nav-item dropdown active">
<a class="nav-link dropdown-toggle" href="#" id="communityDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link dropdown-toggle text-white" href="#" id="communityDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Community
</a>
<div class="dropdown-menu" aria-labelledby="communityNavLinks">
Expand All @@ -54,10 +59,10 @@
</div>
</li>
<li class="nav-item active">
<a class="nav-link" href="{{ '/contact.html' | relative_url }}">Contact</a>
<a class="nav-link text-white" href="{{ '/contact.html' | relative_url }}">Contact</a>
</li>
<li class="nav-item dropdown active">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown2" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link dropdown-toggle text-white" href="#" id="navbarDropdown2" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Docs
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown2">
Expand All @@ -70,7 +75,7 @@

<span class="navbar-text">
{% if page.url == "/" %}
<a class="btn btn-primary me-md-2 text-dark" href="https://portal.osg-htc.org/application" role="button">Request an Account</a>
<a class="btn btn-secondary me-md-2 text-dark" href="https://portal.osg-htc.org/application" role="button">Request an Account</a>
{% endif %}
</span>
</div>
Expand Down
4 changes: 1 addition & 3 deletions _sass/bootstrap/_card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
height: $card-height;
word-wrap: break-word;
background-color: $card-bg;
background-clip: border-box;
border: $card-border-width solid $card-border-color;
@include border-radius($card-border-radius);


> hr {
margin-right: 0;
Expand Down
2 changes: 1 addition & 1 deletion _sass/bootstrap/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ $zindex-tooltip: 1080 !default;
// scss-docs-start nav-variables
$nav-link-padding-y: .5rem !default;
$nav-link-padding-x: 1rem !default;
$nav-link-font-size: null !default;
$nav-link-font-size: 19px !default;
$nav-link-font-weight: null !default;
$nav-link-color: $link-color !default;
$nav-link-hover-color: $link-hover-color !default;
Expand Down
15 changes: 15 additions & 0 deletions assets/css/homepage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,18 @@ layout: blank
backdrop-filter: blur(15px);
}
}

@media (min-width: 576px) {
.bookends {
background-image: url({{ '/assets/images/OSG_Bookends_start.png' | relative_url }}), url({{ '/assets/images/OSG_Bookends_end.png' | relative_url }});
background-position: left top, right bottom;
background-repeat: no-repeat;
background-size: 235px 378px, 235px 378px; } }

@media (min-width: 992px) {
.bookends {
background-size: 235px 378px, 235px 378px; } }

@media (max-width: 991.98px) {
.bookends {
background-size: 118px 189px, 118px 189px; } }
2 changes: 1 addition & 1 deletion assets/css/style-v2.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $primary: #b67b3c;
$secondary: #f4b627;
$info: #2B77F1;
$white-offset: #fff7ea;

$nav-link-color: #FFFFFF;
$navbar-brand-height: 3.5rem;

$card-border-color: black;
Expand Down
Binary file added assets/images/OSG_Bookends_end.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/OSG_Bookends_start.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
- href: "/assets/css/homepage.css"
---
{% include /get/hero_data.liquid %}

<div class="bookends bg-light" style="padding: 2rem; background-color: #ebebeb;">
<h1 class="text-center accent-text fw-light pb-4">Bring the power of<br> <b>Throughput Computing</b><br> for your science</h1>
<div class="text-center"><a class="btn btn-secondary me-md-2 text-dark" href="https://portal.osg-htc.org/application" role="button">Get Started</a></div>
</div>
<div id="hero-image" class="vh-75 vh-md-50">
<div class="container-xxl">
<div class="row justify-content-end">
Expand All @@ -19,7 +24,7 @@ <h3 class="text-white">{{ hero_data.title }}</h3>
<p class="text-white">
{{ hero_data.excerpt }}
</p>
<a class="mt-auto me-auto btn btn-primary" href="{{ hero_data.url | relative_url }}">Read about our Spotlight User</a>
<a class="mt-auto me-auto btn btn-secondary" href="{{ hero_data.url | relative_url }}">Read about our Spotlight User</a>
</div>
</div>
</div>
Expand Down
Loading