diff --git a/computer-science-blog/css/presentation-imports.css~ b/computer-science-blog/css/presentation-imports.css~ deleted file mode 100644 index 2897da2..0000000 --- a/computer-science-blog/css/presentation-imports.css~ +++ /dev/null @@ -1,18 +0,0 @@ -html, body { - font-family: 'Roboto'; - background: transparent; -} - -/* revert changes made by Bootstrap */ -p { - margin: 0; -} -h1, h2, h3, .h1, .h2, .h3 { - margin-top: 0; -} -img { - width: 70%; - box-shadow: 3px 3px 6px 2px rgba(10,10,10,0.5); - margin: 10px; - border-radius: 6px; -} diff --git a/computer-science-blog/pages/html.html b/computer-science-blog/pages/html.html index 70bbc4e..e6f3118 100644 --- a/computer-science-blog/pages/html.html +++ b/computer-science-blog/pages/html.html @@ -28,8 +28,9 @@
<img src="image_source_url">
- HTML is closely linked with CSS and JavaScript; a comment in HTML is started with - <!-- and ended with -->. + A comment in HTML is started with <!-- and ended with -->. +
+ HTML is closely linked with CSS and JavaScript.

diff --git a/computer-science-blog/pages/html.html~ b/computer-science-blog/pages/html.html~ new file mode 100644 index 0000000..70bbc4e --- /dev/null +++ b/computer-science-blog/pages/html.html~ @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + +

HTML

+

+ Hypertext Markup Language is the standard language used by browsers to display webpages. + HTML was invented by Tim Berners-Lee in 1990, and uses tags. This means that in order to define + an element (something like a heading or paragraph), you use a tag - such as <p>, + which displays a simple paragraph. Most tags must be closed with closing tags - like </p>, + however some elements, like those for images (<img>) and linking external resources + (<link>) are auto closing: they don’t need a closing tag. For example, an image is defined as follows: +
+ <img src="image_source_url"> +
+ HTML is closely linked with CSS and JavaScript; a comment in HTML is started with + <!-- and ended with -->. +

+ + diff --git a/computer-science-blog/scripts/css-presentation-slide.js b/computer-science-blog/scripts/css-presentation-slide.js index 8b65b58..795c9cd 100644 --- a/computer-science-blog/scripts/css-presentation-slide.js +++ b/computer-science-blog/scripts/css-presentation-slide.js @@ -1,4 +1,4 @@ window.onload = function() { var year = new Date().getFullYear(); - document.getElementById("css_attribute_list_link").innerHTML = 'All of the CSS style attributes are listed here.'; + document.getElementById("css_attribute_list_link").innerHTML = 'All of the CSS style attributes are listed here.'; }