Skip to content

Commit 1e61916

Browse files
pjb3pjb3
committed
Completed slides for HTML lesson in Unit 2. Re-organized order of units.
1 parent f29b281 commit 1e61916

File tree

189 files changed

+425
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+425
-14
lines changed

‎03_html_and_rails/README.md ‎02_html_and_rails/README.md

‎03_html_and_rails/betastore/.gitignore ‎02_html_and_rails/betastore/.gitignore

File renamed without changes.

‎03_html_and_rails/betastore/Gemfile ‎02_html_and_rails/betastore/Gemfile

File renamed without changes.

‎03_html_and_rails/betastore/Gemfile.lock ‎02_html_and_rails/betastore/Gemfile.lock

File renamed without changes.

‎03_html_and_rails/betastore/README.rdoc ‎02_html_and_rails/betastore/README.rdoc

‎03_html_and_rails/betastore/Rakefile ‎02_html_and_rails/betastore/Rakefile

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/images/.keep ‎02_html_and_rails/betastore/app/assets/images/.keep

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/images/logo.png ‎02_html_and_rails/betastore/app/assets/images/logo.png

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/images/products/hat.jpg ‎02_html_and_rails/betastore/app/assets/images/products/hat.jpg

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/images/products/hoodie.jpg ‎02_html_and_rails/betastore/app/assets/images/products/hoodie.jpg

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/images/products/iphone_case.jpg ‎02_html_and_rails/betastore/app/assets/images/products/iphone_case.jpg

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/images/products/journal.jpg ‎02_html_and_rails/betastore/app/assets/images/products/journal.jpg

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/images/products/shirt.jpg ‎02_html_and_rails/betastore/app/assets/images/products/shirt.jpg

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/images/products/sticker.jpg ‎02_html_and_rails/betastore/app/assets/images/products/sticker.jpg

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/javascripts/application.js ‎02_html_and_rails/betastore/app/assets/javascripts/application.js

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/javascripts/products.js.coffee ‎02_html_and_rails/betastore/app/assets/javascripts/products.js.coffee

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/javascripts/subscriptions.js.coffee ‎02_html_and_rails/betastore/app/assets/javascripts/subscriptions.js.coffee

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/stylesheets/application.css ‎02_html_and_rails/betastore/app/assets/stylesheets/application.css

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/stylesheets/products.css.scss ‎02_html_and_rails/betastore/app/assets/stylesheets/products.css.scss

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/stylesheets/scaffolds.css.scss ‎02_html_and_rails/betastore/app/assets/stylesheets/scaffolds.css.scss

File renamed without changes.

‎03_html_and_rails/betastore/app/assets/stylesheets/subscriptions.css.scss ‎02_html_and_rails/betastore/app/assets/stylesheets/subscriptions.css.scss

File renamed without changes.

‎03_html_and_rails/betastore/app/controllers/application_controller.rb ‎02_html_and_rails/betastore/app/controllers/application_controller.rb

File renamed without changes.

‎03_html_and_rails/betastore/app/controllers/concerns/.keep ‎02_html_and_rails/betastore/app/controllers/concerns/.keep

File renamed without changes.

‎03_html_and_rails/betastore/app/controllers/products_controller.rb ‎02_html_and_rails/betastore/app/controllers/products_controller.rb

File renamed without changes.

‎03_html_and_rails/betastore/app/controllers/subscriptions_controller.rb ‎02_html_and_rails/betastore/app/controllers/subscriptions_controller.rb

File renamed without changes.

‎03_html_and_rails/betastore/app/helpers/application_helper.rb ‎02_html_and_rails/betastore/app/helpers/application_helper.rb

File renamed without changes.

‎03_html_and_rails/betastore/app/helpers/products_helper.rb ‎02_html_and_rails/betastore/app/helpers/products_helper.rb

File renamed without changes.

‎03_html_and_rails/betastore/app/helpers/subscriptions_helper.rb ‎02_html_and_rails/betastore/app/helpers/subscriptions_helper.rb

File renamed without changes.

‎03_html_and_rails/betastore/app/mailers/.keep ‎02_html_and_rails/betastore/app/mailers/.keep

File renamed without changes.

‎03_html_and_rails/betastore/app/models/.keep ‎02_html_and_rails/betastore/app/models/.keep

File renamed without changes.

‎03_html_and_rails/betastore/app/models/concerns/.keep ‎02_html_and_rails/betastore/app/models/concerns/.keep

File renamed without changes.

‎03_html_and_rails/betastore/app/models/subscription.rb ‎02_html_and_rails/betastore/app/models/subscription.rb

File renamed without changes.

‎03_html_and_rails/betastore/app/views/layouts/application.html.erb ‎02_html_and_rails/betastore/app/views/layouts/application.html.erb

File renamed without changes.

