Skip to content
This repository has been archived by the owner on Sep 5, 2019. It is now read-only.

Changes in the home page, footer and signup successful page #367

Open
wants to merge 3 commits into
base: development
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions Home/static/home/assets/css/template.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,20 @@ iframe{
}

.sidebar .copyright{
position:relative;
position: relative;
width:100%;
bottom:0;
left:0;
padding:15px 30px;
padding:0px 10px;
font-size:11px;
margin-top: 50px;
margin-bottom: 0px;
}

.sidebar .social-icons a{
position: relative;
font-size:12px;
margin-right:10px;
margin-bottom: 0px;
}

.wrapper{
Expand Down
19 changes: 11 additions & 8 deletions registration/templates/registration/signup_success.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
{% block content %}
<!-- HERO -->
<section id="hero" class="module-hero bg-dark-30"
data-background="{% static 'BlogFeedAggregator/assets/images/mike-giles-wallpape.jpg' %}">
data-background= "{% static 'BlogFeedAggregator/assets/images/mike-giles-wallpape.jpg %}">

<!-- HERO TEXT -->
<div class="hero-caption">
<div class="hero-text">
<h1 class="hero-title font-alt">Welcome</h1>
<h1> Welcome </h1>
<p class="hero-subtitle font-serif"></p>
</div>
</div>
Expand All @@ -20,20 +20,20 @@ <h1 class="hero-title font-alt">Welcome</h1>
<section class="module">
<div class="container">
<div class="row">
<div style="margin-left: 250px">
<div style="margin-left: 300px">
<div class="container">
<div class="col-md-6 offset-md-3">
<div class="card">
<div class="card-block">
<div style="margin-left: 70px">
<div style="margin-left: 50px">
<h3 class="card-title col-md-12">Welcome to amFOSS!</h3>
<hr>
<br>
<p style="margin-left: 20px" class="card-text col-md-12">
<p style="margin-left: -15px" class="card-text col-md-12">
Click the button below to login or use the navbar.
</p>
</div>
<p style="margin-left: 180px" class="col-md-12">
<p style="margin-left: 100px" class="col-md-12">
<a class="btn btn-dark anim-scroll" href="{% url 'login' %}"
role="button">Login</a>
</p>
Expand All @@ -43,14 +43,17 @@ <h3 class="card-title col-md-12">Welcome to amFOSS!</h3>
<hr>
<hr>
<hr>
<div class="alert alert-danger" role="alert">
<div style=" padding-right:150px;">
<div class="alert alert-danger" role="alert" style="padding-bottom:32 px; margin-top:50px; align-left;">

<strong>Note!</strong> Your account needs to be verified before you can log in.
Please contact a senior member of the club to activate your account.
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion timeline/templates/timeline/timeline.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h1 class="text-center">Timeline</h1>
<p class="m-b-md-60">The list of all the FOSS Alumni in chronological order</p>
</header>
<div class="container-fluid">
<div class="row example-centered" style="margin-top: 50px;">
<div class="row example-centered" style="margin-top: 540px;">
<div class="col-xs-10 col-xs-offset-1 col-sm-8 col-sm-offset-2">
<ul class="timeline timeline-centered">
{% for object in objects %}
Expand Down