From ca63fc4f334d7e4b3bea3989e4e22dce2df43a73 Mon Sep 17 00:00:00 2001 From: "tal.wit.kal" Date: Tue, 24 Oct 2017 09:35:29 +0300 Subject: [PATCH 1/2] new sakak. --- CSS/Chat.css | 4 +++- CSS/OfekCSS.css | 3 +-- CSS/SignUp.css | 2 +- CSS/UserFilter.css | 2 +- OfekTwitterFiles/Chat.html | 1 + OfekTwitterFiles/Ofek.html | 3 ++- OfekTwitterFiles/SignUp.html | 1 + OfekTwitterFiles/UserFilter.html | 3 ++- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CSS/Chat.css b/CSS/Chat.css index 5664206..9208378 100644 --- a/CSS/Chat.css +++ b/CSS/Chat.css @@ -37,4 +37,6 @@ header, footer { } .userChat{ margin-left: 200px; -} \ No newline at end of file +} + +/*new sakak*/ \ No newline at end of file diff --git a/CSS/OfekCSS.css b/CSS/OfekCSS.css index fa5f182..ca0114b 100644 --- a/CSS/OfekCSS.css +++ b/CSS/OfekCSS.css @@ -31,5 +31,4 @@ header, footer { #ofekTitle { font-size: 25px; } - - +/*new sakak*/ diff --git a/CSS/SignUp.css b/CSS/SignUp.css index 4355b55..22adf1f 100644 --- a/CSS/SignUp.css +++ b/CSS/SignUp.css @@ -24,4 +24,4 @@ header, footer { #ofekTitle { font-size: 25px; -} \ No newline at end of file +} /*new sakak*/ \ No newline at end of file diff --git a/CSS/UserFilter.css b/CSS/UserFilter.css index f7583f2..a3773f2 100644 --- a/CSS/UserFilter.css +++ b/CSS/UserFilter.css @@ -39,4 +39,4 @@ header, footer { margin-bottom: 25px; float: right; text-align: center; -} \ No newline at end of file +} /*new sakak*/ \ No newline at end of file diff --git a/OfekTwitterFiles/Chat.html b/OfekTwitterFiles/Chat.html index 8df3e1c..3cacd60 100644 --- a/OfekTwitterFiles/Chat.html +++ b/OfekTwitterFiles/Chat.html @@ -33,3 +33,4 @@ +/*new sakak*/ \ No newline at end of file diff --git a/OfekTwitterFiles/Ofek.html b/OfekTwitterFiles/Ofek.html index 3e2e27e..dff89d6 100644 --- a/OfekTwitterFiles/Ofek.html +++ b/OfekTwitterFiles/Ofek.html @@ -41,4 +41,5 @@ - \ No newline at end of file + +/*new sakak*/ \ No newline at end of file diff --git a/OfekTwitterFiles/SignUp.html b/OfekTwitterFiles/SignUp.html index 9342803..1dd8ad1 100644 --- a/OfekTwitterFiles/SignUp.html +++ b/OfekTwitterFiles/SignUp.html @@ -43,3 +43,4 @@ +/*new sakak*/ \ No newline at end of file diff --git a/OfekTwitterFiles/UserFilter.html b/OfekTwitterFiles/UserFilter.html index ea7f3c3..1b2d7f9 100644 --- a/OfekTwitterFiles/UserFilter.html +++ b/OfekTwitterFiles/UserFilter.html @@ -65,4 +65,5 @@ - \ No newline at end of file + +/*new sakak*/ \ No newline at end of file From 3c81e7c45a0bb5c7e562be2bea6586592d06d3cb Mon Sep 17 00:00:00 2001 From: "tal.wit.kal" Date: Tue, 24 Oct 2017 10:29:26 +0300 Subject: [PATCH 2/2] new update sakak --- CSS/Chat.css | 30 ++++++++++++++++++++---------- CSS/OfekCSS.css | 26 +++++++++++++++++--------- CSS/SignUp.css | 21 +++++++++++++++------ CSS/UserFilter.css | 32 ++++++++++++++++++++++---------- OfekTwitterFiles/Chat.html | 9 ++++----- OfekTwitterFiles/Ofek.html | 11 ++++------- OfekTwitterFiles/SignUp.html | 9 ++++----- OfekTwitterFiles/UserFilter.html | 10 +++++----- 8 files changed, 91 insertions(+), 57 deletions(-) diff --git a/CSS/Chat.css b/CSS/Chat.css index 9208378..79e5342 100644 --- a/CSS/Chat.css +++ b/CSS/Chat.css @@ -1,5 +1,5 @@ header, footer { - padding: 10px; + padding: 5px; color: white; background-color: blue; clear: left; @@ -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 ; + margin-right: 10px; + font-size: 15px; +} +#ofekTitle { + font-size: 20px; + 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; diff --git a/CSS/OfekCSS.css b/CSS/OfekCSS.css index ca0114b..d7f04a6 100644 --- a/CSS/OfekCSS.css +++ b/CSS/OfekCSS.css @@ -1,6 +1,6 @@ header, footer { - padding: 10px; + padding: 5px; color: white; background-color: blue; clear: left; @@ -14,21 +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*/ diff --git a/CSS/SignUp.css b/CSS/SignUp.css index 22adf1f..44d290a 100644 --- a/CSS/SignUp.css +++ b/CSS/SignUp.css @@ -1,5 +1,5 @@ header, footer { - padding: 10px; + padding:5px; color: white; background-color: blue; clear: left; @@ -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*/ \ No newline at end of file diff --git a/CSS/UserFilter.css b/CSS/UserFilter.css index a3773f2..09aa06b 100644 --- a/CSS/UserFilter.css +++ b/CSS/UserFilter.css @@ -1,5 +1,5 @@ header, footer { - padding: 10px; + padding: 5px; color: white; background-color: blue; clear: left; @@ -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; } @@ -29,9 +43,7 @@ header, footer { float: left; text-align: center; } -#ofekTitle{ - font-size: 25px; - } + .userRight{ margin-right: 25px; margin-top: 70px; diff --git a/OfekTwitterFiles/Chat.html b/OfekTwitterFiles/Chat.html index 3cacd60..988bd82 100644 --- a/OfekTwitterFiles/Chat.html +++ b/OfekTwitterFiles/Chat.html @@ -1,7 +1,7 @@ - + Ofek @@ -10,11 +10,10 @@ diff --git a/OfekTwitterFiles/Ofek.html b/OfekTwitterFiles/Ofek.html index dff89d6..0624fe9 100644 --- a/OfekTwitterFiles/Ofek.html +++ b/OfekTwitterFiles/Ofek.html @@ -2,7 +2,7 @@ - + @@ -10,14 +10,11 @@
- OfekTweeter - - - Users + OfekTwitter + Sign in Sign up - Chat - + Users