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

Improve formatting and text on login page (version 2) #179

Merged
merged 1 commit into from
Nov 25, 2020
Merged

Improve formatting and text on login page (version 2) #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions public/css/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,14 +234,14 @@ iframe {
/*------------------------------------------------------------------
[ ]*/
#login100-form {
width: 290px;
width: 320px;
margin: auto 0 auto 0;
height: fit-content;
}

#login100-form-title {
font-family: Poppins-Bold;
font-size: 24px;
font-size: 35px;
color: var(--gray3);
line-height: 1.2;
text-align: center;
Expand All @@ -258,6 +258,7 @@ iframe {
width: 100%;
z-index: 1;
margin-bottom: 10px;
margin-top: 5px;
}

.input100 {
Expand Down Expand Up @@ -352,6 +353,7 @@ iframe {
flex-wrap: wrap;
justify-content: center;
padding-top: 20px;
padding-bottom: 20px;
}

#login100-form-btn {
Expand Down
24 changes: 12 additions & 12 deletions public/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</span>
<div class="text-center p-t-12">
<span class="txt1" style="color:#595959">
Use Aspen credentials or leave blank to import data
Aspen credentials or leave blank to import data
</span>
</div>
<!-- Username Input -->
Expand All @@ -80,7 +80,7 @@
<!-- Remember Me Checkbox -->
<div><label>
<input id="remember-me" type="checkbox">
Remember Me?
Remember Me
</label></div>
<!-- Login Button -->
<div id="container-login100-form-btn">
Expand All @@ -91,19 +91,19 @@
</div>
<div class="text-center p-t-12">
<span class="txt1" style="color:#595959">
For issues and feature requests, please let us know with this
<a href="https://goo.gl/forms/PYQDtzkp0vHJbFLz2">google form</a>!
Issues or feature requests:
<a href="https://goo.gl/forms/PYQDtzkp0vHJbFLz2">Google Form</a>
<br>
To see the code and contribute to this open source project
check out our <a href="https://github.com/maxtkc/aspine">github</a>!
</span>
</div>
<div class="text-center p-t-12">
<span class="txt1" style="color:#595959">
Check out our <a href="https://www.cpsd.us/privacy">Privacy Policy</a>
Open source project:
<a href="https://github.com/maxtkc/aspine">GitHub</a>
<br>
Privacy policy:
<a href="https://www.cpsd.us/privacy">CPSD</a>
<br>
Join Aspine/CTF club at CRLS:
<a href = "mailto: crls-ctf-club-usergroup@cpsd.us">Email</a>
</span>
</div>
<br>
<div class="text-center">
<img src="images/district-logo.png" style="width:75%">
</div>
Expand Down