From d1ebeac988634799197311678eb28498465833be Mon Sep 17 00:00:00 2001 From: Kaleb Davis Date: Thu, 4 Jun 2015 13:59:28 -0400 Subject: [PATCH 1/5] Beginning to mimic the html page --- top-nav-drill/index.html | 2 +- top-nav-drill/main.css | 43 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/top-nav-drill/index.html b/top-nav-drill/index.html index fbc0cdb..1e9316c 100644 --- a/top-nav-drill/index.html +++ b/top-nav-drill/index.html @@ -29,7 +29,7 @@

A Page Title

A Paragraph

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum blandit, tellus ornare mollis rhoncus, risus dui tincidunt nisl, nec vulputate sapien neque at tellus. Aenean in ornare nisl, sed porta dui.

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum blandit, tellus ornare mollis rhoncus, risus dui tincidunt nisl, nec vulputate sapien neque at tellus. Aenean in ornare nisl, sed porta dui.

Nunc sit amet arcu id ligula commodo consequat vel a lorem. Proin auctor, purus in dictum efficitur, mauris purus dictum augue, vitae laoreet ante nunc in sapien. Maecenas consectetur egestas euismod.

diff --git a/top-nav-drill/main.css b/top-nav-drill/main.css index 9d37c16..785a9f2 100644 --- a/top-nav-drill/main.css +++ b/top-nav-drill/main.css @@ -2,4 +2,45 @@ margin: 0 auto; } -/*Put your code here*/ +/* Header row */ + +header { + background: black; + display: inline-flex; + width: 100%; +} + +header a{ + color: white; + display: inline; +} + +header span a{ + font-size: 35px; + font-weight: bold; + text-decoration: none; +} + +header nav li{ + display: inline; + text-align: right; +} + +/* Text body */ + +section { + padding-left: 100px; + padding-right: 100px; +} + +section h1 { + padding-left: 100px; + padding-right: 100px; + border-bottom: thin solid; +} + +footer { + padding-left: 100px; + padding-right: 100px; + border-top: solid; +} From 3d022e20b62be4de1a43adf90d6560ddae22483e Mon Sep 17 00:00:00 2001 From: Kaleb Davis Date: Thu, 4 Jun 2015 14:27:36 -0400 Subject: [PATCH 2/5] Css mimics page, add closing section tag to index --- top-nav-drill/index.html | 1 + top-nav-drill/main.css | 47 ++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/top-nav-drill/index.html b/top-nav-drill/index.html index 1e9316c..95469b0 100644 --- a/top-nav-drill/index.html +++ b/top-nav-drill/index.html @@ -27,6 +27,7 @@

A Page Title

+

A Paragraph

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum blandit, tellus ornare mollis rhoncus, risus dui tincidunt nisl, nec vulputate sapien neque at tellus. Aenean in ornare nisl, sed porta dui.

