From e7e822b440f360779276f6177b1a2ba9a9049cff Mon Sep 17 00:00:00 2001 From: Karavirr Kumar Date: Tue, 3 Oct 2017 18:30:43 +0530 Subject: [PATCH 1/2] Issue 4 changes --- index.html | 6 +++--- main.css | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 980418e..9908d40 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + Charles Babbage @@ -14,7 +14,7 @@ <body style=" padding:10%;"> <h1>CHARLES BABBAGE</h1> <h1 id="diff">The Father Of Computers</h1> - <img src="Alamy-charles-babbage-xlarge.jpg" width="100%"> + <img src="Alamy-charles-babbage-xlarge.jpg" width="1000" alt="Charles image"> <div id="Name"> <blockquote> "A tool is usually more simple than a machine;<br> it is generally used with the hand,<br> whilst a machine is frequently moved by animal or steam power." @@ -34,7 +34,7 @@ <h1 id="diff">The Father Of Computers</h1> <div style="clear:both"></div> </div> <br> - <div align="center" id="timeline" style="font-size:140%;"> + <div style="text-align:center" id="timeline"> 1791<br> <i>December 26</i> Birth in London<br> diff --git a/main.css b/main.css index cfc8747..997d834 100644 --- a/main.css +++ b/main.css @@ -30,8 +30,9 @@ h1,#diff,#Name,#timeline { font-size:200%; max-width:1500px; } - #timeline{ + #timeline{ font-family: 'EB Garamond', serif; + font-size: 200%; } h2{ color:#707070; From 7a989d9eef275731bc2008234c679313613c2a42 Mon Sep 17 00:00:00 2001 From: Karavirr Kumar <kansal3797@gmail.com> Date: Tue, 3 Oct 2017 19:01:51 +0530 Subject: [PATCH 2/2] isue 3 --- index.html | 30 ++++++++++++++++++------------ main.css | 4 ++-- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/index.html b/index.html index 9908d40..585d0e7 100644 --- a/index.html +++ b/index.html @@ -12,21 +12,25 @@ <link rel="stylesheet" href="main.css"> </head> <body style=" padding:10%;"> - <h1>CHARLES BABBAGE</h1> - <h1 id="diff">The Father Of Computers</h1> - <img src="Alamy-charles-babbage-xlarge.jpg" width="1000" alt="Charles image"> - <div id="Name"> - <blockquote> - "A tool is usually more simple than a machine;<br> it is generally used with the hand,<br> whilst a machine is frequently moved by animal or steam power." - </blockquote> - </div> + <article> + <header> + <h1>CHARLES BABBAGE</h1> + <h1 id="diff">The Father Of Computers</h1> + <img src="Alamy-charles-babbage-xlarge.jpg" width="1000" alt="Charles image"> + <div id="Name"> + <blockquote> + "A tool is usually more simple than a machine;<br> it is generally used with the hand,<br> whilst a machine is frequently moved by animal or steam power." + </blockquote> + </div> + </header> +</article> <div> - <div style="float:left;width:45%; text-align:left; font-size:140%;"> + <div style="float:left;width:45%; text-align:left; font-size:100%;"> Charles Babbage(26 December 1791 – 18 October 1871) was an English polymath. A mathematician, philosopher, inventor and mechanical engineer, Babbage originated the concept of a digital programmable computer. Considered by some to be a "father of the computer", Babbage is credited with inventing the first mechanical computer that eventually led to more complex electronic designs, though all the essential ideas of modern computers are to be found in Babbage's analytical engine. His varied work in other fields has led him to be described as "pre-eminent" among the many polymaths of his century. </div> - <div style="float:right; width:45%; text-align:left; font-size:140%;"> + <div style="float:right; width:45%; text-align:left; font-size:100%;"> Babbage's birthplace is disputed, but according to the Oxford Dictionary of National Biography he was most likely born at 44 Crosby Row, Walworth Road, London, England. A blue plaque on the junction of Larcom Street and Walworth Road commemorates the event. His date of birth was given in his obituary in The Times as 26 December 1792; but then a nephew wrote to say that Babbage was born one year earlier, in 1791. The parish register of St. Mary's Newington, London, shows that Babbage was baptised on 6 January 1792, supporting a birth year of 1791.Read on to explore more about his life and works here <a href="https://www.thefamouspeople.com/profiles/charles-babbage-3709.php">here</a> @@ -91,12 +95,13 @@ <h1 id="diff">The Father Of Computers</h1> 1985<br> Science Museum of London launched a project to build a complete Babbage Engine<br> </div> + <footer> <div> <div style="float:left; width:40%; " > <h2 style="text-align:center; font-size:500%;"> Plan 28 </h2> - <p style="text-align:left; font-size:140%;"> + <p style="text-align:left; font-size:100%;"> In 2011, researchers in Britain proposed a multimillion-pound project, "Plan 28", to construct Babbage's Analytical Engine. Since Babbage's plans were continually being refined and were never completed, they intended to engage the public in the project and crowd-source the analysis of what should be built. It would have the equivalent of 675 bytes of memory, and run at a clock speed of about 7 Hz. They hope to complete it by the 150th anniversary of Babbage's death, in 2021 </p> </div> @@ -104,12 +109,13 @@ <h2 style="text-align:center; font-size:500%;"> <h2 style="text-align:center; font-size:500%;"> Babbage`s Family </h2> - <p style="text-align:left; font-size:140%;"> + <p style="text-align:left; font-size:100%;"> On 25 July 1814, Babbage married Georgiana Whitmore at St. Michael's Church in Teignmouth, Devon; her sister Louisa married Edward Ryan.s The couple lived at Dudmaston Hall, Shropshire (where Babbage engineered the central heating system), before moving to 5 Devonshire Street, London in 1815 Charles and Georgiana had eight children, but only four – Benjamin Herschel, Georgiana Whitmore, Dugald Bromhead and Henry Prevost – survived childhood. Charles' wife Georgiana died in Worcester on 1 September 1827, the same year as his father, their second son (also named Charles) and their newborn son Alexander. </p> </div> <div style="clear:both"></div> </div> + </footer> </body> </html> \ No newline at end of file diff --git a/main.css b/main.css index 997d834..d329fd9 100644 --- a/main.css +++ b/main.css @@ -27,12 +27,12 @@ h1,#diff,#Name,#timeline { #Name{ color:#2e2e1f; font-style:'EB Garamond', serif; - font-size:200%; + font-size:150%; max-width:1500px; } #timeline{ font-family: 'EB Garamond', serif; - font-size: 200%; + font-size: 150%; } h2{ color:#707070;