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

Proofread finished for the core directory #1

Merged
merged 13 commits into from
Oct 8, 2013
Merged

Proofread finished for the core directory #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c050830
proofread and decided to all caps HTML and CSS
thatbettina Sep 9, 2013
11ed699
changed all css to caps and proofread style.md
thatbettina Sep 9, 2013
9db59ec
proofread structure
thatbettina Sep 9, 2013
7035f4a
proofread readme
thatbettina Sep 9, 2013
972cfbf
proofread up to line 61
thatbettina Sep 9, 2013
94420c7
proofread up to line 207
thatbettina Sep 12, 2013
bd4a315
can you explain why to use em and when
thatbettina Sep 12, 2013
242ff71
proofreading finished for portfolio
thatbettina Sep 12, 2013
2dcab9d
proofreading done for portfolio 2
thatbettina Sep 12, 2013
e66967c
removed nonsense
thatbettina Oct 7, 2013
5913a5c
explained 100%
thatbettina Oct 7, 2013
5672b28
added height code
thatbettina Oct 7, 2013
230ce8c
integrated lehmannro's edits
thatbettina Oct 7, 2013
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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ layout: ots
title: README
---

This is a friendly how-to for contributors to the Html and Css workshop
This is a friendly how-to for contributors to the HTML and CSS workshop
at OpenTechSchool.
About the course:

An Html and css basic workshop for beginners that never write Html/css before and
An HTML and CSS basic workshop for beginners that never write HTML/CSS before and
wnat to know how to start.

# Class format
Expand Down Expand Up @@ -88,7 +88,7 @@ And made of win.

