diff --git a/haml_sass/.sass-cache/3301e3e8ccd3533e534811c959623982cf9e8c5f/main.sassc b/haml_sass/.sass-cache/3301e3e8ccd3533e534811c959623982cf9e8c5f/main.sassc new file mode 100644 index 0000000..3b18448 Binary files /dev/null and b/haml_sass/.sass-cache/3301e3e8ccd3533e534811c959623982cf9e8c5f/main.sassc differ diff --git a/haml_sass/index.haml b/haml_sass/index.haml new file mode 100644 index 0000000..68ab970 --- /dev/null +++ b/haml_sass/index.haml @@ -0,0 +1,46 @@ +!!! 5 + +/DON'T change this file! You should be able to complete this challenge by changing the CSS file only. + +%html{:lang => 'en'} + %head + %meta{:charset => 'UTF-8'} + %title The Awesome Company + %link{:href => 'bower_components/normalize-css/normalize.css', :rel => 'stylesheet'} + %link{:href => 'main.css', :rel => 'stylesheet'} + %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%/h2 + %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 sapie n. Maecenas consectetur egestas euismod. + + %section + %h2 A Paragraph + %p Donec 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/haml_sass/index.html b/haml_sass/index.html new file mode 100644 index 0000000..ab07544 --- /dev/null +++ b/haml_sass/index.html @@ -0,0 +1,55 @@ + + + + + + The Awesome Company + + + + +
+
+ + Awesome Company% + + +
+
+

A Page Title

+
+

A Paragraph%/h2

+

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 sapie n. Maecenas consectetur egestas euismod.

+
+
+

A Paragraph

+

Donec 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.

+
+ +
+
+ + diff --git a/haml_sass/main.css b/haml_sass/main.css new file mode 100644 index 0000000..1188d82 --- /dev/null +++ b/haml_sass/main.css @@ -0,0 +1,45 @@ +.container { + margin: 0 auto; } + +section { + width: 60%; + margin: 0 auto; } + section section { + width: 100%; + margin: 0 auto; } + +h1 { + border-bottom: 1px solid grey; } + +header { + background-color: black; + height: 45px; } + +ul { + margin-top: 7px; } + +nav { + float: right; + margin-right: 25px; } + nav ul li a { + display: block; + padding: 5px; + color: white; } + +span { + text-decoration: none; + font-size: 28px; + display: inline-block; + margin-top: 6px; + margin-left: 25px; } + span a { + text-decoration: none; + color: white; } + +li { + list-style-type: none; } + +footer { + border-top: 1px solid grey; } + +/*# sourceMappingURL=main.css.map */ diff --git a/haml_sass/main.css.map b/haml_sass/main.css.map new file mode 100644 index 0000000..2649c42 --- /dev/null +++ b/haml_sass/main.css.map @@ -0,0 +1,7 @@ +{ +"version": 3, +"mappings": "AAAA,UAAU;EACR,MAAM,EAAE,MAAM;;AAEhB,OAAO;EACL,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,MAAM;EACd,eAAO;IACL,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,MAAM;;AAElB,EAAE;EACA,aAAa,EAAE,cAAc;;AAE/B,MAAM;EACJ,gBAAgB,EAAE,KAAK;EACvB,MAAM,EAAE,IAAI;;AAEd,EAAE;EACA,UAAU,EAAE,GAAG;;AAEjB,GAAG;EACD,KAAK,EAAE,KAAK;EACZ,YAAY,EAAE,IAAI;EAClB,WAAO;IACL,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,GAAG;IACZ,KAAK,EAAE,KAAK;;AAEhB,IAAI;EACF,eAAe,EAAE,IAAI;EACrB,SAAS,EAAE,IAAI;EAEf,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,GAAG;EACf,WAAW,EAAE,IAAI;EACjB,MAAC;IACC,eAAe,EAAE,IAAI;IACrB,KAAK,EAAE,KAAK;;AAGhB,EAAE;EAEA,eAAe,EAAE,IAAI;;AAEvB,MAAM;EACJ,UAAU,EAAE,cAAc", +"sources": ["main.sass"], +"names": [], +"file": "main.css" +} diff --git a/haml_sass/main.sass b/haml_sass/main.sass new file mode 100644 index 0000000..811ee16 --- /dev/null +++ b/haml_sass/main.sass @@ -0,0 +1,46 @@ +.container + margin: 0 auto + +section + width: 60% + margin: 0 auto + section + width: 100% + margin: 0 auto + +h1 + border-bottom: 1px solid grey + +header + background-color: black + height: 45px + +ul + margin-top: 7px + +nav + float: right + margin-right: 25px + ul li a + display: block + padding: 5px + color: white + +span + text-decoration: none + font-size: 28px + color:white + display: inline-block + margin-top: 6px + margin-left: 25px + a + text-decoration: none + color: white + + +li + float:left + list-style-type: none + +footer + border-top: 1px solid grey \ No newline at end of file diff --git a/top-nav-drill/index.html b/top-nav-drill/index.html index fbc0cdb..ae91e48 100644 --- a/top-nav-drill/index.html +++ b/top-nav-drill/index.html @@ -8,7 +8,7 @@ The Awesome Company - +
@@ -26,25 +26,31 @@
-

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

-

Donec 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.

+

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

+

Donec 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.

+
+
-
diff --git a/top-nav-drill/main.css b/top-nav-drill/main.css index 9d37c16..f67ae70 100644 --- a/top-nav-drill/main.css +++ b/top-nav-drill/main.css @@ -1,5 +1,72 @@ -.container { +.container +{ margin: 0 auto; } -/*Put your code here*/ +section +{ + width: 60%; + margin: 0 auto; +} + +section section +{ + width: 100%; + margin: 0 auto; +} + +h1 +{ + border-bottom: 1px solid grey; +} + +header +{ + background-color: black; + height: 45px; +} + +ul +{ + margin-top: 7px; +} + +nav +{ + float: right; + margin-right: 25px; +} + +span +{ + text-decoration: none; + font-size: 28px; + color:white; + display: inline-block; + margin-top: 6px; + margin-left: 25px; +} + +li +{ + float:left; + list-style-type: none; +} + +span a +{ + text-decoration: none; + color: white; +} + +nav ul li a +{ + display: block; + padding: 5px; + color: white; +} + +footer +{ + border-top: 1px solid grey; +}