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

Jump to bottom

team page corrected #6

Merged
merged 1 commit into from
Mar 26, 2018
Merged

team page corrected #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions new/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,22 +184,22 @@ <h3 class="recent-work"> Our Projects</h3></div>
<div id="owl-demo" class="owl-carousel owl-theme wow fadeIn animated" data-wow-animation-name="fadeIn" style="opacity: 1; display: block; visibility: visible; animation-name: fadeIn;">
<div class="owl-wrapper-outer"><div class="owl-wrapper" style="width: 2280px; left: 0px; display: block;"><div class="owl-item" style="width: 285px;"><div class="item view view-tenth"><img src="works/img2017.jpg" alt="work Image">
<div class="mask">
<a href="car2017.php" class="info" data-toggle="tooltip" data-placement="top" title="" data-original-title="Details"> <i class="fa fa-link"><span class="owl-wrapper"></span></i>
<a href="project.html#cars2017" class="info" data-toggle="tooltip" data-placement="top" title="" data-original-title="Details"> <i class="fa fa-link"><span class="owl-wrapper"></span></i>
<br>2017</a>
</div>
</div></div><div class="owl-item" style="width: 285px;"><div class="item view view-tenth"><img src="works/img6.jpg" alt="work Image">
<div class="mask">
<a href="car2015.php" class="info" data-toggle="tooltip" data-placement="top" title="" data-original-title="Details"> <i class="fa fa-link"> </i>
<a href="project.html#cars2015" class="info" data-toggle="tooltip" data-placement="top" title="" data-original-title="Details"> <i class="fa fa-link"> </i>
<br>2015</a>
</div>
</div></div><div class="owl-item" style="width: 285px;"><div class="item view view-tenth"><img src="works/img2.jpg" alt="work Image">
<div class="mask">
<a href="car2013.php" class="info" data-toggle="tooltip" data-placement="top" title="" data-original-title="Details"> <i class="fa fa-link"> </i>
<a href="project.html#cars2013" class="info" data-toggle="tooltip" data-placement="top" title="" data-original-title="Details"> <i class="fa fa-link"> </i>
<br>2013</a>
</div>
</div></div><div class="owl-item" style="width: 285px;"><div class="item view view-tenth"><img src="works/img1.jpg" alt="work Image">
<div class="mask">
<a href="car2011.php" class="info" data-toggle="tooltip" data-placement="top" title="" data-original-title="Details"> <i class="fa fa-link"> </i>
<a href="project.html#cars2011" class="info" data-toggle="tooltip" data-placement="top" title="" data-original-title="Details"> <i class="fa fa-link"> </i>
<br>2011</a>
</div>
</div></div></div></div>
Expand Down
14 changes: 11 additions & 3 deletions new/src/css/index12.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,13 +348,21 @@ a:focus{
font-size:20px;
padding-left:6px;
}
.department
.department1
{

color:orange;
font-size: 30px;
margin-left: 40%;
text-align: center;
line-height: 6vh;
}

.department2
{
color:orange;
font-size: 20px;
text-align: center;
}

.hoverIconFb {
background-color: #3b579d;
Expand Down Expand Up @@ -681,4 +689,4 @@ nav.shrink .navbar-toggle {
font-weight: 700;
margin-top: 0;
color: #333
}
}
2 changes: 1 addition & 1 deletion new/steering.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<div class="container-fluid" style="margin-top:10vh">
<div class="row">
<div class="col-md-10 col-md-offset-2">
<div class="col-md-8 col-md-offset-2">
<p class="department">Steering</p><br><hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2)">
<div class="col-xs-4">
<div class="imageDiv">
Expand Down
59 changes: 33 additions & 26 deletions new/team.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
</head>

<script>




