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.

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

more improvements from Rett #1

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion _includes/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1 class="text-color title display-4">We are here to exchange information, brai
</div>
</div>
</div>
<div>
<div class="sponsor">
<div class="row">
<div class="col-12">
<h1 class="title display-4">Sponsors</h1>
Expand Down
16 changes: 6 additions & 10 deletions _includes/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,19 @@ <h5>If you would like to present at AJUG or have other suggestions, please conta
</div>
</div>
</div>
<div class="col-sm-12 col-md-4 order-1 order-md-2">
<div class="d-flex flex-column justify-content-start align-items-center remove-md-gutters">
<img class="ajug-microphone-img" src="assets/img/ajug_microphone.png"/>
</div>
</div> -->
<h1 class="mt-3 mb-4 display-4">Contact</h1>
<!-- <div class="col-sm-12 col-md-4 order-1 order-md-2">
<div class="d-flex flex-column justify-content-start align-items-center remove-md-gutters">
<img class="ajug-microphone-img" src="assets/img/ajug_microphone.png"/>
</div>
</div> -->
<h1 class="my-3 display-4">Contact</h1>
<div class="contactCards ">
<div class="card shadow">
<!-- <img class="card-img-top" src="/assets/img/logo/ajug_logo.png" alt="Card image cap"> -->
<div class="card-body">
<h1 class="card-title">General Hello's</h1>
<p class="h5 card-text">If you'd like to contact AJUG, reach out at <b>info@ajug.org.</b></p>
<p class="h5 mt-3"><b>You can also follow us here:</b></p>
<div class="d-flex flex-row justify-content-center">
{% include socialLinks.html %}
</div>
</div>
</div>
<div class="card shadow">
Expand All @@ -48,7 +44,7 @@ <h1 class="card-title">Sponsorship</h1>
<!-- <img class="card-img-top" src="/assets/img/ajug_microphone.png" alt="Card image cap"> -->
<div class="card-body">
<h1 class="card-title">Want To Present?</h1>
<p class="h5 card-text">If you would like to present at AJUG or have other suggestions, please contact he Program Chair at chair@ajug.org with
<p class="h5 card-text">If you would like to present at AJUG or have other suggestions, please contact the Program Chair at chair@ajug.org with
<a href="" class="ajug-link text-color-red"><u><i>these details</i></u></a>.
</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions _includes/events.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ <h1 class="title mb-4 display-4">Events</h1>
</div>
</div>
</div>
<div class="row">
<!-- <div class="row">
<div class="col-md-12 col-lg-8">
<div class="d-flex flex-column">
<h1 class="title display-4">Social Updates</h1>
<a class="h5">Follow us on Twitter at @atlantajug</a>
</div>
</div>
</div>
</div> -->
</section>
18 changes: 2 additions & 16 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
<footer class="footer">
<div class="container d-flex flex-row justify-content-center">
<div>
<div class="social-links">
<h5 class="text-center text-color">FOLLOW US</h5>
<div class="d-flex flex-row">
<div class="icon-wrapper m-1 p-2 light-red-bg rounded-circle text-center shadow">
<a href=""><i class="fa fa-twitter text-color-white" aria-hidden="true"></i></a>
</div>
<div class="icon-wrapper m-1 p-2 light-red-bg rounded-circle text-center shadow">
<a href=""><i class="fa fa-linkedin text-color-white" aria-hidden="true"></i></a>
</div>
<div class="icon-wrapper m-1 p-2 light-red-bg rounded-circle text-center shadow">
<a href=""><i class="fa fa-google-plus text-color-white" aria-hidden="true"></i></a>
</div>
<div class="icon-wrapper m-1 p-2 light-red-bg rounded-circle text-center shadow">
<a href=""><i class="fa fa-facebook text-color-white" aria-hidden="true"></i></a>
</div>
<div class="icon-wrapper m-1 p-2 light-red-bg rounded-circle text-center shadow">
<a href=""><i class="fa fa-meetup text-color-white" aria-hidden="true"></i></a>
</div>
{% include socialLinks.html %}
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions _includes/join.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<section id="join" class="d-flex flex-column justify-content-start section">
<div class="row mt-lg-4 mb-5">
<div class="col-md-12 col-lg-9 col-xl-8">
<div class="col-sm-12 col-md-10 col-lg-8 col-xl-7">
<div class="d-flex flex-column justify-content-around">
<div class="remove-gutters">
<img class="img-fluid ajug_becomemember_banner" src="/assets/img/ajug_becomemember_banner.png">
Expand All @@ -9,7 +9,7 @@
</div>
</div>
<div class="row ml-lg-5">
<div class="col-md-12 col-lg-6">
<div class="col-sm-12 col-md-8 col-lg-5">
<div class="d-flex flex-column justify-content-around">
<h1 class="title display-4">Become A Member</h1>
<p class="h5">We provide an open access list for AJUG and Java-related topics. You must subscribe in order to post.
Expand Down
4 changes: 2 additions & 2 deletions _includes/sponsor-benefits.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="modal animated fade sponsor-benefit-modal" tabindex="-1" role="dialog" aria-labelledby="sponsorBenefits" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content py-2 py-md-5 px-3 px-md-5 ">
<div class="modal-content py-2 py-md-3 px-3 px-md-5 ">
<section class="d-flex flex-column">
<h4 class="my-4 text-color-red">SPONSORSHIP BENEFITS
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
Expand All @@ -10,7 +10,7 @@ <h4 class="my-4 text-color-red">SPONSORSHIP BENEFITS
<div id="benefit-list" class="team-description-acc" data-children=".item">
<ul>
{% for benefit in site.data.sponsorBenefits %}
<li>{{ benefit.item }}</li>
<li><p>{{ benefit.item }}</p></li>
{% endfor %}
</ul>
</div>
Expand Down
1 change: 1 addition & 0 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<div class="container-fluid page-container parallax-window" data-parallax="scroll" data-image-src="/assets/img/background/background-a-1.svg">
{{ content }}
</div>
{% include footer.html %}
{% include scripts.html %}
</body>
</html>
3 changes: 3 additions & 0 deletions _sass/_contactCard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@

