Skip to content

Commit

Permalink
Add CSS to user auth
Browse files Browse the repository at this point in the history
  • Loading branch information
avvazana committed Nov 15, 2018
1 parent a2431d5 commit 89e2deb
Show file tree
Hide file tree
Showing 15 changed files with 348 additions and 16 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified app/.DS_Store
Binary file not shown.
Binary file modified app/assets/.DS_Store
Binary file not shown.
Binary file added app/assets/images/.DS_Store
Binary file not shown.
Binary file added app/assets/images/Spotify_Icon_Black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/assets/images/background-bubbles.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/btn-play_video.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/tripledot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
151 changes: 151 additions & 0 deletions app/assets/stylesheets/components/session.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
.session-form-container{
font-family: Circular,Helvetica,Arial,sans-serif;
font-size: 16px;
line-height: 1.5;
color: #222326;
background-color: #fff;
margin: 0;
box-sizing: border-box;
display: block;
}

*, :after, :before {
box-sizing: border-box;
}

.session-header{
border-bottom: 1px solid #d9dadc;
padding: 25px 0 10px;
margin-bottom: 30px;
display: flex;
justify-content: center;
}
.session-logo{
width: 65px;
height: 65px;
}

.session-header h1{
padding-top: 6px;
letter-spacing: -1px;
margin-left: 9px;
display: flex;
justify-content: left;
font-weight: 400;
font-size: 38px;
height: 40px;
font-weight: 700;
}

.demo-div {
margin-right: auto;
margin-left: auto;
padding-left: 15px;
padding-right: 15px;
display: table;
text-align: center;
width: 600px;
}

.demo-button {
padding: 14px 20px;
border: none;
cursor: pointer;
width: 85%;
text-align: center;
border-radius: 21px;
font-weight: 650;
margin-top: 5px;
color: #fff;
background-color: #3a61b3;
}

.demo-button:hover {
color: white;
background-color: #256fe8;
}

.session-form{
margin-right: auto;
margin-left: auto;
padding-left: 15px;
padding-right: 15px;
display: table;
text-align: center;
}

.session-form input[type=text], input[type=email], input[type=password] {
width: 500px;
padding: 12px 20px;
margin: 8px 0;
display: inline-block;
border: 1px solid #ccc;
box-sizing: border-box;
}

.session-submit {
background-color: #1db954;
color: white;
padding: 14px 20px;
margin: 8px 0;
border: none;
cursor: pointer;
width: 40%;
text-align: center;
border-radius: 21px;
font-weight: 650;
margin-top: 20px;
margin-bottom: 20px;
}

.session-submit:hover{
color: #fff;
background-color: #4bdf80;
}


.session-form divider{
display: block;
margin-top: 1em;
margin-bottom: 1em;
margin-left: auto;
margin-right: auto;
border-style: solid;
border-width: 1px
}

.session-form h2{
padding-top: 35px;
padding-bottom: 10px;
font-weight: 650;
color: black;
}

.session-link{
margin-right: auto;
margin-left: auto;
padding-left: 15px;
padding-right: 15px;
display: table;
text-align: center;
width: 600px;
}

.session-form-other-button {
padding: 14px 20px;
margin: 8px 0;
border: none;
cursor: pointer;
width: 85%;
text-align: center;
border-radius: 21px;
font-weight: 650;
color: #616467;
box-shadow: inset 0 0 0 2px #616467;
background-color: transparent;
}

.session-form-other-button:hover{
color: white;
background-color: #616467;
}
73 changes: 73 additions & 0 deletions app/assets/stylesheets/components/splash.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@

.splash-page{
background: image-url('background-bubbles.svg'), linear-gradient(rgb(253, 80, 107), rgb(251, 153, 56));
width: 100%;
height: 2000px;
font-family: Circular, Helvetica, Arial, sans-serif;
position:relative
}


.splash-nav {
background-color: rgba(0,0,0,0.5);
height: 80px;
display: flex;
justify-content: space-between;
font-size: 16px;
font-weight: 700;
color: #D9DADC;
position: fixed;
right: 0;
left: 0;
z-index: 2;
}

.splash-page .logo {
display: flex;
justify-content: left;
font-weight: 400;
font-size: 28px;
height: 40px;
color: white;
margin-left: 110px;
margin-top: 18px;
}

.splash-page .logo img {
width: 40px;
}

.splash-page .logo h1 {
padding-top: 4px;
letter-spacing: -1px;
margin-left: 9px;
}

.login-signup{
color: white;
margin-top: 28px;
margin-right: 110px;
justify-content: space-between;
font-size: 14px;
}

.splash-session-link:hover {
color: #1ed760;
}

.splash-body{
display: flex;
justify-content: space-around;
font-size: 80px;
font-weight: 900;
padding: 400px 0;
color: white;
}

.footer-div{
position:absolute;
bottom:0;
width:100%;
height:500px;
background-color:black;
}
57 changes: 57 additions & 0 deletions app/assets/stylesheets/reset.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
html, body, header, nav, h1, a,
ul, li, strong, main, button, i,
section, img, div, h2, p, form,
fieldset, label, input, textarea,
span, article, footer, time, small {
margin: 0;
padding: 0;
border: 0;
outline: 0;
font: inherit;
color: inherit;
text-align: inherit;
text-decoration: inherit;
vertical-align: inherit;
box-sizing: inherit;
background: transparent;
font-family: 'Montserrat', sans-serif;
}

ul {
list-style: none;
}

img {
display: block;
width: 100%;
height: auto;
}

input[type="password"],
input[type="email"],
input[type="text"],
input[type="submit"],
textarea,
button {
/*
Get rid of native styling. Read more here:
http://css-tricks.com/almanac/properties/a/appearance/
*/
-webkit-appearance: none;
-moz-appearance: none;
}

button,
input[type="submit"] {
cursor: pointer;
}

html {
overflow: hidden;
height: 100%;
}

body {
height: 100%;
overflow: auto;
}
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<title>Spoofify</title>
<%= csrf_meta_tags %>
<%= csp_meta_tag %>

<%= stylesheet_link_tag 'application', media: 'all' %>
<%= javascript_include_tag 'application' %>
<script>
window.whiteLogoURL = "<%= image_url('Spotify_Icon_White.png') %>"
window.blackLogoURL = "<%= image_url('Spotify_Icon_Black.png') %>"
</script>
</head>

Expand Down
5 changes: 1 addition & 4 deletions frontend/components/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,11 @@ import SplashContainer from './splash/splash_container';
const App = () => {
return (
<div>
<header>
<h1>Spoofify</h1>
<SplashContainer/>
</header>

<Switch>
<AuthRoute exact path="/login" component={LoginFormContainer} />
<AuthRoute exact path="/signup" component={SignupFormContainer} />
<Route path="/" component={SplashContainer}/>
</Switch>
</div>
)
Expand Down
Loading

0 comments on commit 89e2deb

Please sign in to comment.