styling

5 years ago · 25836637aa
parent d8541fb783
commit 25836637aa
4 changed files with 18 additions and 19 deletions
--- a/10/img/gifmain.gif
+++ b/10/img/gifmain.gif
--- a/10/index.html
+++ b/10/index.html
@ -16,7 +16,6 @@
 </head>

 <body>
-<!-- <div id="body"> -->
 <div id="left">
 <h1>
 	<div id="bigpcb">
@ -24,7 +23,7 @@
 			<img class="bigpcb" src="img/pcbimg.jpg"/>
 		</a>
 	</div>
-<marquee class="maintitle" behavior="scroll" direction="left" height="250px"><embed class="output" src="img/inpout.gif"	/></marquee>
+<!-- <marquee class="maintitle" behavior="scroll" direction="left" height="250px"><embed class="output" src="img/input.gif"	/></marquee> -->
 </h1>

 	<a href="#damla_module"><div id="damla_T"><h1 class="name_T" padding-top="10vh">Carbon</h1></div></a>
--- a/10/script.js
+++ b/10/script.js
@ -1,8 +1,8 @@
-function adjust_height(){
-    var win_height = $(window).height();
-	$('div#left, div#right').css('height', (win_height- (win_height/100)) ); //
-	// console.log(win_height);
-}
+// function adjust_height(){
+//     var win_height = $(window).height();
+// 	$('div#left, div#right').css('height', (win_height- (win_height/100)) ); //
+// 	// console.log(win_height);
+// }

 $(document).ready(function(){

--- a/10/style.css
+++ b/10/style.css
@ -85,10 +85,10 @@ body
 div#left {
  border: 1px solid white;
  color: black;
-  width:49%;
+  width:49vw;
  display: inline-block;
-  margin-left: auto;
-  margin-right: auto;
+  /* margin-left: auto;
+  margin-right: auto; */
  height:100vh;
  overflow-y: scroll;
  /*! padding-bottom: 200px; */
@ -99,10 +99,10 @@ div#left {

 div#right {
  border: none;
-  width:49%;
+  width:50vw;
  display: inline-block;
  margin-left: auto;
-  margin-right: auto;
+  margin-right: 0px;
  height:100vh;
  overflow-y: scroll;
  /*! padding-bottom: 200px; */
@ -146,7 +146,7 @@ color:#21632c;
  display: block;
    margin-left: auto;
    margin-right: auto;
-    padding-top: 10%;
+    padding-top: 8%;
    font-family: "OCRAStd";
    font-size: 2vw;
    color: white;
@ -216,7 +216,7 @@ div#subtitle {
 div #maingif{
  max-width: 100%;
  margin-top: 0px;
-  margin-bottom: 10%;
+  /* margin-bottom: 10%; */
  margin-right: 0px;
  margin-left: 0px;
  padding:0px;
@ -294,7 +294,7 @@ div#bigpcb{
    margin-left: auto;
    margin-right: auto;
    padding-top: 5%;
-    padding-bottom: 0px;
+    padding-bottom: 10vh;
 }

 .bigpcb{