Skip to content

Formatting Merges #30

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

Open
Tim-Shaffer wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Formatting Merges #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fd15974
smarter header looks better
mattkrebs2000 Feb 14, 2020
15d4429
corrected css location in assets and call within index.html
Tim-Shaffer Feb 14, 2020
68274bc
added matts header section cahnges from slack
Tim-Shaffer Feb 14, 2020
6cc5b3e
trying to pull
mattkrebs2000 Feb 14, 2020
723394f
positioning of the modal elements
mattkrebs2000 Feb 14, 2020
2154b15
styled modal with team colors
mattkrebs2000 Feb 15, 2020
4c126ce
formatting latest
mattkrebs2000 Feb 15, 2020
37292c9
bootstrap changes
mattkrebs2000 Feb 15, 2020
ebed36e
last edits from Saturday
mattkrebs2000 Feb 16, 2020
31c3a40
trying to resolve conflicts on merge
Tim-Shaffer Feb 16, 2020
fe71349
trying to resolve conflicts
Tim-Shaffer Feb 16, 2020
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
176 changes: 0 additions & 176 deletions assets/app.css
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions assets/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ header {
width:100%;
height: inherit;
background:rgba(#fff);

}

header section {
header section{
font-size: 120%;
max-width:100%;
color:white;
Expand All @@ -54,6 +55,7 @@ header section {
background-size:cover;
background-position:center center;
background-attachment:fixed;

}

#hero2{
Expand All @@ -72,6 +74,7 @@ header section {
.inner {
min-height:600px;
position: relative;

}

.hero .inner {
Expand Down Expand Up @@ -123,5 +126,3 @@ opacity: 1;
#enterName {
display:none;
}