‎03_html_and_rails/betastore/app/views/products/index.html.erb ‎02_html_and_rails/betastore/app/views/products/index.html.erb

File renamed without changes.

‎03_html_and_rails/betastore/app/views/products/show.html.erb ‎02_html_and_rails/betastore/app/views/products/show.html.erb

File renamed without changes.

‎03_html_and_rails/betastore/app/views/subscriptions/_form.html.erb ‎02_html_and_rails/betastore/app/views/subscriptions/_form.html.erb

File renamed without changes.

‎03_html_and_rails/betastore/app/views/subscriptions/edit.html.erb ‎02_html_and_rails/betastore/app/views/subscriptions/edit.html.erb

File renamed without changes.

‎03_html_and_rails/betastore/app/views/subscriptions/index.html.erb ‎02_html_and_rails/betastore/app/views/subscriptions/index.html.erb

File renamed without changes.

‎03_html_and_rails/betastore/app/views/subscriptions/index.json.jbuilder ‎02_html_and_rails/betastore/app/views/subscriptions/index.json.jbuilder

File renamed without changes.

‎03_html_and_rails/betastore/app/views/subscriptions/new.html.erb ‎02_html_and_rails/betastore/app/views/subscriptions/new.html.erb

File renamed without changes.

‎03_html_and_rails/betastore/app/views/subscriptions/show.html.erb ‎02_html_and_rails/betastore/app/views/subscriptions/show.html.erb

File renamed without changes.

‎03_html_and_rails/betastore/app/views/subscriptions/show.json.jbuilder ‎02_html_and_rails/betastore/app/views/subscriptions/show.json.jbuilder

File renamed without changes.

‎03_html_and_rails/betastore/bin/bundle ‎02_html_and_rails/betastore/bin/bundle

File renamed without changes.

‎03_html_and_rails/betastore/bin/rails ‎02_html_and_rails/betastore/bin/rails

File renamed without changes.

‎03_html_and_rails/betastore/bin/rake ‎02_html_and_rails/betastore/bin/rake

File renamed without changes.

‎03_html_and_rails/betastore/config.ru ‎02_html_and_rails/betastore/config.ru

File renamed without changes.

‎03_html_and_rails/betastore/config/application.rb ‎02_html_and_rails/betastore/config/application.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/boot.rb ‎02_html_and_rails/betastore/config/boot.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/database.yml ‎02_html_and_rails/betastore/config/database.yml

File renamed without changes.

‎03_html_and_rails/betastore/config/environment.rb ‎02_html_and_rails/betastore/config/environment.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/environments/development.rb ‎02_html_and_rails/betastore/config/environments/development.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/environments/production.rb ‎02_html_and_rails/betastore/config/environments/production.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/environments/test.rb ‎02_html_and_rails/betastore/config/environments/test.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/initializers/backtrace_silencers.rb ‎02_html_and_rails/betastore/config/initializers/backtrace_silencers.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/initializers/filter_parameter_logging.rb ‎02_html_and_rails/betastore/config/initializers/filter_parameter_logging.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/initializers/inflections.rb ‎02_html_and_rails/betastore/config/initializers/inflections.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/initializers/mime_types.rb ‎02_html_and_rails/betastore/config/initializers/mime_types.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/initializers/secret_token.rb ‎02_html_and_rails/betastore/config/initializers/secret_token.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/initializers/session_store.rb ‎02_html_and_rails/betastore/config/initializers/session_store.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/initializers/wrap_parameters.rb ‎02_html_and_rails/betastore/config/initializers/wrap_parameters.rb

File renamed without changes.

‎03_html_and_rails/betastore/config/locales/en.yml ‎02_html_and_rails/betastore/config/locales/en.yml

File renamed without changes.

‎03_html_and_rails/betastore/config/routes.rb ‎02_html_and_rails/betastore/config/routes.rb

File renamed without changes.

‎03_html_and_rails/betastore/db/migrate/20130824175042_create_subscriptions.rb ‎02_html_and_rails/betastore/db/migrate/20130824175042_create_subscriptions.rb

File renamed without changes.

‎03_html_and_rails/betastore/db/schema.rb ‎02_html_and_rails/betastore/db/schema.rb

File renamed without changes.

‎03_html_and_rails/betastore/db/seeds.rb ‎02_html_and_rails/betastore/db/seeds.rb

File renamed without changes.

‎03_html_and_rails/betastore/lib/assets/.keep ‎02_html_and_rails/betastore/lib/assets/.keep

File renamed without changes.

‎03_html_and_rails/betastore/lib/tasks/.keep ‎02_html_and_rails/betastore/lib/tasks/.keep

File renamed without changes.

‎03_html_and_rails/betastore/log/.keep ‎02_html_and_rails/betastore/log/.keep

File renamed without changes.

‎03_html_and_rails/betastore/public/404.html ‎02_html_and_rails/betastore/public/404.html