// $(document).ready(function() {
// $(window).scroll( function(){
Expand Down Expand Up @@ -78,7 +81,7 @@
<div class="row">
<p class="TEAM">TEAM</p>
<div class="col-md-10 col-md-offset-1">
<p class="department">Management</p><br><hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2)">
<p class="department1">Management</p><br><hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2)">
<div class="col-xs-3">
<div class="imageDiv">
<img src="src/img/team/Harshit Singh.jpg" alt="Avatar" class="personImage">
Expand Down Expand Up @@ -137,55 +140,55 @@

<br>
<div class="container-fluid">
<div class="row">
<div class="col-md-10 col-md-offset-1">
<p class="department">Mechanical<span style="float:right;cursor:pointer;"id="flipDownMech">&#9660;</span><span style="float:right;cursor:pointer"id="flipUpMech">&#9650;</span></p><hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2)">
<div class="row">
<div class="col-md-12 department1" id="flipDownMech">Mechanical </div>
<hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2); width: 90vw;">
<div id="mechJS">
<div class="col-xs-3 ">
<div>
<a href="steering.html"><img src="src/img/a.png" alt="steering" class="personImage"><br></a>
<div class="teamname"> Steering</div>
</div>
<a href="steering.html"><img src="team_img/steering.jpg" alt="steering" class="personImage"><br></a></div>
<div class="teamname" style="text-align: center; width: 1rem;"> Steering</div>

