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

created bg , google & facebook in style.css #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

created bg , google & facebook in style.css #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
616d2af
created bg , google & facebook in style.css
kejtwu May 7, 2018
0bdf739
created bg ,try to improve google & facebook buttons, change logo.png…
kejtwu May 7, 2018
b52098a
changes in register page
kejtwu May 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions www/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
}

body {
background: linear-gradient( #d0d6e5, #162342);
-webkit-touch-callout: none; /* prevent callout to copy image, etc when tap to hold */
-webkit-text-size-adjust: none; /* prevent webkit from resizing text to fit */
-webkit-user-select: none; /* prevent copy paste, to allow, change 'none' to 'text' */
Expand Down Expand Up @@ -76,6 +77,7 @@ h1 {
overflow:visible;
padding:0px;
text-align:center;

}

.event {
Expand Down
135 changes: 133 additions & 2 deletions www/css/register.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@



body { text-align: center; padding: 40px; background: #F5F5F5; }
body { text-align: center;
padding: 40px;
background: linear-gradient( #d0d6e5, #162342);
}

.container { width: 500px; text-align: center; margin: auto;}
.copyright { margin-top: 50px; font-size: 12px; text-transform: uppercase; }
.copyright a { text-decoration: none; padding: 5px;background: #c0392b; color: #FFFFFF; }
Expand Down Expand Up @@ -90,4 +94,131 @@ filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccfffff

.button.red {
background: #e74c3c;
}
}
/* logo*/
.logo{
padding: 0;
margin: 0;

font-family: sans-serif;
font-size: 48px;
font-weight: 700;
text-align: center;
margin-left: auto;
margin-right: auto;
height: 100px;
width: auto;
}
.container span{

text-transform: uppercase;
display: block;
width: 100%;
background: black;

}
.text1{
font-size: 40px;
font-weight: 700;
letter-spacing: 8px;
margin-top: 20px;
color: white;
/*background: black; */
position: relative;
animation: text 3s 1;
}
.text2{
font-size: 30px;
font-weight: 200;
color: red;

}
@keyframes text {
0% {
color: black;
margin-bottom: -40px;
}
30%{
letter-spacing: 25px;
margin-bottom: -40px;
}
85%{
letter-spacing: 8px;
margin-bottom: -40px;

}

}

/*google & Facebook buttons */
.loginBtn {
box-sizing: border-box;
position: relative;
/width: 13em; /* - apply for fixed size */
margin: 0.2em;
padding: 0 15px 0 46px;
border: none;
text-align: left;
line-height: 34px;
white-space: nowrap;
border-radius: 0.2em;
font-size: 16px;
color: #FFF;
/*width: 20%;
margin: 0px auto;
margin-top: 150px;
padding: 20px;
display: none;*/
}
.loginBtn:before {
content: "";
box-sizing: border-box;
position: absolute;
top: 0;
left: 0;
width: 34px;
height: 100%;
}
.loginBtn:focus {
outline: none;
}
.loginBtn:active {
box-shadow: inset 0 0 0 32px rgba(0,0,0,0.1);
}


/* Facebook */
.loginBtn--facebook {
background-color: #4C69BA;
background-image: linear-gradient(#4C69BA, #3B55A0);
/*font-family: "Helvetica neue", Helvetica Neue, Helvetica, Arial, sans-serif;*/
text-shadow: 0 -1px 0 #354C8C;


}
.loginBtn--facebook:before {
border-right: #364e92 1px solid;
background: url('https://s3-us-west-2.amazonaws.com/s.cdpn.io/14082/icon_facebook.png') 6px 6px no-repeat;
}
.loginBtn--facebook:hover,
.loginBtn--facebook:focus {
background-color: #5B7BD5;
background-image: linear-gradient(#5B7BD5, #4864B1);
}


/* Google */
.loginBtn--google {
/*font-family: "Roboto", Roboto, arial, sans-serif;*/
background: #DD4B39;
background-image: linear-gradient(#DD4B39, ##e52710);
}
.loginBtn--google:before {
border-right: #BB3F30 1px solid;
background: url('https://s3-us-west-2.amazonaws.com/s.cdpn.io/14082/icon_google.png') 6px 6px no-repeat;
}
.loginBtn--google:hover,
.loginBtn--google:focus {
background: #E74B37;
background-image: linear-gradient(#db3f3f, #e81b1b);
}
88 changes: 87 additions & 1 deletion www/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ div {
}

body {
background: #fff;
background: linear-gradient( #d0d6e5, #162342);
padding: 0px;
margin: 0px;
font-family: 'Nunito', sans-serif;
Expand All @@ -31,13 +31,15 @@ input, button {
margin-top: 150px;
padding: 20px;
display: none;
background: linear-gradient( #d0d6e5, #162342);
}

.main-div input {
width: 100%;
padding: 12px;
margin: 8px 0;
box-sizing: border-box;

}

.main-div input:focus {
Expand Down Expand Up @@ -83,3 +85,87 @@ input, button {
border: 1px solid #5d8ffc;
cursor: pointer;
}
.logo{
background-color: #4C69BA;
font-family: 'Amatic SC', cursive;
font-size: 38px;
font-weight: 600;
text-align: center;
margin-left: auto;
margin-right: auto;


}

/*google & Facebook buttons */
.loginBtn {
box-sizing: border-box;
position: relative;
/width: 13em; /* - apply for fixed size */
margin: 0.2em;
padding: 0 15px 0 46px;
border: none;
text-align: left;
line-height: 34px;
white-space: nowrap;
border-radius: 0.2em;
font-size: 16px;
color: #FFF;
/*width: 20%;
margin: 0px auto;
margin-top: 150px;
padding: 20px;
display: none;*/
}
.loginBtn:before {
content: "";
box-sizing: border-box;
position: absolute;
top: 0;
left: 0;
width: 34px;
height: 100%;
}
.loginBtn:focus {
outline: none;
}
.loginBtn:active {
box-shadow: inset 0 0 0 32px rgba(0,0,0,0.1);
}


/* Facebook */
.loginBtn--facebook {
background-color: #4C69BA;
background-image: linear-gradient(#4C69BA, #3B55A0);
/*font-family: "Helvetica neue", Helvetica Neue, Helvetica, Arial, sans-serif;*/
text-shadow: 0 -1px 0 #354C8C;


}
.loginBtn--facebook:before {
border-right: #364e92 1px solid;
background: url('https://s3-us-west-2.amazonaws.com/s.cdpn.io/14082/icon_facebook.png') 6px 6px no-repeat;
}
.loginBtn--facebook:hover,
.loginBtn--facebook:focus {
background-color: #5B7BD5;
background-image: linear-gradient(#5B7BD5, #4864B1);
}


/* Google */
.loginBtn--google {
/*font-family: "Roboto", Roboto, arial, sans-serif;*/
background: #DD4B39;
background-image: linear-gradient(#DD4B39, ##e52710);
}
.loginBtn--google:before {
border-right: #BB3F30 1px solid;
background: url('https://s3-us-west-2.amazonaws.com/s.cdpn.io/14082/icon_google.png') 6px 6px no-repeat;
}
.loginBtn--google:hover,
.loginBtn--google:focus {
background: #E74B37;
background-image: linear-gradient(#db3f3f, #e81b1b);
}
Binary file added www/eurobeat.mp3
View file
Open in desktop
Binary file not shown.
Binary file added www/img/login.gif
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified www/img/logo.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 16 additions & 4 deletions www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Titan+One" rel="stylesheet">

<script src="https://www.gstatic.com/firebasejs/4.12.1/firebase.js"></script>
<script src="../js/pgb.js"></script>
Expand All @@ -21,9 +22,11 @@
<script src="../js/bootstrap.js"></script>
<script src="../js/angular.min.js"></script>


</head>
<body>


<script src="https://www.gstatic.com/firebasejs/4.12.1/firebase.js"></script>
<script>
// Initialize Firebase
Expand All @@ -46,8 +49,13 @@

<header>

eScores

<!-- <div class="logo" -->
<div class="container">
<span class="text1">Welcome in</span>
<span class="text2">eScores</span>

</div>
<!-- </div> -->
</header>


Expand All @@ -68,11 +76,15 @@

<button onclick="login()" href="#" class="button"><span>✓</span>Login to Account</button></br>
<button onclick="window.location.href='html/register.html'" href="#" class="button"><span>✓</span>Register new Account</button></br>
<button onclick="google_login_in()" href="#" class="button"><span>✓</span>Login using Google</button></br>
<button onclick="facebook_login_in()" href="#" class="button"><span>✓</span>Login using Facebook</button></br>

<button onclick="window.location.href='html/main01.html'" href="#" class="button"><span>✓</span>Test</button></br>
</div>

<div id="login_div" >
<button onclick="google_login_in()" class="loginBtn loginBtn--google">Login using Google</button></br>
<button onclick="facebook_login_in()" class="loginBtn loginBtn--facebook">Login using Facebook</button></br>
</div>

<div id="user_div" class="loggedin-div">
<h3>Welcome User</h3>
<p id="user_para">Welcome to eSports!. You're currently logged in.</p>
Expand Down