diff --git a/top-nav-drill/main.css b/top-nav-drill/main.css index 785a9f2..d966720 100644 --- a/top-nav-drill/main.css +++ b/top-nav-drill/main.css @@ -3,44 +3,39 @@ } /* Header row */ - -header { - background: black; - display: inline-flex; - width: 100%; -} - -header a{ +header, header a { + background-color: black; color: white; - display: inline; + /* display: block; */ + width: 100%; + padding: 8px 10px 10px; } - -header span a{ +header span a { + text-decoration: none; font-size: 35px; font-weight: bold; - text-decoration: none; + padding-right: 23px; } - -header nav li{ +header nav { + float: right; + padding-right: 10px; +} +header nav ul { + list-style-type: none; +} +header nav ul li { display: inline; - text-align: right; } - /* Text body */ - -section { - padding-left: 100px; - padding-right: 100px; +section, footer { + margin-left: 100px; + margin-right: 100px; } section h1 { - padding-left: 100px; - padding-right: 100px; - border-bottom: thin solid; + border-bottom: solid 2px grey; } footer { - padding-left: 100px; - padding-right: 100px; - border-top: solid; + border-top: solid 4px grey; } From d4809c909c613f6e1a0e9fdf47c104d2f53781e2 Mon Sep 17 00:00:00 2001 From: Kaleb Davis Date: Thu, 4 Jun 2015 14:56:47 -0400 Subject: [PATCH 3/5] change html to haml --- top-nav-drill/index.haml | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 top-nav-drill/index.haml diff --git a/top-nav-drill/index.haml b/top-nav-drill/index.haml new file mode 100644 index 0000000..a7c1822 --- /dev/null +++ b/top-nav-drill/index.haml @@ -0,0 +1,42 @@ +!!! + +%html{lang=>"en"} + +%head + %meta{:charset=>"UTF-8"} + %title The Awesome Company + %link{:rel=>"stylesheet" :href=>"bower_components/normalize-css/normalize.css"} + %link{:rel=>"stylesheet" :href=>"main.css"} + +%body + .container + %header + %span + %a{:href=>"#"} Awesome Company + %nav + %ul + %li + %a{:href=>"#"} Home + %li + %a{:href=>"#"} About + %li + %a{:href=>"#"} Services + %li + %a{:href=>"#"} Contact + + %section + %h1 A Page Title + %section + %h2 A Paragraph + %p Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum blandit, tellus ornare mollis rhoncus, risus dui tincidunt nisl, nec vulputate sapien neque at tellus. Aenean in ornare nisl, sed porta dui. + %p Nunc sit amet arcu id ligula commodo consequat vel a lorem. Proin auctor, purus in dictum efficitur, mauris purus dictum augue, vitae laoreet ante nunc in sapien. Maecenas consectetur egestas euismod. + %section + %h2 A Paragraph + %p onec faucibus sodales lectus, quis dictum ligula aliquet sit amet. Nam sodales nibh quis quam dictum sollicitudin. Nullam ut est euismod, hendrerit tellus et, euismod turpis. + %p Nunc sit amet arcu id ligula commodo consequat vel a lorem. Proin auctor, purus in dictum efficitur, mauris purus dictum augue, vitae laoreet ante nunc in sapien. Maecenas consectetur egestas euismod. + %section + %h2 A Paragraph + %p Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas non mauris ac erat consequat rhoncus. Mauris nec sapien luctus, rutrum leo sit amet, pretium elit. + + %footer + %p Copyright © 2013 Awesome Company LLC. From 9a6a2d2f585176152d59dfef3963f37205bf1298 Mon Sep 17 00:00:00 2001 From: Kaleb Davis Date: Thu, 4 Jun 2015 16:41:40 -0400 Subject: [PATCH 4/5] Compiled haml into html that matches original html --- top-nav-drill/index.haml | 42 --------------------------- top-nav-drill/index_haml.haml | 42 +++++++++++++++++++++++++++ top-nav-drill/index_haml.html | 54 +++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 42 deletions(-) delete mode 100644 top-nav-drill/index.haml create mode 100644 top-nav-drill/index_haml.haml create mode 100644 top-nav-drill/index_haml.html diff --git a/top-nav-drill/index.haml b/top-nav-drill/index.haml deleted file mode 100644 index a7c1822..0000000 --- a/top-nav-drill/index.haml +++ /dev/null @@ -1,42 +0,0 @@ -!!! - -%html{lang=>"en"} - -%head - %meta{:charset=>"UTF-8"} - %title The Awesome Company - %link{:rel=>"stylesheet" :href=>"bower_components/normalize-css/normalize.css"} - %link{:rel=>"stylesheet" :href=>"main.css"} - -%body - .container - %header - %span - %a{:href=>"#"} Awesome Company - %nav - %ul - %li - %a{:href=>"#"} Home - %li - %a{:href=>"#"} About - %li - %a{:href=>"#"} Services - %li - %a{:href=>"#"} Contact - - %section - %h1 A Page Title - %section - %h2 A Paragraph - %p Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum blandit, tellus ornare mollis rhoncus, risus dui tincidunt nisl, nec vulputate sapien neque at tellus. Aenean in ornare nisl, sed porta dui. - %p Nunc sit amet arcu id ligula commodo consequat vel a lorem. Proin auctor, purus in dictum efficitur, mauris purus dictum augue, vitae laoreet ante nunc in sapien. Maecenas consectetur egestas euismod. - %section - %h2 A Paragraph - %p onec faucibus sodales lectus, quis dictum ligula aliquet sit amet. Nam sodales nibh quis quam dictum sollicitudin. Nullam ut est euismod, hendrerit tellus et, euismod turpis. - %p Nunc sit amet arcu id ligula commodo consequat vel a lorem. Proin auctor, purus in dictum efficitur, mauris purus dictum augue, vitae laoreet ante nunc in sapien. Maecenas consectetur egestas euismod. - %section - %h2 A Paragraph - %p Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas non mauris ac erat consequat rhoncus. Mauris nec sapien luctus, rutrum leo sit amet, pretium elit. - - %footer - %p Copyright © 2013 Awesome Company LLC. diff --git a/top-nav-drill/index_haml.haml b/top-nav-drill/index_haml.haml new file mode 100644 index 0000000..b2343eb --- /dev/null +++ b/top-nav-drill/index_haml.haml @@ -0,0 +1,42 @@ +!!! 5 + +%html{html_attrs('en')} + + %head + %meta{:charset=>"UTF-8"} + %title The Awesome Company + %link{:rel=>:stylesheet, :href=>"bower_components/normalize-css/normalize.css"} + %link{:rel=>:stylesheet, :href=>"main.css"} + + %body + .container + %header + %span + %a{:href=>"#"} Awesome Company + %nav + %ul + %li + %a{:href=>"#"} Home + %li + %a{:href=>"#"} About + %li + %a{:href=>"#"} Services + %li + %a{:href=>"#"} Contact + + %section + %h1 A Page Title + %section + %h2 A Paragraph + %p Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum blandit, tellus ornare mollis rhoncus, risus dui tincidunt nisl, nec vulputate sapien neque at tellus. Aenean in ornare nisl, sed porta dui. + %p Nunc sit amet arcu id ligula commodo consequat vel a lorem. Proin auctor, purus in dictum efficitur, mauris purus dictum augue, vitae laoreet ante nunc in sapien. Maecenas consectetur egestas euismod. + %section + %h2 A Paragraph + %p onec faucibus sodales lectus, quis dictum ligula aliquet sit amet. Nam sodales nibh quis quam dictum sollicitudin. Nullam ut est euismod, hendrerit tellus et, euismod turpis. + %p Nunc sit amet arcu id ligula commodo consequat vel a lorem. Proin auctor, purus in dictum efficitur, mauris purus dictum augue, vitae laoreet ante nunc in sapien. Maecenas consectetur egestas euismod. + %section + %h2 A Paragraph + %p Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas non mauris ac erat consequat rhoncus. Mauris nec sapien luctus, rutrum leo sit amet, pretium elit. + + %footer + %p Copyright © 2013 Awesome Company LLC. diff --git a/top-nav-drill/index_haml.html b/top-nav-drill/index_haml.html new file mode 100644 index 0000000..aa4aef3 --- /dev/null +++ b/top-nav-drill/index_haml.html @@ -0,0 +1,54 @@ + + + + + The Awesome Company + + + + +
+
+ + Awesome Company + + +
+
+

A Page Title

+
+
+

A Paragraph

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum blandit, tellus ornare mollis rhoncus, risus dui tincidunt nisl, nec vulputate sapien neque at tellus. Aenean in ornare nisl, sed porta dui.

+

Nunc sit amet arcu id ligula commodo consequat vel a lorem. Proin auctor, purus in dictum efficitur, mauris purus dictum augue, vitae laoreet ante nunc in sapien. Maecenas consectetur egestas euismod.

+
+
+

A Paragraph

+

onec faucibus sodales lectus, quis dictum ligula aliquet sit amet. Nam sodales nibh quis quam dictum sollicitudin. Nullam ut est euismod, hendrerit tellus et, euismod turpis.

+

Nunc sit amet arcu id ligula commodo consequat vel a lorem. Proin auctor, purus in dictum efficitur, mauris purus dictum augue, vitae laoreet ante nunc in sapien. Maecenas consectetur egestas euismod.

+
+
+

A Paragraph

+

Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas non mauris ac erat consequat rhoncus. Mauris nec sapien luctus, rutrum leo sit amet, pretium elit.

+
+
+

Copyright © 2013 Awesome Company LLC.

+
+
+ + From e5507df67beb5b8899d3878def2e260888f0d5f1 Mon Sep 17 00:00:00 2001 From: Kaleb Davis Date: Thu, 4 Jun 2015 16:58:12 -0400 Subject: [PATCH 5/5] Compiled scss into css --- top-nav-drill/main_scss.css | 34 +++++++++++++++++++++++++++ top-nav-drill/main_scss.scss | 45 ++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 top-nav-drill/main_scss.css create mode 100644 top-nav-drill/main_scss.scss diff --git a/top-nav-drill/main_scss.css b/top-nav-drill/main_scss.css new file mode 100644 index 0000000..705aae2 --- /dev/null +++ b/top-nav-drill/main_scss.css @@ -0,0 +1,34 @@ +.container { + margin: 0 auto; } + +/* Header row */ +header { + background-color: black; + width: 100%; + padding: 8px 10px 10px; } + header a { + color: white; } + header span a { + text-decoration: none; + font-size: 35px; + font-weight: bold; + padding-right: 23px; } + header nav { + float: right; + padding-right: 10px; } + header nav ul { + list-style-type: none; } + header nav ul li { + display: inline; } + +/* Text body */ +section { + margin: 100px 100px; } + section h1 { + border-bottom: 2px solid grey; } + +footer { + margin: 100px 100px; + border-top: 4px solid grey; } + +/*# sourceMappingURL=main_scss.css.map */ diff --git a/top-nav-drill/main_scss.scss b/top-nav-drill/main_scss.scss new file mode 100644 index 0000000..4e7c5fb --- /dev/null +++ b/top-nav-drill/main_scss.scss @@ -0,0 +1,45 @@ +$margin: 100px; +$line: solid grey; + +.container { + margin: 0 auto; +} + +/* Header row */ +header { + background-color: black; + width: 100%; + padding: 8px 10px 10px; + a { + color: white; + } + span a { + text-decoration: none; + font-size: 35px; + font-weight: bold; + padding-right: 23px; + } + nav { + float: right; + padding-right: 10px; + ul { + list-style-type: none; + li { + display: inline; + } + } + } +} + +/* Text body */ +section { + margin: $margin $margin; + h1 { + border-bottom: 2px $line; + } +} + +footer { + margin: $margin $margin; + border-top: 4px $line; +}