Skip to content

new sakak. #1

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

new sakak. #1

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
ca63fc4
new sakak.
talwittman Oct 24, 2017
3c81e7c
new update sakak
talwittman Oct 24, 2017
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
34 changes: 23 additions & 11 deletions CSS/Chat.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
header, footer {
padding: 10px;
padding: 5px;
color: white;
background-color: blue;
clear: left;
Expand All @@ -14,20 +14,30 @@ header, footer {
margin-left: 10px;
}
#ofekIm {
padding: 5px;
clear: left;
text-align: left;
width:25px;
height:25px;

width: 25px;
height: 25px;


}
#ofekTitle{
font-size: 25px;
a{
text-decoration: none;
margin-top: 10px ;
Copy link

@shayAlaluf shayAlaluf Oct 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

יש להשתמש באחוזים ולא בפיקסלים

margin-right: 10px;
font-size: 15px;
}
#ofekTitle {
font-size: 20px;
Copy link

@shayAlaluf shayAlaluf Oct 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

יש להשתמש באחוזים ולא בפיקסלים בכל מקום שניתן

font-family: Arial,serif;
clear: right;
text-align: right;
color: white;
}

#chatBox {
font-size: 20px;
margin-top: 25px ;
margin-left:250px;
margin-bottom: 20px;
margin-left:200px;
width:350px;
height:75px;

Expand All @@ -37,4 +47,6 @@ header, footer {
}
.userChat{
margin-left: 200px;
}
}

/*new sakak*/
27 changes: 17 additions & 10 deletions CSS/OfekCSS.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

header, footer {
padding: 10px;
padding: 5px;
color: white;
background-color: blue;
clear: left;
Expand All @@ -14,22 +14,29 @@ header, footer {
float: right;
margin-left: 10px;
}

#ofekIm {
padding: 5px;
clear: left;
text-align: left;

width: 25px;
height: 25px;
}

}
a{
text-decoration: none;
margin-top: 10px ;
margin-right: 10px;
font-size: 15px;
}
#ofekTitle {
font-size: 20px;
font-family: Arial,serif;
clear: right;
text-align: right;
color: white;
}
.sign-in {
margin: 150px;
margin-top: 20px;
}

#ofekTitle {
font-size: 25px;
}


/*new sakak*/
23 changes: 16 additions & 7 deletions CSS/SignUp.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
header, footer {
padding: 10px;
padding:5px;
color: white;
background-color: blue;
clear: left;
Expand All @@ -15,13 +15,22 @@ header, footer {
}

#ofekIm {
padding: 5px;
clear: left;
text-align: left;

width: 25px;
height: 25px;
}


}
a{
text-decoration: none;
margin-top: 10px ;
margin-right: 10px;
font-size: 15px;
}
#ofekTitle {
font-size: 25px;
}
font-size: 20px;
font-family: Arial,serif;
clear: right;
text-align: right;
color: white;
} /*new sakak*/
34 changes: 23 additions & 11 deletions CSS/UserFilter.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
header, footer {
padding: 10px;
padding: 5px;
color: white;
background-color: blue;
clear: left;
Expand All @@ -14,12 +14,26 @@ header, footer {
margin-left: 10px;
}
#ofekIm {
padding: 5px;
clear: left;
text-align: left;
width:25px;
height:25px;
}.Filter{

width: 25px;
height: 25px;


}
a{
text-decoration: none;
margin-top: 10px ;
margin-right: 10px;
font-size: 15px;
}
#ofekTitle {
font-size: 20px;
font-family: Arial,serif;
clear: right;
text-align: right;
color: white;
}
.Filter{
margin-top: 40px;
text-align: center;
}
Expand All @@ -29,14 +43,12 @@ header, footer {
float: left;
text-align: center;
}
#ofekTitle{
font-size: 25px;
}

.userRight{
margin-right: 25px;
margin-top: 70px;
margin-left: 70px;
margin-bottom: 25px;
float: right;
text-align: center;
}
} /*new sakak*/
10 changes: 5 additions & 5 deletions OfekTwitterFiles/Chat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>