File renamed without changes.

‎03_html_and_rails/betastore/public/422.html ‎02_html_and_rails/betastore/public/422.html

File renamed without changes.

‎03_html_and_rails/betastore/public/500.html ‎02_html_and_rails/betastore/public/500.html

File renamed without changes.

‎03_html_and_rails/betastore/public/favicon.ico ‎02_html_and_rails/betastore/public/favicon.ico

File renamed without changes.

‎03_html_and_rails/betastore/public/robots.txt ‎02_html_and_rails/betastore/public/robots.txt

File renamed without changes.

‎03_html_and_rails/betastore/test/controllers/.keep ‎02_html_and_rails/betastore/test/controllers/.keep

File renamed without changes.

‎03_html_and_rails/betastore/test/controllers/products_controller_test.rb ‎02_html_and_rails/betastore/test/controllers/products_controller_test.rb

File renamed without changes.

‎03_html_and_rails/betastore/test/controllers/subscriptions_controller_test.rb ‎02_html_and_rails/betastore/test/controllers/subscriptions_controller_test.rb

File renamed without changes.

‎03_html_and_rails/betastore/test/fixtures/.keep ‎02_html_and_rails/betastore/test/fixtures/.keep

File renamed without changes.

‎03_html_and_rails/betastore/test/fixtures/subscriptions.yml ‎02_html_and_rails/betastore/test/fixtures/subscriptions.yml

File renamed without changes.

‎03_html_and_rails/betastore/test/helpers/.keep ‎02_html_and_rails/betastore/test/helpers/.keep

File renamed without changes.

‎03_html_and_rails/betastore/test/helpers/products_helper_test.rb ‎02_html_and_rails/betastore/test/helpers/products_helper_test.rb

File renamed without changes.

‎03_html_and_rails/betastore/test/helpers/subscriptions_helper_test.rb ‎02_html_and_rails/betastore/test/helpers/subscriptions_helper_test.rb

File renamed without changes.

‎03_html_and_rails/betastore/test/integration/.keep ‎02_html_and_rails/betastore/test/integration/.keep

File renamed without changes.

‎03_html_and_rails/betastore/test/mailers/.keep ‎02_html_and_rails/betastore/test/mailers/.keep

File renamed without changes.

‎03_html_and_rails/betastore/test/models/.keep ‎02_html_and_rails/betastore/test/models/.keep

File renamed without changes.

‎03_html_and_rails/betastore/test/models/subscription_test.rb ‎02_html_and_rails/betastore/test/models/subscription_test.rb

File renamed without changes.

‎03_html_and_rails/betastore/test/test_helper.rb ‎02_html_and_rails/betastore/test/test_helper.rb

File renamed without changes.

‎03_html_and_rails/betastore/vendor/assets/javascripts/.keep ‎02_html_and_rails/betastore/vendor/assets/javascripts/.keep

File renamed without changes.

‎03_html_and_rails/betastore/vendor/assets/stylesheets/.keep ‎02_html_and_rails/betastore/vendor/assets/stylesheets/.keep

File renamed without changes.

‎02_html_and_rails/css/droid_serif.css

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@font-face {
2+
font-family: 'Droid Serif';
3+
font-style: normal;
4+
font-weight: 400;
5+
src: local('Droid Serif'), local('DroidSerif'), url(http://themes.googleusercontent.com/static/fonts/droidserif/v3/0AKsP294HTD-nvJgucYTaJ0EAVxt0G0biEntp43Qt6E.ttf) format('truetype');
6+
}

‎02_html_and_rails/css/yanone_kaffeesatz.css

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@font-face {
2+
font-family: 'Yanone Kaffeesatz';
3+
font-style: normal;
4+
font-weight: 400;
5+
src: local('Yanone Kaffeesatz Regular'), local('YanoneKaffeesatz-Regular'), url(http://themes.googleusercontent.com/static/fonts/yanonekaffeesatz/v4/YDAoLskQQ5MOAgvHUQCcLbvy90DtE_Pg_qiF9bHvTzw.ttf) format('truetype');
6+
}

‎03_html_and_rails/part_1/forms.html ‎02_html_and_rails/forms.html

File renamed without changes.

‎02_html_and_rails/hello.html

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<html>
2+
<head>
3+
<title>Example</title>
4+
<style>
5+
.link {
6+
color: green;
7+
}
8+
</style>
9+
</head>
10+
<body>
11+
<h1>Hello, World!</h1>
12+
<img src="http://betamore.com/wp-content/uploads/2013/04/logo.png" />
13+
<ul>
14+
<li><a class="link" href="tables.html">Tables</a></li>
15+
<li><a class="link" href="forms.html">Forms</a></li>
16+
<li><a class="link" href="http://betamore.com">Betamore</a></li>
17+
</ul>
18+
</body>
19+
</html>

0 commit comments

Comments
 (0)