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

Added social media links, now the link takes the user to correct page. #21

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Added social media links, now the link takes the user to correct page. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55a802b
Added social media links, now the link takes the user to correct page
RiyaGupta89 Oct 2, 2021
737da13
Merge branch 'Developer-Student-Club-BIT-Deoghar:main' into main
RiyaGupta89 Oct 2, 2021
92393c0
Replaced previous links with correct provided links
RiyaGupta89 Oct 2, 2021
ac53e23
Added styling in the calculator project
RiyaGupta89 Oct 2, 2021
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
84 changes: 48 additions & 36 deletions task1/css/calculator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ body {
padding: 120px 0;
margin: 0;
padding-top: 0;
overflow: hidden;
background-image: linear-gradient(#753a88,#cc2b5e);
}

section{
Expand All @@ -21,22 +21,21 @@ section{
}

.calculator {
padding: 20px;
-webkit-box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.2);
box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.2);
border-radius: 1px;
background-color: #212223;
height: auto;
}

.input {
border-radius: 1px;
background-color: #ddd;
color: black;
height: 60px;
background-color: #111;
color: #ddd;
height: 100px;
padding-right: 15px;
padding-top: 10px;
text-align: right;
margin-right: 6px;
font-size: 2.5rem;
overflow-x: auto;
transition: all .2s ease-in-out;
Expand All @@ -47,79 +46,92 @@ section{
box-shadow: inset 0px 1px 4px 0px rgba(0, 0, 0, 0.2);
}

.buttons {}
.buttons {
display: flex;
}

.leftPanel {
flex-basis: 80%;
margin-top: 4px;
}

.operators {}
.operators {
display: flex;
flex-direction: column;
width: 20%;
margin-left: -1px;
}

.operators div {
display: inline-block;
border: 1px solid #bbb;
border-radius: 1px;
width: 80px;
width: 100%;
text-align: center;
padding: 10px;
margin: 20px 4px 10px 0;
color: #fff;
border-bottom: 1px solid #721691;
cursor: pointer;
background-color: #ddd;
background-color: #753a88;
transition: border-color .2s ease-in-out, background-color .2s, box-shadow .2s;
}

.operators div:hover {
background-color: #ddd;
background-color: #721691;
-webkit-box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.2);
box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.2);
border-color: #aaa;
}

.zero {
margin-top:4px;
padding: 10px 0;
}

.one {
padding: 12px 0;
}

.operators div:active {
font-weight: bold;
}

.leftPanel {
display: inline-block;
.numbers {
display: flex;
}

.numbers div {
display: inline-block;
border: 1px solid #ddd;
width: 100%;
padding: 11px 0;
border-radius: 1px;
width: 80px;
text-align: center;
padding: 10px;
margin: 10px 4px 10px 0;
cursor: pointer;
background-color: #f9f9f9;
transition: border-color .2s ease-in-out, background-color .2s, box-shadow .2s;
}

.numbers div:hover {
background-color: #f1f1f1;
background-color: rgb(255, 166, 0);;
color: white;
-webkit-box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.2);
box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.2);
border-color: #bbb;
border-color: rgb(223, 145, 1);
}

.numbers div:active {
font-weight: bold;
}

div.equal {
display: inline-block;
border: 1px solid rgb(228, 149, 3);
border-radius: 1px;
width: 17%;
text-align: center;
padding: 127px 10px;
margin: 10px 6px 10px 0;
vertical-align: top;
cursor: pointer;
color: #FFF;
background-color: rgb(255, 166, 0);
transition: all .2s ease-in-out;
color: #FFF;
cursor: pointer;
text-align: center;
border: 1px solid rgb(228, 149, 3);
border-radius: 1px;
font-size: 50px;
margin-right: -2px;
}

div.equal:hover {
background-color: rgb(236, 159, 15);
background-color: rgb(241, 159, 5);
-webkit-box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.2);
box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.2);
border-color: rgb(223, 145, 1);
Expand Down
15 changes: 8 additions & 7 deletions task1/tools/calculator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@
<div class="calculator">
<div class="input" id="input"></div>
<div class="buttons">
<div class="operators">
<div>+</div>
<div>-</div>
<div>x</div>
<div>/</div>
</div>
<div class="leftPanel">
<div class="numbers">
<div>7</div>
Expand All @@ -69,8 +63,15 @@
<div id="clear">C</div>
</div>
</div>
<div class="equal" id="result">=</div>
<div class="operators">
<div class="zero">+</div>
<div class="one">-</div>
<div class="one">x</div>
<div class="one">/</div>
</div>

</div>
<div class="equal" id="result">=</div>
</div>
</section>
<script src="../js/calculator.js"></script>
Expand Down
16 changes: 8 additions & 8 deletions task2/src/components/Footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,24 @@ const Footer = () => {
<h2>Follow us</h2>
<ul className="list-unstyled">
<li>
<Link className="text-muted" href="#">
<a className="text-muted" href="https://www.instagram.com/dscbitdeoghar/" target="_blank">
<AiOutlineInstagram className="" size="" />
</Link>
</a>
</li>
<li>
<Link className="text-muted" href="#">
<a className="text-muted" href="https://twitter.com/club_bitd" target="_blank">
<i className="fab fa-twitter fa-2x"></i>
</Link>
</a>
</li>
<li>
<Link className="text-muted" href="#">
<a className="text-muted" href="https://www.linkedin.com/in/dsc-bitd/" target="_blank">
<i className="fab fa-linkedin fa-2x"></i>
</Link>
</a>
</li>
<li>
<Link className="text-muted" href="#">
<a className="text-muted" href="https://github.com/Developer-Student-Club-BIT-Deoghar" target="_blank">
<AiOutlineGithub />
</Link>
</a>
</li>
</ul>
</div>
Expand Down