<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Ofek</title>
<link rel="stylesheet" type="text/css" href="../CSS/Chat.css">
</head>
Expand All @@ -10,11 +10,10 @@
<div class="SignUp">
<header>
<img id="ofekIm" src="../Images/ofek.png">
<span id="ofekTitle">OfekTweeter</span>
<a href="../OfekTwitterFiles/UserFilter.html" class="botton">Users</a>
<a href="../OfekTwitterFiles/Chat.html" id="ofekTitle" >OfekTwitter</a>
<a href="../OfekTwitterFiles/ofek.html"class="botton">Sign in</a>
<a href="../OfekTwitterFiles/SignUp.html" class="botton">Sign up</a>
<a href="../OfekTwitterFiles/Ofek.html" class="botton">Sign in</a>
<a href="../OfekTwitterFiles/Chat.html" class="botton">Chat</a>
<a href="../OfekTwitterFiles/UserFilter.html" class="botton">Users</a>
</header>
</div>

Expand All @@ -33,3 +32,4 @@
</body>

</html>
/*new sakak*/
14 changes: 6 additions & 8 deletions OfekTwitterFiles/Ofek.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,19 @@
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="stylesheet" type="text/css" href="../CSS/OfekCSS.css">
</head>
<body>
<div class="flex-container">
<header>
<img id="ofekIm" src="../Images/ofek.png">
<span id="ofekTitle">OfekTweeter</span>

<button type="button" id="myBtn3" onclick="myFunction();" class="botton">Sign in</button>

<a href="../OfekTwitterFiles/UserFilter.html" class="botton">Users</a>
<a href="../OfekTwitterFiles/Chat.html" id="ofekTitle" >OfekTwitter</a>
<a href="../OfekTwitterFiles/ofek.html"class="botton">Sign in</a>
<a href="../OfekTwitterFiles/SignUp.html" class="botton">Sign up</a>
<a href="../OfekTwitterFiles/Chat.html" class="botton">Chat</a>

<a href="../OfekTwitterFiles/UserFilter.html" class="botton">Users</a>
</header>
<form class="modal-content animate" action="/action_page.php">
<fieldset class="sign-in">
Expand All @@ -41,4 +38,5 @@
</form>
</div>
</body>
</html>
</html>
/*new sakak*/
10 changes: 5 additions & 5 deletions OfekTwitterFiles/SignUp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>

<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Ofek</title>
<link rel="stylesheet" type="text/css" href="../CSS/SignUp.css">
</head>
Expand All @@ -10,11 +10,10 @@
<div class="SignUp">
<header>
<img id="ofekIm" src="../Images/ofek.png">
<span id="ofekTitle">OfekTweeter</span>
<a href="../OfekTwitterFiles/UserFilter.html" class="botton">Users</a>
<a href="../OfekTwitterFiles/SignUp.html" class="botton">Sign up</a>
<a href="../OfekTwitterFiles/Chat.html" id="ofekTitle" >OfekTwitter</a>
<a href="../OfekTwitterFiles/ofek.html"class="botton">Sign in</a>
<a href="../OfekTwitterFiles/Chat.html" class="botton">Chat</a>
<a href="../OfekTwitterFiles/SignUp.html" class="botton">Sign up</a>
<a href="../OfekTwitterFiles/UserFilter.html" class="botton">Users</a>


</header>
Expand Down Expand Up @@ -43,3 +42,4 @@
</div>
</body>
</html>
/*new sakak*/
13 changes: 7 additions & 6 deletions OfekTwitterFiles/UserFilter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="stylesheet" type="text/css" href="../CSS/UserFilter.css">
</head>
<body>
<div class="flex-container">
<header>
<img id="ofekIm" src="../Images/ofek.png">
<span id="ofekTitle">OfekTweeter</span>
<button type="button" id="myBtn1" onclick="myFunction();" class="botton">Users</button>

<a href="../OfekTwitterFiles/SignUp.html" class="botton">Sign up</a>
<a href="../OfekTwitterFiles/Chat.html" id="ofekTitle" >OfekTwitter</a>
<a href="../OfekTwitterFiles/ofek.html"class="botton">Sign in</a>
<a href="../OfekTwitterFiles/Chat.html" class="botton">Chat</a>
<a href="../OfekTwitterFiles/SignUp.html" class="botton">Sign up</a>
<a href="../OfekTwitterFiles/UserFilter.html" class="botton">Users</a>

</header>
<div class="Filter">
<label><b>Filter by:</b></label>
Expand Down Expand Up @@ -65,4 +65,5 @@

</div>
</body>
</html>
</html>
/*new sakak*/