diff --git a/CSS/Chat.css b/CSS/Chat.css index 5664206..ae74754 100644 --- a/CSS/Chat.css +++ b/CSS/Chat.css @@ -1,5 +1,33 @@ -header, footer { - padding: 10px; + + +#chatBox { + +} +#chatBox { + /*margin-top: 30%;*/ + padding: 0 ; + font-size: 20px; + /*margin-left: 50%;*/ + width:100%; + height:100px; + +} +#user{ + float: left; + margin-right: 10px; +} +.userChat{ + margin-left:0%; +} +#submit{ + float: right; +} +/*.modal-content{ + position: relative; +} + +/*header, footer { + padding: 5px; color: white; background-color: blue; clear: left; @@ -14,27 +42,24 @@ header, footer { margin-left: 10px; } #ofekIm { - padding: 5px; - clear: left; - text-align: left; - width:25px; - height:25px; -} -#ofekTitle{ - font-size: 25px; -} -#chatBox { - font-size: 20px; - margin-top: 25px ; - margin-left:250px; - width:350px; - height:75px; + width: 25px; + height: 25px; + } -#user{ - float: left; +a{ + text-decoration: none; + margin-top: 10px ; + margin-right: 10px; + font-size: 15px; } -.userChat{ - margin-left: 200px; -} \ No newline at end of file +#ofekTitle { + font-size: 20px; + font-family: Arial,serif; + clear: right; + text-align: right; + color: white; +} + + diff --git a/CSS/OfekCSS.css b/CSS/OfekCSS.css index fa5f182..99a74c7 100644 --- a/CSS/OfekCSS.css +++ b/CSS/OfekCSS.css @@ -1,6 +1,6 @@ - +/* header, footer { - padding: 10px; + padding: 1%; color: white; background-color: blue; clear: left; @@ -12,24 +12,35 @@ header, footer { color: white; background-color: blue; float: right; - margin-left: 10px; + margin-left: 3%; } -#ofekIm { - padding: 5px; - clear: left; - text-align: left; - width: 25px; - height: 25px; +a{ + text-decoration: none; } +#ofekTitle { + font-size:100%; + font-family: Arial,serif; + clear: right; + text-align: right; + color: white; +} #ofekIm.navbar { + width: 4%; + height: 4%; +} .sign-in { margin: 150px; margin-top: 20px; } -#ofekTitle { - font-size: 25px; -} +*/ +#avatar{ + margin-left: 5%; + } +.panel { + margin-top: 10%; + padding: 0 !important; +} \ No newline at end of file diff --git a/CSS/SignUp.css b/CSS/SignUp.css index 4355b55..9fd5ea7 100644 --- a/CSS/SignUp.css +++ b/CSS/SignUp.css @@ -1,5 +1,13 @@ -header, footer { - padding: 10px; + + +.panel { + margin-top: 10%; + padding: 0 !important; +} + + +/*header, footer { + padding:5px; color: white; background-color: blue; clear: left; @@ -15,13 +23,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; } \ No newline at end of file diff --git a/CSS/Style.css b/CSS/Style.css new file mode 100644 index 0000000..6749951 --- /dev/null +++ b/CSS/Style.css @@ -0,0 +1,21 @@ +.image{ + height: 25px; +} +.text-color{ + color: white; + font-family: Arial,serif; + font-size: medium; +} + +.backgroud-color{ + background-color: #2b669a; +} + +.modal-content{ + position: relative; + border: white !important; +} + +#login-botton{ + margin-left: 5%; +} diff --git a/CSS/UserFilter.css b/CSS/UserFilter.css index f7583f2..5a9748e 100644 --- a/CSS/UserFilter.css +++ b/CSS/UserFilter.css @@ -1,42 +1,79 @@ -header, footer { - padding: 10px; - color: white; - background-color: blue; - clear: left; - text-align: left; +.Filter { + margin-top: 3%; + margin-left:5%; } +.users-left{ +margin: 0; +} + +.user-container{ + width: 80px; + padding: 0 auto; + margin-right: 10px; -.botton { - color: white; - background-color: blue; - float: right; - margin-left: 10px; } -#ofekIm { - padding: 5px; - clear: left; - text-align: left; - width:25px; - height:25px; -}.Filter{ - margin-top: 40px; - text-align: center; - } -.userLeft{ - margin-left: 25px; - margin-top: 70px; - float: left; +.row{ text-align: center; } -#ofekTitle{ - font-size: 25px; - } -.userRight{ - margin-right: 25px; - margin-top: 70px; - margin-left: 70px; - margin-bottom: 25px; - float: right; +.panel-body-right{ + margin-left: 40px ; + width: 100px; +} +.users-right{ text-align: center; -} \ No newline at end of file +} +/*header, footer {*/ + /*padding: 5px;*/ + /*color: white;*/ + /*background-color: blue;*/ + /*clear: left;*/ + /*text-align: left;*/ + +/*}*/ + +/*.botton {*/ + /*color: white;*/ + /*background-color: blue;*/ + /*float: right;*/ + /*margin-left: 10px;*/ +/*}*/ +/*#ofekIm {*/ + + /*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;*/ + /*}*/ +/*.userLeft{*/ + /*margin-left: 25px;*/ + /*margin-top: 70px;*/ + /*float: left;*/ + /*text-align: center;*/ +/*}*/ + +/*.userRight{*/ + /*margin-right: 25px;*/ + /*margin-top: 70px;*/ + /*margin-left: 70px;*/ + /*margin-bottom: 25px;*/ + /*float: right;*/ + /*text-align: center;*/ +/*}*/ diff --git a/OfekTwitterFiles/Chat.html b/OfekTwitterFiles/Chat.html index 8df3e1c..6fb572b 100644 --- a/OfekTwitterFiles/Chat.html +++ b/OfekTwitterFiles/Chat.html @@ -1,35 +1,75 @@
- +