</div>
<div class="col-xs-3">
<div>
<a href="suspension.html"><img src="src/img/a.png" alt="suspension" class="personImage" ><br></a>
<a href="suspension.html"><img src="team_img/suspension.jpg" alt="suspension" class="personImage" ><br></a>
<div class="teamname"> Suspension</div>
</div>
</div>
<div class="col-xs-3">
<div>
<a href="braking.html"><img src="src/img/a.png" alt="braking" class="personImage"><br></a>
<a href="braking.html"><img src="team_img/braking.jpg" alt="braking" class="personImage"><br></a>
<div class="teamname"> Braking</div>
</div>
</div>
<div class="col-xs-3">
<div>
<a href="vehicle.html"> <img src="src/img/a.png" alt="Vehicle Dynamics" class="personImage"><br></a>
<a href="vehicle.html"> <img src="team_img/vehicle_dynamics.jpg" alt="Vehicle Dynamics" class="personImage"><br></a>
<div class="teamname"> Vehicle Dynamics</div>
</div><br><br>
</div>
<div class="col-xs-3">
<div>
<a href="structural.html"> <img src="src/img/a.png" alt="Structural" class="personImage"><br></a>
<div class="teamname"> Structural</div>
<a href="structural.html"> <img src="team_img/structural.jpeg" alt="Structural" class="personImage"><br></a>
<div class="teamname" style="padding-left: 30vp;"> Structural</div>
</div>
</div>
<div class="col-xs-3">
<div>
<a href="aerodynamics.html"> <img src="src/img/a.png" alt="Aerodynamics" class="personImage"><br></a>
<a href="aerodynamics.html"> <img src="team_img/aerodynamic.jpeg" alt="Aerodynamics" class="personImage"><br></a>
<div class="teamname"> Aerodynamics</div>
</div>
</div>
<div class="col-xs-3">
<div>
<a href="material.html"> <img src="src/img/a.png" alt="Material Analysis" class="personImage"><br></a>
<a href="material.html"> <img src="team_img/materials.jpg" alt="Material Analysis" class="personImage"><br></a>
<div class="teamname"> Materials </div></a>
</div>
</div>
<div class="col-xs-3">
<div>
<a href="powertrain.html"> <img src="src/img/a.png" alt="powertrain" class="personImage"><br></a>
<a href="powertrain.html"> <img src="team_img/powertrain.jpg" alt="powertrain" class="personImage"><br></a>
<div class="teamname">Powertrain</div>
</div>
</div>
Expand All @@ -194,39 +197,41 @@
<br><br>
<div class="container-fluid">
<div class="row">
<div class="col-md-10 col-md-offset-1">
<p class="department">Electrical<span style="float:right;cursor:pointer;" id="flipDownElec">&#9660;</span><span style="float:right;cursor:pointer" id="flipUpElec">&#9650;</span></p><hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2)">
<div class="col-md-12 department1" id="flipDownElec">Electrical</div>
<hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2); width: 90vw;">
</div>
<div id="elecJS">
<div class="col-xs-3">
<div>
<a href="hvsystem.html"> <img src="src/img/a.png" alt="" class="personImage"><br></a>
<a href="hvsystem.html"> <img src="team_img/hv.JPG" alt="" class="personImage"><br></a>
<div class="teamname"> HV System</div>
</div>
</div>
<div class="col-xs-3">
<div>
<a href="lvsystem.html"><img src="src/img/a.png" alt="" class="personImage"><br></a>
<a href="lvsystem.html"><img src="team_img/lv.jpg" alt="" class="personImage"><br></a>
<div class="teamname"> LV System</div>
</div>
</div>
<div class="col-xs-3">
<div>
<a href="vehicleControl.html"><img src="src/img/a.png" alt="" class="personImage"><br></a>
<a href="vehicleControl.html"><img src="team_img/vcu.jpg" alt="" class="personImage"><br></a>
<div class="teamname">Vehical Control Unit</div>
</div>
</div>
<div class="col-xs-3">
<div>
<a href="dataAcquisition.html"> <img src="src/img/a.png" alt="braking" class="personImage"><br></a>
<a href="dataAcquisition.html"> <img src="team_img/data.png" alt="braking" class="personImage"><br></a>
<div class="teamname"> Data acquisition</div>
</div>
</div>
</div></div>
</div></div><br><br></div>
<div class="container-fluid" >
<div class="row">
<div class="col-md-10 col-md-offset-1">
<p class="department">Operations and Financial<span style="float:right;cursor:pointer;"id="flipDownMarket">&#9660;</span><span style="float:right;cursor:pointer"id="flipUpMarket">&#9650;</span></p><br><hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2)">
<div class="col-md-12 department1" id="flipDownMarket">Operations and Financial</div>
</div>
<br><hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2); width: 90vw;">
<div id="marketJS">
<div class="col-xs-3">
<div class="imageDiv">
Expand Down Expand Up @@ -285,8 +290,8 @@
<br></div></div>
<div class="container-fluid">
<div class="row">
<div class="col-md-10 col-md-offset-1">
<p class="department">Design<span style="float:right;cursor:pointer;"id="flipDownCreative">&#9660;</span><span style="float:right;cursor:pointer"id="flipUpCreative">&#9650;</span></p><hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2)">
<div class="col-md-12 department1" id="flipDownCreative">Design</div>
<hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2); width: 90vw;">
<div id="creativeJS">
<div class="col-xs-3">
<div class="imageDiv">
Expand Down Expand Up @@ -374,7 +379,7 @@
</div><br><br>
<div class="container-fluid">

<p class="department">Faculty Advisors</p><hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2)">
<p class="department1">Faculty Advisors</p><hr style="margin-top:0px;border:1px solid rgba(0,0,0,0.2)">
<div class="row">
<div class="col-md-10 col-md-offset-1">
<div class="col-md-10">
Expand Down Expand Up @@ -489,5 +494,7 @@


</script>


</body>
</html>
Binary file added new/team_img/aerodynamic.jpeg
View file
Open in desktop
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 new/team_img/braking.jpg
View file
Open in desktop
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 new/team_img/data.png
View file
Open in desktop
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 new/team_img/hv.JPG
View file
Open in desktop
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 new/team_img/lv.jpg
View file
Open in desktop
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 new/team_img/materials.jpg
View file
Open in desktop
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 new/team_img/powertrain.jpg
View file
Open in desktop
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 new/team_img/steering.jpg
View file
Open in desktop
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 new/team_img/structural.jpeg
View file
Open in desktop
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 new/team_img/suspension.jpg
View file
Open in desktop
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 new/team_img/vcu.jpg
View file
Open in desktop
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 new/team_img/vehicle_dynamics.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.