-
Notifications
You must be signed in to change notification settings - Fork 9
update sponsor page margins, use pure #11
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.
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
Open
davidbliu
wants to merge
4
commits into
InnoDWebDevTier:master
Choose a base branch
from
davidbliu:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,106 @@ | ||
| * { | ||
| -webkit-box-sizing: border-box; | ||
| -moz-box-sizing: border-box; | ||
| box-sizing: border-box; | ||
| font-family: raleway; | ||
| } | ||
| .home-menu { | ||
| padding: 0.5em; | ||
| text-align: center; | ||
| } | ||
| .home-menu { | ||
| background: black; | ||
| } | ||
| .home-menu .pure-menu-item { | ||
| font-size: 12px; | ||
| letter-spacing: 5px; | ||
| } | ||
| .home-menu a { | ||
| color: white; | ||
| } | ||
| .home-menu li a:hover, | ||
| .home-menu li a:focus { | ||
| background: black; | ||
| color: gray; | ||
| } | ||
| .top-img { | ||
| position: absolute; | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| top: 30%; | ||
| left: 50%; | ||
| width: 500px; | ||
| height: auto; | ||
| margin-left: -250px; | ||
| z-index: 5; | ||
| } | ||
| .bot-img { | ||
| width: 100%; | ||
| height: 100%; | ||
| position: relative; | ||
| } | ||
|
|
||
| /* TODO: uses landing page css */ | ||
|
|
||
| h1, h2, h3, h4, h5, h6 { | ||
| font-family: 'Raleway'; | ||
| } | ||
| p, div { | ||
| font-family: 'Raleway'; | ||
| } | ||
| body{ | ||
| background-color:black; | ||
| color:white; | ||
| font-family: 'Raleway'; | ||
| } | ||
| a{ | ||
| color: #0077CC; | ||
| color: #0077CC; | ||
| } | ||
| .centered{ | ||
| text-align:center; | ||
| body{ | ||
| background-color:#F3F3F3; | ||
| } | ||
| #sponsor-title{ | ||
| text-align: center; | ||
| margin-bottom:25px; | ||
| } | ||
| #main-content{ | ||
| padding-left:25px; | ||
| padding-right:25px; | ||
| padding-top: 65px; | ||
| padding-bottom:100px; | ||
| } | ||
| .r-img{ | ||
| width:100%; | ||
| margin-top:5px; | ||
| } | ||
| #sponsor-form{ | ||
| padding:15px; | ||
| background-color:rgba(183, 45, 14, 0.95); | ||
| width:100%; | ||
| margin-top:5px; | ||
| } | ||
| #sponsor-form>.form-control{ | ||
| margin-bottom:10px; | ||
| border-radius:0px; | ||
| margin-bottom:10px; | ||
| border-radius:0px; | ||
| } | ||
| #sponsor-form>.btn{ | ||
| border-radius:0px; | ||
| border-radius:0px; | ||
| } | ||
| .logo-img{ | ||
| height:45px; | ||
| float:left; | ||
| height:45px; | ||
| float:left; | ||
| } | ||
| .sponsor-p{ | ||
| padding-right:25px; | ||
| line-height:1.5em; | ||
| } | ||
| .row{ | ||
| margin-bottom: 35px; | ||
| } | ||
| .sponsor-div{ | ||
| padding-left: 15px; | ||
| padding-right:15px; | ||
| } | ||
| #sponsor-form>input{ | ||
| margin-bottom:10px; | ||
| width:100%; | ||
| } | ||
| #sponsor-form>textarea{ | ||
| margin-bottom:10px; | ||
| width:100%; | ||
| } | ||
| #sponsor-form{ | ||
| padding:15px; | ||
| padding-top:0px; | ||
| } | ||
| #sponsor-form-div{ | ||
| background-color:rgba(35, 42, 53, 0.08); | ||
| padding:15px; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| @import 'styleguide'; | ||
| @import 'common'; | ||
| .centered{ | ||
| text-align: center; | ||
| } | ||
| #sponsor-title{ | ||
| text-align: center; | ||
| margin-bottom:1em; | ||
| } | ||
| #main-content{ | ||
| padding-top: 1em; | ||
| padding-bottom:1em; | ||
| } | ||
| .r-img{ | ||
| width:100%; | ||
| } | ||
| #sponsor-img{ | ||
| margin-top:2em; | ||
| } | ||
| #sponsor-form>.form-control{ | ||
| margin-bottom:10px; | ||
| border-radius:0px; | ||
| } | ||
| #sponsor-form>.btn{ | ||
| border-radius:0px; | ||
| } | ||
| .logo-img{ | ||
| height:45px; | ||
| float:left; | ||
| } | ||
| .sponsor-p{ | ||
| padding-right:1em; | ||
| line-height:1.5em; | ||
| } | ||
| .row{ | ||
| margin-bottom: 1em; | ||
| } | ||
| .sponsor-div{ | ||
| margin-top:1em; | ||
| padding-left: 1em; | ||
| padding-right: 1em; | ||
| } | ||
| #sponsor-form>input{ | ||
| margin-bottom:1em; | ||
| width:100%; | ||
| } | ||
| #sponsor-form>textarea{ | ||
| margin-bottom:1em; | ||
| width:100%; | ||
| } | ||
| #sponsor-form{ | ||
| padding:15px; | ||
| padding-top:0px; | ||
| } | ||
| #sponsor-form-div{ | ||
| background-color:rgba(35, 42, 53, 0.08); | ||
| padding:15px; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,46 @@ | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <title>FAST</title> | ||
| <link rel = 'stylesheet' href = 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css'> | ||
| <link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'> | ||
| <link rel = 'stylesheet' href = '../css/sponsor.css'> | ||
| <link rel="icon" | ||
| type="image/png" | ||
| href="http://www.oystermag.com/sites/default/files/imagecache/article-image-650x580/images/kanye_head_photo.png"> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <title>Sponsor Us</title> | ||
| <link href='http://fonts.googleapis.com/css?family=Raleway&subset=latin,latin-ext' rel='stylesheet' type='text/css'> | ||
| <link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.6.0/pure-min.css"> | ||
| <link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.6.0/grids-responsive-min.css"> | ||
| <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css"> | ||
| <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script> | ||
| <link rel="stylesheet" href="../css/sponsor.css"> | ||
| </head> | ||
| <body> | ||
| <nav style = 'border-radius:0px; margin-bottom:15px; padding:10px; ' class="navbar navbar-default"> | ||
| <div class="container-fluid"> | ||
| <div class="collapse navbar-collapse"> | ||
| <img src = 'http://www.oystermag.com/sites/default/files/imagecache/article-image-650x580/images/kanye_head_photo.png' class = 'logo-img'> | ||
| <ul class="nav navbar-nav"> | ||
| <li><a href = '#'>Events</a></li> | ||
| <li><a href = '#'>Lookbooks</a></li> | ||
| <li><a href = '#'>Blog</a></li> | ||
| </ul> | ||
| </div><!-- /.navbar-collapse --> | ||
| </div><!-- /.container-fluid --> | ||
| </nav> | ||
| <div id = 'main-content'> | ||
| <h1 class = 'centered'>Sponsor FAST</h1> | ||
| <div class = 'row'> | ||
| <div class = 'col-md-2'></div> | ||
| <div class = 'col-md-4'> | ||
| <h2>We Be Chicken</h2> | ||
| <p> | ||
| It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). | ||
| </p> | ||
| </div> | ||
| <div class = 'col-md-4'> | ||
| <img src = 'http://fastcal.net/wp-content/uploads/2014/06/slide1-1080x410.jpg' class = 'r-img'> | ||
| <img src = 'http://fastcal.net/wp-content/uploads/2014/12/lucy-19549361f959fe9-1080x410.jpg' class = 'r-img'> | ||
| </div> | ||
| <div class = 'col-md-2'></div> | ||
| </div> | ||
|
|
||
| <div class = 'row'> | ||
| <div class = 'col-md-2'></div> | ||
| <div class = 'col-md-2'> | ||
| <img src = 'http://fastcal.net/wp-content/uploads/2014/12/lucy-2-683x1024.jpg' class = 'r-img'> | ||
| </div> | ||
| <div class = 'col-md-6'> | ||
| <h2>There is flurry</h2> | ||
| <p>There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage of Lorem Ipsum, you need to be sure there isn't anything embarrassing hidden in the middle of text. All the Lorem Ipsum generators on the Internet tend to repeat predefined chunks as necessary, making this the first true generator on the Internet. It uses a dictionary of over 200 Latin words, combined with a handful of model sentence structures, to generate Lorem Ipsum which looks reasonable. The generated Lorem Ipsum is therefore always free from repetition, injected humour, or non-characteristic words etc. | ||
| </p> | ||
| </div> | ||
| <div class = 'col-md-2'></div> | ||
| </div> <!--end of row 2--> | ||
|
|
||
| <div class = 'row'> | ||
| <div class = 'col-md-4'></div> | ||
| <div class = 'col-md-4'> | ||
| <div id = 'sponsor-form'> | ||
| <h2>Leave Us A Message</h2> | ||
| <input type = 'text' class = 'form-control' placeholder = 'Name'> | ||
| <textarea class = 'form-control' placeholder = 'Leave us a message and we will get back'></textarea> | ||
| <input type = 'submit' class = 'btn btn-default' value = 'Submit'> | ||
| </div> | ||
| </div> | ||
| <div class = 'col-md-4'></div> | ||
| </div> | ||
| </div> <!-- end of main content --> | ||
| <div id = "main-content"> | ||
| <h1 id = 'sponsor-title'>Sponsor FAST</h1> | ||
| <div class = "row"> | ||
| <div class= "pure-u-1-6"></div> | ||
| <div class = "pure-u-1-3 sponsor-div"> | ||
| <p class = 'sponsor-p'> | ||
| It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. | ||
| </p> | ||
| </div> | ||
| <div class = "pure-u-1-3 sponsor-div"> | ||
| <img id = "sponsor-img" src = 'http://a.fastcompany.net/multisite_files/fastcompany/imagecache/1280/poster/2014/04/3028600-poster-p-fashion.jpg' class = 'r-img'> | ||
| </div> | ||
| <div class = "pure-u-1-6"> | ||
| </div> | ||
| </div> <!-- end of row --> | ||
| <div class = 'row'> | ||
| <div class = 'pure-u-1-3'></div> | ||
| <div class = 'pure-u-1-3'> | ||
| <div id = "sponsor-form-div"> | ||
| <h1 class = 'centered'>Sponsor Us</h1> | ||
| <form class = 'pure-form' id = 'sponsor-form'> | ||
| <input type = 'text' placeholder = 'Your Email'/> | ||
| <textarea placeholder = "Leave us a message"></textarea> | ||
| <button type = 'submit' class = "pure-button pure-button-primary">Submit</button> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| <div class = 'pure-u-1-3'></div> | ||
| </div> | ||
| </div> | ||
| </body> | ||
| </html> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you should probably just put border-box on the stuff you need to have border-box on and stay away from
* { ... }style css declarations in general. something likebody { ... }would suffice