Skip to content

Adding font and bootstrap #51

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
joyboyid wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adding font and bootstrap #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6d637b
adding font and bootstrap
joyboyid Oct 5, 2020
3435221
fix issues conflict
joyboyid Oct 5, 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
22 changes: 13 additions & 9 deletions css/Style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@500&display=swap');
/* #222831 -- darkest blue
#30475e -- medium blue
#f2a365 -- orange peace for headings or underlines
#f2a365 -- orange peace for headings or underlines
#ececec -- white compulsory
*/
@import url("clock_styling.css");
*{
font-family: 'Montserrat', sans-serif;
margin: 0%;
padding: 0%;
}
Expand All @@ -28,9 +30,9 @@ nav{
.navbar {
overflow: hidden;
background-color: #333;
position: fixed;
top: 0;
width: 100%;
position: fixed;
top: 0;
width: 100%;
}

.navbar a {
Expand All @@ -48,21 +50,22 @@ nav{
}

.main {
margin-top: 30px;
margin-top: 30px;
}
header {
padding: 50px 16px 10px;
background: rgb(31, 27, 27);
background-color: black;
color: #f1f1f1;
text-align: center;

}
.underline{
text-decoration: underline;
text-underline-position: under;
text-decoration-color: #f2a365;
}
.box{
display:grid;
display: inline;
justify-content: center;
margin:15px;
font-size: 20px;
Expand Down Expand Up @@ -115,6 +118,7 @@ footer{
height: 100px;
background-color : black;
font-size:30px;

}
.footer{
text-align: center;
Expand Down Expand Up @@ -145,7 +149,7 @@ select{
height: 600px;
}

.india, .japan, .chicago{
.japan, .chicago{
display: flex;
flex-direction: column;
justify-content: center;
Expand All @@ -163,4 +167,4 @@ select{
.analog-country h3{
border-bottom: 1px solid aliceblue;
margin-bottom:10px
}
}
37 changes: 10 additions & 27 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
integrity="sha512-lInM/apFSqyy1o6s89K4iQUKg6ppXEgsVxT35HbzUupEVRh2Eu9Wdl4tHj7dZO0s1uvplcYGmt3498TtHq+log=="
crossorigin=""
></script>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
<link rel="stylesheet" href="./css/Style.css" />
<script src="map.js"></script>
<title>World Clock</title>
Expand All @@ -33,6 +34,7 @@
</div>
<header>
<h1>
<br />
JS-World<br />
<span class="underline">Clock</span>
</h1>
Expand Down Expand Up @@ -76,33 +78,10 @@ <h1>
<div class="number number11">11</div>
<div class="number number12">12</div>
</div>
<div class="analog-country">
<h3>India (UTC Standard)</h3>
<img class="flag" src="./images/INDIA FLAG.webp" alt="indian-flag" width="70px" height="50px" />
</div>
</div>
<div class="chicago clock">
<div class="analog">
<div class="hand hour" chicago-hour-hand=""></div>
<div class="hand minute" chicago-minute-hand></div>
<div class="hand second" chicago-second-hand></div>
<div class="number number1">1</div>
<div class="number number2">2</div>
<div class="number number3">3</div>
<div class="number number4">4</div>
<div class="number number5">5</div>
<div class="number number6">6</div>
<div class="number number7">7</div>
<div class="number number8">8</div>
<div class="number number9">9</div>
<div class="number number10">10</div>
<div class="number number11">11</div>
<div class="number number12">12</div>
</div>
<div class="analog-country">
<h3>Chicago (U.S.A)</h3>
<img class="flag" src="./images/usa.jpg" alt="usa-flag" width="70px" height="50px" />
</div>
<img class="flag" src="./images/usa.jpg" alt="usa-flag" width="70px" height="50px" />
</div>
</div>
<div class="japan clock">
<div class="analog">
Expand All @@ -124,8 +103,8 @@ <h3>Chicago (U.S.A)</h3>
</div>
<div class="analog-country">
<h3>Japan</h3>
<img class="flag" src="./images/japan.svg.png" alt="japan-flag" width="70px" height="50px" />
</div>
<img class="flag" src="./images/japan.svg.png" alt="japan-flag" width="70px" height="50px" />
</div>
</div>
</div>
</div>
Expand All @@ -140,6 +119,7 @@ <h2 class="faq">FAQs:</h2>
<span>Contact Us</span>
</div>
<div class="social-media">

<a href="https://www.facebook.com/teamtechnojam" target="_blank"><i class="fa fa-facebook"></i></a>
<a href="https://www.linkedin.com/company/technojam/" target="_blank"><i class="fa fa-linkedin"></i></a>
<a href="https://twitter.com/technojam_gu" target="_blank"><i class="fa fa-twitter"></i></a>
Expand All @@ -148,6 +128,9 @@ <h2 class="faq">FAQs:</h2>
</div>
</footer>
</body>
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
<script>
var mymap = L.map("map").setView([51.505, -0.09], 8); //13

Expand Down