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

HW2 Maya Bhat #7

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

HW2 Maya Bhat #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be9e17b
HW2
mbhat25 May 26, 2016
13e0ea4
Updates
mbhat25 Jun 1, 2016
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
17 changes: 17 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
195 changes: 176 additions & 19 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Developer @GA in NYC
/* SETUP
/*******************************************/


/* Box Model Hack */
* {
-moz-box-sizing: border-box; /* Firexfox */
Expand Down Expand Up @@ -43,41 +44,197 @@ Developer @GA in NYC

/******************************************
/* BASE STYLES
benefits background color: #f0efef
yellow: #f9e42e
dark blue: #033048
light grey: #606161
almost black: #121212

"Benefits" - Semibold, 20px
"The perfect personal assistant. Relaxr does your job for you so you can enjoy life as it is meant to be." - Light, 13px
"• Schedule meetings for you
• Excel automation to complete your work for you
• Responds to emails on your behalf
• Does all your work for you with our revolutionary AI technology" - Light, 13px

"“Relaxr changed my life. I’ve been able to travel the world, spend limited time working and my boss keeps thanking me for crushing work.”" - Light Italic, 18px
"- Amanda, Intuit " - semibold, 18px

"Sign Up Now!" - extra bold, 12px, 5px border radius

Relaxr - extra bold, 24px
"Copyright 2015. Relaxr." - 9px, semibold
/*******************************************/
/*Styles*/
/*******************************************/
.container1 {
background: url(../images/header_bg.jpg) no-repeat center top rgb(134,141,157);
background-size: cover;
}

body {
color: #000;
font-size: 12px;
line-height: 1.4;
font-family: Helvetica, Arial, sans-serif;
background: url(../images/header_bg.jpg) no-repeat center top rgb(134,141,157);
background-size: cover;
h1#logo{
color: white;
font-size: 44px;
font-family: 'Open Sans';
font-weight: 800;
padding-left: 50px;
padding-top: 50px;
height: 200px;
}

h2#tagline{
color: white;
font-size: 40px;
font-family: 'Open Sans';
font-weight: 500;
text-align: center;
height: 200px;
}

#getit{
color: #033048;
font-size: 22px;
font-family: 'Open Sans';
font-weight: 600;
border-radius: 5px;
height: 50px;
width: 200px;
background-color: #f9e42e;
text-align: center;
padding-top: 10px;
margin:auto;
}

/******************************************
/* LAYOUT
/*******************************************/
.container2{
color: #121212;
font-size: 22px;
font-family: 'Open Sans';
line-height: 1.2;
background-color: #f0efef;
}

/* Center the container */
.container {
width: 960px;
margin: auto;
height: 500px;
.container2 h2{
font-size: 40px;
font-family: 'Open Sans';
}

header {

ul{
list-style-type: circle;
margin-left: 70px;
line-height: 1.5;
height: 250px;
width: 600px;
}

footer {
blockquote{
font-size: 30px;
font-family: 'Open Sans';
color:white;
text-align: center;
font-weight: 200;
padding-left: 250px;
padding-right: 250px;
padding-top: 100px;
line-height: 1.5;
font-style: italic;
}

p#name{
font-weight: bold;
font-style: normal;
}

.container3{
background-color: #033048;
}

.container4{
background-color: #f9e42e;
}

#signuptext{
margin-top: 50px;
color: white;
font-size: 22px;
font-family: 'Open Sans';
font-weight: 600;
border-radius: 5px;
height: 50px;
width: 200px;
background-color: #033048;
text-align: center;
padding-top: 10px;
margin:auto;

}


#logoyellow{
color: #f9e42e;
font-size: 44px;
font-family: 'Open Sans';
font-weight: 800;
padding-top: 50px;
height: 150px;
text-align: center;
}

.container5{
background-color: #033048;
text-align: center;
font-size: 15px;
font-family: 'Open Sans';
color:white;
}

.icon{
padding-left: 20px;
padding-right: 20px;
}

footer{
padding-top: 80px;
}

/******************************************
/* ADDITIONAL STYLES
/*******************************************/
/*Layout*/
/*******************************************/

.container1 {
height: 700px;
width: 100%;
margin:0px;
}

.container2{
padding-left: 50px;
padding-top: 50px;
}

.container2 h2{
margin-bottom: 20px;
}

.container2 p{
height: 75px;
width: 600px;
}

.container3{
width: 100%;
height:400px;
}

.container4{
height: 150px;
}

.container4 p{
height: 50px;
}

.container5{
width: 100%;
height:300px;
}
51 changes: 42 additions & 9 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,59 @@
<!DOCTYPE html>
<html lang="en">
<head>

<meta charset="utf-8">
<meta name="description" content="Your description goes here">
<meta name="keywords" content="one, two, three">
<meta name="relaxr" content="piece of mind">
<meta name="keywords" content="relaxr, assistant, app">

<title>Blank Template</title>
<title>Relaxr</title>

<!-- external CSS link -->
<link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/style.css">

</head>

<body>
<div id="container">

<div class="container1">
<header>
<h1>Blank Template</h1>
<h2>Just another blank template</h2>
<h1 id="logo">Relaxr</h1>
<h2 id="tagline">Get piece of mind with a single tap</h2>
<p id="getit"> Get It Now</p>
Copy link

Choose a reason for hiding this comment

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

@mbhat25 This should either be an <a href="#"></a> and style it or a button tag. p tags are meant for text
🔨

</header>
<footer>
&copy; Footer Goes Here
</footer>
</div>

<div class="container2">
<h2 id="benefits">Benefits</h2>
<p id="benefitscopy">
The perfect personal assistant. Relaxr does your job for you so you can enjoy life as it is meant to be.
</p>
<ul>
<li>Schedule meetings for you</li>
<li>Excel automation to complete your work for you</li>
<li>Responds to emails on your behalf</li>
<li>Does all your work for you with our revolutionary AI technology</li>
</ul>
</div>

<div class="container3">
<blockquote>
<p>"Relaxr changed my life. I've been able to travel the world, spend limited time working and my boss keeps thanking me for crushing work."</p>
<p id="name">- Amanda, Intuit</p>
</blockquote>
</div>

<div class="container4">
<p></p>
Copy link

Choose a reason for hiding this comment

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

@mbhat25 there is an empty p tag 🔨

<p id="signuptext">Sign Up Now!</p>
</div>

<div class="container5">
<h1 id="logoyellow">Relaxr</h1>
<img class="icon" src="images/twitter.png">
<img class="icon" src="images/facebook.png">
<footer>&copy; Copyright 2015. Relaxr</footer>
</div><!-- #container -->
</body>
</html>