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

Made changes in the nav bar representation and also made changes css of most of the pages #34

Open
wants to merge 2 commits into
base: main
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
Binary file modified instance/database.db
Binary file not shown.
Binary file added static/SVG/afghanistan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/SVG/australia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/SVG/bangladesh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/SVG/england.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/SVG/india.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/SVG/netherlands.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/SVG/new-zealand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/SVG/pakistan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/SVG/south-africa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/SVG/sri-lanka.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions static/css/fixtures.css
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,19 @@ body {
display: inline-flex;
width: 3rem;
height: 3rem;
background: var(--card-bg);
color: var(--badge-text);
background: white;
box-shadow: 0 0 0.2rem 0.1rem var(--card-bg);
justify-content: center;
align-items: center;
border-radius: 50%;
margin-left: 1rem;
font-size: 1.2rem;
font-weight: bold;
text-align: center;
line-height: 1.5rem;
z-index: 1;
box-shadow: 0 0 0.2rem 0.1rem var(--shadow);
color: rgb(50, 0, 115);
}

.teams {
Expand Down Expand Up @@ -131,14 +137,14 @@ body {
position: fixed;
right: 0.5rem;
bottom: 2rem;
background: var(--bg);
background: white;
width: 4rem;
height: 4rem;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0 0 0.1rem var(--badge-text);
box-shadow: black 0 0 0.2rem 0.1rem;
transition: all 0.5s ease-in-out;
cursor: pointer;
z-index: 100;
Expand Down
2 changes: 1 addition & 1 deletion static/css/standings.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ table {
color: -internal-quirk-inherit;
text-align: start;
border-spacing: 2px;
border-color: gray;
/* border-color: gray; */
font-variant: normal;
}

Expand Down
69 changes: 62 additions & 7 deletions static/css/style.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
*{
font-family: sans-serif;
}
body{
background-color: #320073;
}
Expand All @@ -10,11 +13,16 @@ body{

.table{
display: flex;
flex-direction: row;
justify-content: center;
}
.group{
margin: 0 20px 0 20px;
border-radius: 50px;
box-shadow: 3px 4px 2px rgba(0,0,0,0.25)

.teamlogo{
height: 10px;
}

.group{
display: flex;
flex-direction: column;
Expand All @@ -26,6 +34,7 @@ body{
margin:0 20px 0 20px;
border-radius: 50px;
box-shadow: 3px 4px 2px rgba(0,0,0,0.25)

}

.team{
Expand All @@ -34,14 +43,21 @@ body{
color: white;
font-size: x-large;
padding: 3%;
border-radius: 50px;

}
.icclogo{
opacity: 0.8;
opacity: 1;

cursor: default;
transition: 0.3s;
}

.logo{
height:20px;
width:40px;
height: auto;
width: 40px;
margin-right: 10px;

}

header {
Expand All @@ -53,17 +69,27 @@ header {
background-color: #FF00A5;
padding: 1%;
border-radius:25px;
box-shadow: 3px 4px 2px rgba(0,0,0,0.25)
box-shadow: 3px 4px 2px rgba(0,0,0,0.25);
justify-content: flex-end;
font-style: sans-serif;
}


#title {
text-align: center;
color: white;
font-family: sans-serif;
/* font-size: 1000px;
/* margin: 0;
padding: 0; */
/* margin-left: 10%;
margin-right: 10%; */


}

.nav {
color: white;
color: white;
}

#standings, #fixtures, #fantasy {
Expand All @@ -72,6 +98,14 @@ header {
font-size: large;
}

.global-footer__social-container{
display: flex;
justify-content: center;
flex-wrap: wrap;
position: relative;
z-index: 10;
}

.footer-social {
display: flex;
justify-content: center;
Expand Down Expand Up @@ -106,3 +140,24 @@ svg.icon {
height: 1.8rem;
fill: currentColor;
}
.footer {
margin-top: 2rem;
padding: 2rem 0;
margin-bottom: auto;
background-color: #320073;
color: white;
text-align: center;

}
table {
width: 100%;
border-collapse: collapse;
}
th, td {
border: 1px solid black;
padding: 5px;
text-align: center;
}
th {
font-weight: bold;
}
2 changes: 1 addition & 1 deletion templates/Fan_Poll.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% endblock %}
{% block body %}
<div class="container">
<h1 class="section-heading">Fan Poll</h1>
<h1 class="section-heading"><span style="color: rgb(255, 0, 165);">Fan</span> Poll</h1>
<div class="matchs" id="match-date">
<div class="match">
<div class="match-info">
Expand Down
7 changes: 6 additions & 1 deletion templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% block head %}{% endblock %}
<style>
.base{
font-family: Cambria, Cochin, Georgia, Times, 'Times New Roman', serif;
}
</style>
</head>
<body>
<body class="base">
{% block body %}{% endblock %}
</body>
</html>
5 changes: 4 additions & 1 deletion templates/fixtures.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
{% endblock %}
{% block body %}
<div class="container">

<h1 class="section-heading">Fixtures</h1>

<div class="matchs" id="match-date">
{% for fixture in fixtures %}
<div class="match">
Expand All @@ -36,7 +38,8 @@ <h4 class="date">{{ fixture.date }}<h4>
</div>
<h4 class="match-time">{{ fixture.time }}</h4>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
{% endblock %}
84 changes: 44 additions & 40 deletions templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{% block head %}
<meta charset="UTF-8">
<title>ICC WorldCup'23</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.0/css/all.min.css">
<link rel="stylesheet" href="{{url_for('static', filename='css/style.css')}}">
{% endblock %}
{% block body %}
Expand All @@ -22,89 +23,92 @@ <h1 id="title">Welcome to ICC World Cup 2023</h1>
<div class="group">
<div class="team">
<div><span>1</span></div>
<img class='logo' src="{{url_for('static', filename='SVG/afg.svg')}}" alt="Afghanistan">
<img class='logo' src="static\SVG\afghanistan.png" alt="Afghanistan">
<div>AFG</div>
</div>
<div class='team'>
<div><span>2</span></div>
<img class='logo' src="{{url_for('static', filename='SVG/aus.svg')}}" alt="Australia">
<img class='logo' src="static\SVG\australia.png" alt="Australia">
<div>AUS</div>
</div>
<div class="team">
<div><span>3</span></div>
<img class='logo' src="{{url_for('static', filename='SVG/bang.svg')}}" alt="Bangladesh">
<img class='logo' src="static\SVG\bangladesh.png" alt="Bangladesh">
<div>BAN</div>
</div>
<div class="team">
<div><span>4</span></div>
<img class='logo' src="{{url_for('static', filename='SVG/sa.svg')}}" alt="England">
<img class='logo' src="static\SVG\england.png" alt="England">
<div>ENG</div>
</div>
<div class="team">
<div><span>5</span></div>
<img class='logo' src="{{url_for('static', filename='SVG/ind.svg')}}" alt="India">
<img class='logo' src="static\SVG\india.png" alt="India">
<div>IND</div>
</div>
</div>
<div class="group">
<div class="team">
<div><span>6</span></div>
<img class='logo' src="{{url_for('static', filename='SVG/sa.svg')}}" alt="Netherlands">
<img class='logo' src="static\SVG\netherlands.png" alt="Netherlands">
<div>ND</div>
</div>
<div class="team">
<div><span>7</span></div>
<img class='logo' src="{{url_for('static', filename='SVG/sa.svg')}}" alt="newzealand">
<img class='logo' src="static\SVG\new-zealand.png" alt="newzealand">
<div>NZ</div>
</div>
<div class="team">
<div><span>8</span></div>
<img class='logo' src="{{url_for('static', filename='SVG/pak.svg')}} " alt="pakistan">
<img class='logo' src="static\SVG\pakistan.png" alt="pakistan">
<div>PAK</div>
</div>
<div class="team">
<div><span>9</span></div>
<img class='logo' src="{{url_for('static', filename='SVG/sa.svg')}}" alt="southafrica">
<img class='logo' src="static\SVG\south-africa.png" alt="southafrica">
<div>SA</div>
</div>
<div class="team">
<div><span>10</span></div>
<img class='logo' src="{{url_for('static', filename='SVG/sl.svg')}}" alt="srilanka">
<img class='logo' src="static\SVG\sri-lanka.png" alt="srilanka">
<div>SL</div>
</div>
</div>

</div>
</div>
<footer>
<br><br><br>
<footer class="footer">
<div class="global-footer__social-container">
<ul class="footer-social">
<h5 class="footer-social__subtitle">Follow <span>Us</span> On social</h5>
<li class="footer-social__item">
<a href="https://www.facebook.com/cricketworldcup/" class="footer-social__link facebook" target="_blank"> <svg class="icon">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/resources/v1.18.1-wl/i/svg-output/icons.svg#icn-facebook"></use>
</svg>
</a>
</li>
<li class="footer-social__item">
<a href="https://twitter.com/cricketworldcup" class="footer-social__link twitter" target="_blank"> <svg class="icon">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/resources/v1.18.1-wl/i/svg-output/icons.svg#icn-twitter"></use>
</svg>
</a>
</li>
<li class="footer-social__item">
<a href="https://www.instagram.com/cricketworldcup/" class="footer-social__link instagram" target="_blank"> <svg class="icon">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/resources/v1.18.1-wl/i/svg-output/icons.svg#icn-instagram"></use>
</svg>
</a>
</li>
<li class="footer-social__item">
<a href="https://www.youtube.com/user/CricketICC" class="footer-social__link youtube" target="_blank"> <svg class="icon">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/resources/v1.18.1-wl/i/svg-output/icons.svg#icn-youtube"></use>
</svg>
</a>
</li>
</ul>

</div>
<div class="footer-social">
<h5 class="footer-social__subtitle">Follow <span>Us</span> On social</h5>
<div class="footer-social__item">
<a href="https://www.facebook.com/cricketworldcup/" class="footer-social__link facebook" target="_blank">
<svg class="icon">
<i class="fab fa-brands fa-facebook" style="color: #ffffff;"></i>
</svg>
</a>
</div>
<div class="footer-social__item">
<a href="https://twitter.com/cricketworldcup" class="footer-social__link twitter" target="_blank"> <svg class="icon">
<i class="fab fa-brands fa-twitter" style="color: #ffffff;"></i>
</svg>
</a>
</div>
<div class="footer-social__item">
<a href="https://www.instagram.com/cricketworldcup/" class="footer-social__link instagram" target="_blank"> <svg class="icon">
<i class="fab fa-brands fa-instagram" style="color: #ffffff;"></i>
</svg>
</a>
</div>
<div class="footer-social__item">
<a href="https://www.youtube.com/user/CricketICC" class="footer-social__link youtube" target="_blank">
<svg class="icon">
<i class="fab fa-brands fa-youtube" style="color: #ffffff;"></i>
</svg>
</a>
</div>
</div>
</div>
</footer>
{% endblock %}
7 changes: 5 additions & 2 deletions templates/standings.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block head %}
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<title>World cup 2022</title>
<link rel="stylesheet" href="{{url_for('static', filename='css/standings.css')}}">
{% endblock %}
{% block body %}
Expand All @@ -18,7 +18,10 @@ <h3></h3>


<h3 class="standings__subtitle">
<span>Group</span> Stage

<span>Group</span> Stage


</h3>

<table class="table">
Expand Down