Skip to content
This repository has been archived by the owner on Nov 25, 2017. It is now read-only.

Homepage Fix #10

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

Homepage Fix #10

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
d76231f
update default css
Jun 14, 2017
3218a91
add workflow
Jun 14, 2017
3512c26
rm second app
Jun 16, 2017
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
32 changes: 18 additions & 14 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
# Startup Sprint

This is a partially finished app with a ton of work left in the backlog.
It's up to you and your teammates to generate as much velocity as you
can!
This is a partially finished app with a ton of work left in the backlog. It's up to you and your teammates to generate as much velocity as you can!

## Overview

The backlog is here in this [Trello board](https://trello.com/b/Wk9YRL5H/flatiron-school-vfa-2015#).
We're building an app for today's sprint, complete with a schedule page, team page, newsletter signup form, and other supporting features. Complete as much as you can, then deploy your app to [Heroku](https://www.heroku.com/home).

From the menu on the right, copy the Trello board to one of your own.
Then start looking through the cards and picking out the ones that seem
most cost effective to implement for your team.
The backlog is here in this [Trello board](https://trello.com/b/gK1QntcZ).

From the menu on the right, copy the Trello board to one of your own. Then start looking through the cards and picking out the ones that seem most cost effective to implement for your team.

## Getting Started

Fork and clone this lab. You'll probably want to add your team mates as
collaborators on your Github repo so that you can collaborate. Watch out
for merge conflicts though!
Fork and clone this lab. You'll probably want to add your teammates as collaborators on your Github repo so that you can collaborate. Watch out for merge conflicts though!

You'll need to run `bundle install` to install all the necessary Ruby gems.

Start the server with the `rackup` command, you can then view it at "http://localhost:9292".

## Recommended Workflow

As you work through the backlog, assign tickets to one or more team members, who will own completing the ticket.

You'll want to create a new git branch for each ticket, and do your work on that branch.

You'll need to run `bundle install` to install all the necessary Ruby
gems.
Submit a separate pull request for each ticket, and be sure to link your pull request to the ticket for easy reference.

Start the server with the `rackup` command, you can then view it at
"http://localhost:9292".
Review each other's work before merging :shipit:
20 changes: 2 additions & 18 deletions app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,8 @@ class App < Sinatra::Base
['6:30pm', 'Meetup Presentation'],
]

erb :schedule
end
end
# TODO: add a third day's schedule (@day_after)

class App < Sinatra::Base
get '/fib/:n' do
# TODO: implement an algorithm to calculate the fibonacci sequence at
# the nth position and display
# (4) points
end

get '/team-randomizer' do
# TODO: provide a form with a textarea that asks for a list of comma
# separated names. Randomize this list of names and display it as an
# ordered list (<ol>). 5 points
end

def fib(n)
# TODO: calculate fib
erb :schedule
end
end
269 changes: 2 additions & 267 deletions public/stylesheets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,272 +1,7 @@
/*
* What follows is the result of much research on cross-browser styling.
* Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,
* Kroc Camen, and the H5BP dev community and team.
* TODO: add custom styling
*/

/* ==========================================================================
Base styles: opinionated defaults
========================================================================== */
.column {

html {
color: #222;
font-size: 1em;
line-height: 1.4;
}

/*
* Remove text-shadow in selection highlight:
* https://twitter.com/miketaylr/status/12228805301
*
* These selection rule sets have to be separate.
* Customize the background color to match your design.
*/

::selection {
background: #b3d4fc;
text-shadow: none;
}

/*
* A better looking default horizontal rule
*/

hr {
display: block;
height: 1px;
border: 0;
border-top: 1px solid #ccc;
margin: 1em 0;
padding: 0;
}

/*
* Remove the gap between audio, canvas, iframes,
* images, videos and the bottom of their containers:
* https://github.com/h5bp/html5-boilerplate/issues/440
*/

audio,
canvas,
iframe,
img,
svg,
video {
vertical-align: middle;
}

/*
* Remove default fieldset styles.
*/

fieldset {
border: 0;
margin: 0;
padding: 0;
}

/*
* Allow only vertical resizing of textareas.
*/

textarea {
resize: vertical;
}

/* ==========================================================================
Browser Upgrade Prompt
========================================================================== */

.browserupgrade {
margin: 0.2em 0;
background: #ccc;
color: #000;
padding: 0.2em 0;
}

/* ==========================================================================
Author's custom styles
========================================================================== */

















/* ==========================================================================
Helper classes
========================================================================== */

/*
* Hide visually and from screen readers:
*/

.hidden {
display: none !important;
}

/*
* Hide only visually, but have it available for screen readers:
* http://snook.ca/archives/html_and_css/hiding-content-for-accessibility
*/

.visuallyhidden {
border: 0;
clip: rect(0 0 0 0);
height: 1px;
margin: -1px;
overflow: hidden;
padding: 0;
position: absolute;
width: 1px;
}

/*
* Extends the .visuallyhidden class to allow the element
* to be focusable when navigated to via the keyboard:
* https://www.drupal.org/node/897638
*/

.visuallyhidden.focusable:active,
.visuallyhidden.focusable:focus {
clip: auto;
height: auto;
margin: 0;
overflow: visible;
position: static;
width: auto;
}

/*
* Hide visually and from screen readers, but maintain layout
*/

.invisible {
visibility: hidden;
}

/*
* Clearfix: contain floats
*
* For modern browsers
* 1. The space content is one way to avoid an Opera bug when the
* `contenteditable` attribute is included anywhere else in the document.
* Otherwise it causes space to appear at the top and bottom of elements
* that receive the `clearfix` class.
* 2. The use of `table` rather than `block` is only necessary if using
* `:before` to contain the top-margins of child elements.
*/

.clearfix:before,
.clearfix:after {
content: " "; /* 1 */
display: table; /* 2 */
}

.clearfix:after {
clear: both;
}

/* ==========================================================================
EXAMPLE Media Queries for Responsive Design.
These examples override the primary ('mobile first') styles.
Modify as content requires.
========================================================================== */

@media only screen and (min-width: 35em) {
/* Style adjustments for viewports that meet the condition */
}

@media print,
(min-resolution: 1.25dppx),
(min-resolution: 120dpi) {
/* Style adjustments for high resolution devices */
}

/* ==========================================================================
Print styles.
Inlined to avoid the additional HTTP request:
http://www.phpied.com/delay-loading-your-print-css/
========================================================================== */

@media print {
*,
*:before,
*:after {
background: transparent !important;
color: #000 !important; /* Black prints faster:
http://www.sanbeiji.com/archives/953 */
box-shadow: none !important;
text-shadow: none !important;
}

a,
a:visited {
text-decoration: underline;
}

a[href]:after {
content: " (" attr(href) ")";
}

abbr[title]:after {
content: " (" attr(title) ")";
}

/*
* Don't show links that are fragment identifiers,
* or use the `javascript:` pseudo protocol
*/

a[href^="#"]:after,
a[href^="javascript:"]:after {
content: "";
}

pre,
blockquote {
border: 1px solid #999;
page-break-inside: avoid;
}

/*
* Printing Tables:
* http://css-discuss.incutio.com/wiki/Printing_Tables
*/

thead {
display: table-header-group;
}

tr,
img {
page-break-inside: avoid;
}

img {
max-width: 100% !important;
}

p,
h2,
h3 {
orphans: 3;
widows: 3;
}

h2,
h3 {
page-break-after: avoid;
}
}
Loading