[links for nerds](http://slashdot.org)

[links for internal stuff](section8.html)
[links for internal stuff](section8.HTML)
Copy link

Choose a reason for hiding this comment

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

I'm pretty sure .HTML is much less common than .html, at least in file extensions. Could we revert this (in all of the files?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tried to rebase this but had to abort. Since I'm a git beginner, would someone please help me with this?


This is a horizonal rule:

Expand All @@ -106,5 +106,5 @@ Bit of command line:
get dolla
$

For a more complete list of languages see [highlight.js](http://softwaremaniacs.org/media/soft/highlight/test.html)
For a more complete list of languages see [highlight.js](http://softwaremaniacs.org/media/soft/highlight/test.HTML)

34 changes: 17 additions & 17 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
permalinks: title
baseurl: /html-css-beginners/
baseurl: /HTML-CSS-beginners/
map:
- title: Home
path:
caption: Get started with Html & css
caption: Get started with HTML & CSS
- title: Core
caption: The 'mandatory' workshop content
subpages:
- title: The template structure
path: core/structure.html
path: core/structure.HTML
caption: From white page to a 'Hello World'
- title: Your first styled Hello World!
path: core/style.html
caption: Understanding css. What is class, Id and selector
path: core/style.HTML
caption: Understanding CSS. What is class, Id and selector
- title: Create your personal Portfolio - Part 1
path: /core/portfolio.html
caption: Html5 elements, float, box model and text style
path: /core/portfolio.HTML
caption: HTML5 elements, float, box model and text style
- title: Create your personal Portfolio - Part 2
path: /core/portfolio-2.html
path: /core/portfolio-2.HTML
caption: Positioning, anchor and form elements
- title: Extras
caption: Additional workshop content
subpages:
- title: Html5, what is new?
path: extras/html5.html
- title: Css3 transition and animation
path: extras/css3.html
- title: HTML5, what is new?
path: extras/HTML5.HTML
- title: CSS3 transition and animation
path: extras/CSS3.HTML
- title: Cross Browsers and usual IE problems
path: /extras/cross-browsers.html
path: /extras/cross-browsers.HTML
- title: Responsive Design and mobile approach
path: /extras/responsive.html
path: /extras/responsive.HTML
- title: Sass and Less
path: /extras/sass-less.html
path: /extras/sass-less.HTML
- title: Framework Twitter Boostrap
path: /extras/framework.html
path: /extras/framework.HTML
- title: How to start with Javascript
path: extras/javascript.html
path: extras/javascript.HTML
14 changes: 7 additions & 7 deletions _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!doctype html>
<html>
<!doctype HTML>
<HTML>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<title>Learn Html and Css with OpenTechSchool</title>
<link rel="stylesheet" href="{{site.baseurl}}/stylesheets/styles.css">
<link rel="stylesheet" href="{{site.baseurl}}/stylesheets/pygment_trac.css">
<title>Learn HTML and CSS with OpenTechSchool</title>
<link rel="stylesheet" href="{{site.baseurl}}/stylesheets/styles.CSS">
<link rel="stylesheet" href="{{site.baseurl}}/stylesheets/pygment_trac.CSS">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script src="javascripts/main.js"></script>
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<script src="//HTML5shiv.googlecode.com/svn/trunk/HTML5.js"></script>
<![endif]-->
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">

Expand All @@ -35,4 +35,4 @@ <h1>{{ page.title }}</h1>
<!--[if !IE]><script>fixScale(document);</script><![endif]-->

</body>
</html>
</HTML>
12 changes: 6 additions & 6 deletions _layouts/ots.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<!doctype html>
<!doctype HTML>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

<title>OpenTechSchool – {{ page.title }}</title>
<link href="http://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
<link href="{{site.baseurl}}/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="http://fonts.googleapis.com/CSS?family=Montserrat:400,700" rel="stylesheet" type="text/CSS">
<link href="{{site.baseurl}}/bootstrap/CSS/bootstrap.min.CSS" rel="stylesheet" media="screen">

<link rel="icon" href="/favicon.ico" type="image/png">
<style type="text/css">
<style type="text/CSS">
body {
background: url("{{site.baseurl}}/images/ps_neutral.png") #FFF repeat fixed;
}
Expand Down Expand Up @@ -111,7 +111,7 @@ <h1 class="title">{{ page.title }}</h1>
<div id="main-content" class="span9">
{{ content }}
</div>
<div id="footer" class="span9">© 2011-2014 - made by <a href="http://www.opentechschool.org">OpenTechSchool</a> and its <a href="https://github.com/OpenTechSchool/html-css-beginners/graphs/contributors">Contributors</a>&nbsp;&nbsp;||&nbsp;&nbsp;<a href="http://www.opentechschool.org/imprint.html">Impressum</a>
<div id="footer" class="span9">© 2011-2014 - made by <a href="http://www.opentechschool.org">OpenTechSchool</a> and its <a href="https://github.com/OpenTechSchool/HTML-CSS-beginners/graphs/contributors">Contributors</a>&nbsp;&nbsp;||&nbsp;&nbsp;<a href="http://www.opentechschool.org/imprint.HTML">Impressum</a>
</div>

</div>
Expand All @@ -121,4 +121,4 @@ <h1 class="title">{{ page.title }}</h1>
<script src="{{site.baseurl}}/scripts/spoilers.js"></script>
<script>hljs.initHighlightingOnLoad();</script>
</body>
</html>
</HTML>
4 changes: 2 additions & 2 deletions bootstrap/css/bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ audio:not([controls]) {
display: none;
}

html {
HTML {
font-size: 100%;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
Expand Down Expand Up @@ -134,7 +134,7 @@ input::-moz-focus-inner {
}

button,
html input[type="button"],
HTML input[type="button"],
input[type="reset"],
input[type="submit"] {
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions bootstrap/js/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ===================================================
* bootstrap-transition.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#transitions
* http://twitter.github.com/bootstrap/javascript.HTML#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -59,7 +59,7 @@

}(window.jQuery);/* ==========================================================
* bootstrap-alert.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#alerts
* http://twitter.github.com/bootstrap/javascript.HTML#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -157,7 +157,7 @@

}(window.jQuery);/* ============================================================
* bootstrap-button.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#buttons
* http://twitter.github.com/bootstrap/javascript.HTML#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -192,7 +192,7 @@
var d = 'disabled'
, $el = this.$element
, data = $el.data()
, val = $el.is('input') ? 'val' : 'html'
, val = $el.is('input') ? 'val' : 'HTML'

state = state + 'Text'
data.resetText || $el.data('resetText', $el[val]())
Expand Down Expand Up @@ -261,7 +261,7 @@

}(window.jQuery);/* ==========================================================
* bootstrap-carousel.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#carousel
* http://twitter.github.com/bootstrap/javascript.HTML#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -467,7 +467,7 @@

}(window.jQuery);/* =============================================================
* bootstrap-collapse.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#collapse
* http://twitter.github.com/bootstrap/javascript.HTML#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -633,7 +633,7 @@

}(window.jQuery);/* ============================================================
* bootstrap-dropdown.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* http://twitter.github.com/bootstrap/javascript.HTML#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -662,7 +662,7 @@
var toggle = '[data-toggle=dropdown]'
, Dropdown = function (element) {
var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () {
$('HTML').on('click.dropdown.data-api', function () {
$el.parent().removeClass('open')
})
}
Expand Down Expand Up @@ -802,7 +802,7 @@
}(window.jQuery);
/* =========================================================
* bootstrap-modal.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#modals
* http://twitter.github.com/bootstrap/javascript.HTML#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -1049,7 +1049,7 @@
}(window.jQuery);
/* ===========================================================
* bootstrap-tooltip.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* http://twitter.github.com/bootstrap/javascript.HTML#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
* Copyright 2012 Twitter, Inc.
Expand Down Expand Up @@ -1185,7 +1185,7 @@

$tip
.detach()
.css({ top: 0, left: 0, display: 'block' })
.CSS({ top: 0, left: 0, display: 'block' })

this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)

Expand Down Expand Up @@ -1258,14 +1258,14 @@
, replaceArrow: function(delta, dimension, position){
this
.arrow()
.css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
.CSS(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
}

, setContent: function () {
var $tip = this.tip()
, title = this.getTitle()

$tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
$tip.find('.tooltip-inner')[this.options.HTML ? 'HTML' : 'text'](title)
$tip.removeClass('fade in top bottom left right')
}

Expand Down Expand Up @@ -1394,7 +1394,7 @@
, trigger: 'hover focus'
, title: ''
, delay: 0
, html: false
, HTML: false
, container: false
}

Expand All @@ -1410,7 +1410,7 @@
}(window.jQuery);
/* ===========================================================
* bootstrap-popover.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#popovers
* http://twitter.github.com/bootstrap/javascript.HTML#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -1453,8 +1453,8 @@
, title = this.getTitle()
, content = this.getContent()

$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
$tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
$tip.find('.popover-title')[this.options.HTML ? 'HTML' : 'text'](title)
$tip.find('.popover-content')[this.options.HTML ? 'HTML' : 'text'](content)

$tip.removeClass('fade top bottom left right in')
}
Expand Down Expand Up @@ -1524,7 +1524,7 @@
}(window.jQuery);
/* =============================================================
* bootstrap-scrollspy.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* http://twitter.github.com/bootstrap/javascript.HTML#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -1685,7 +1685,7 @@

}(window.jQuery);/* ========================================================
* bootstrap-tab.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#tabs
* http://twitter.github.com/bootstrap/javascript.HTML#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -1828,7 +1828,7 @@

}(window.jQuery);/* =============================================================
* bootstrap-typeahead.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* http://twitter.github.com/bootstrap/javascript.HTML#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down Expand Up @@ -1890,7 +1890,7 @@

this.$menu
.insertAfter(this.$element)
.css({
.CSS({
top: pos.top + pos.height
, left: pos.left
})
Expand Down Expand Up @@ -1967,12 +1967,12 @@

items = $(items).map(function (i, item) {
i = $(that.options.item).attr('data-value', item)
i.find('a').html(that.highlighter(item))
i.find('a').HTML(that.highlighter(item))
return i[0]
})

items.first().addClass('active')
this.$menu.html(items)
this.$menu.HTML(items)
return this
}

Expand Down Expand Up @@ -2163,7 +2163,7 @@
}(window.jQuery);
/* ==========================================================
* bootstrap-affix.js v2.3.2
* http://twitter.github.com/bootstrap/javascript.html#affix
* http://twitter.github.com/bootstrap/javascript.HTML#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
*
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/js/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ title: Core Content
---

This directory is for core course content.
From basic html structure, through css selector and property until create a personal portfolio
From basic HTML structure through different CSS selectors and properties so that learners create a personal portfolio.
Loading