Skip to content

conflicts fixed #47

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
rajvinder-kaur wants to merge 5 commits into
base: main
Choose a base branch
from
Open

conflicts fixed #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df10e0e
commit
rajvinder-kaur Oct 26, 2023
efa6871
commit
rajvinder-kaur Oct 27, 2023
0b8e876
commit2
rajvinder-kaur Oct 27, 2023
bdc76e5
commit3
rajvinder-kaur Oct 27, 2023
b9d007f
commit3
rajvinder-kaur Oct 27, 2023
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
70 changes: 50 additions & 20 deletions static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
/* font */
@font-face {
font-family: 'CWC Font';
src: url('../fonts/CWC-Light.woff2') format('woff2');
font-weight: 300;
}

@font-face {
font-family: 'CWC Font';
src: url('../fonts/CWC-Regular.woff2') format('woff2');
font-weight: 400;
}

@font-face {
font-family: 'CWC Font';
src: url('../fonts/CWC-Medium.woff2') format('woff2');
font-weight: 500;
}

@font-face {
font-family: 'CWC Font';
src: url('../fonts/CWC-Bold.woff2') format('woff2');
font-weight: 700;
}

/* Global Styles */
body {
background-color: #320073;
font-family: "CWC Font";
}

/* Header Styles */
Expand All @@ -16,6 +42,10 @@ header {
box-shadow: 3px 4px 2px rgba(0, 0, 0, 0.25);
}

.navbar a {
text-decoration: none;
}

#title {
text-align: center;
color: white;
Expand Down Expand Up @@ -49,13 +79,13 @@ header {
/* Team Table Styles */
.table {
display: flex;

}

/* Group Styles */
.group {
display: flex;
flex-direction: column;
align-items: center;
background-color: #FF00A5;
height: 20rem;
width: 40%;
Expand All @@ -68,32 +98,20 @@ header {

/* Team Styles */
.team {
width: 100%;
display: flex;
align-items: center;
justify-content: space-around;
color: white;
text-align: center;
font-size: x-large;
align-items: center;
text-align: left;
padding: 3%;
}

.team {
display: flex;
align-items: center;
margin: 0 6rem;
}

.team img{
height: 2rem;
width: 2rem;
margin: 0 8rem;
}

#last-team{
margin: 0 7.2rem;
}

#last-team-name{
margin: 0 1rem;
object-fit: cover;
}

/* Footer Styles */
Expand Down Expand Up @@ -132,9 +150,21 @@ svg.icon {
fill: currentColor;
}

.team img.logo {
.team .logo {
width: 3rem;
height: 2rem;
object-fit: contain;
object-fit: cover;
}

#last-team {
margin-right: .5em;
}

#team-5 img {
margin-right: 0.3em;

}

#team-8 img {
margin-left: 0.5em;
}
8 changes: 7 additions & 1 deletion templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends "base.html" %}


{% block head %}
<meta charset="UTF-8">
<title>ICC WorldCup'23</title>
Expand Down Expand Up @@ -101,6 +102,11 @@ <h5 class="footer-social__subtitle">Follow Us On social</h5>
</li>
</ul>


</div>
</footer>
{% endblock %}
{% endblock %}