@media (min-width: 992px){
.contactCards {
.card {
margin-bottom: 40px;
}
margin-left: -3rem;
}
}
4 changes: 4 additions & 0 deletions _sass/_event.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
@import "color";

.icon-wrapper {
width: 40px;
}

.eventCards {
&.card {
border-radius: 0;
Expand Down
3 changes: 3 additions & 0 deletions _sass/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

.footer {
background-color: white;
.social-links{
margin: 20px 10px;
}
.icon-wrapper {
width: 40px;
}
Expand Down
44 changes: 44 additions & 0 deletions _sass/_sponsor.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
.sponsor {
.sponsor-list {
margin-left: -3rem;
margin-right: auto;
.sponsor-image-wrapper{
background-color: white;
padding: 15px;
.sponsor-image {
height: 100px;
width: 100px;
}
}
}
}

@media (max-width: 768px) {
.sponsor {
.sponsor-list {
margin-left: auto !important;

.sponsor-image-wrapper {
.sponsor-image {
height: 85px !important;
width: 85px !important;
}
}
}
}
}

@media (max-width: 991px) {
.sponsor {
.sponsor-list {
margin-left: auto !important;

.sponsor-image-wrapper {
.sponsor-image {
height: 90px;
width: 90px;
}
}
}
}
}
12 changes: 1 addition & 11 deletions _sass/_teamModal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,8 @@
border-radius: 0;
border: 0;
background-color: $background-blue;
height: 100vh;
min-height:100vh;
}
}
}

@media (max-width: 767px) {
.team-modal {
.modal-dialog {
margin: 10px;
.modal-content {
height: 100%;
}
}
}
}
4 changes: 2 additions & 2 deletions assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
@import 'footer';
@import 'contactCard';
@import "event";
@import "sponsor";

@font-face {
font-family: DroidSerif;
src: url('/assets/fonts/droid-serif/DroidSerif-Regular.ttf');
src: url('../fonts/droid-serif/DroidSerif-Regular.ttf');
}
body {
background-color: $background-blue;
Expand Down Expand Up @@ -60,7 +61,6 @@ body {
width: 90px;
padding: 1px;
}

.ajug-microphone-img{
width: 100%;
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion assets/img/sponsors/java-4.svg
Diff not rendered.
2 changes: 1 addition & 1 deletion assets/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
$('.parallax-window').attr('data-image-src','/assets/img/background/background-a-2.svg');
}

if(screen.width <= 768){
if(screen.width < 768){
$('.ajug_becomemember_banner').attr('src', '/assets/img/ajug_becomemember_banner_rect.png');
}

Expand Down