Skip to content

DOM Solution - Rajashree #23

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

Open
rajashreemaiya wants to merge 3 commits into
base: master
Choose a base branch
from
Open

DOM Solution - Rajashree #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63519fd
completed main.css
rajashreemaiya Jan 11, 2016
e6db844
made cahnges in indentations
rajashreemaiya Jan 11, 2016
ce7ce2c
Completed Haml and Sass
rajashreemaiya Jan 18, 2016
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
Binary file added haml_sass/.sass-cache/3301e3e8ccd3533e534811c959623982cf9e8c5f/main.sassc
View file
Open in desktop
Binary file not shown.
46 changes: 46 additions & 0 deletions haml_sass/index.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.


55 changes: 55 additions & 0 deletions haml_sass/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<!DOCTYPE html>
<!-- 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</title>
<link href='bower_components/normalize-css/normalize.css' rel='stylesheet'>
<link href='main.css' rel='stylesheet'>
</head>
<body>
<div class='container'>
<header>
<span>
<a href='#'>Awesome Company%</a>
</span>
<nav>
<ul>
<li>
<a href='#'>Home</a>
</li>
<li>
<a href='#'>About</a>
</li>
<li>
<a href='#'>Services</a>
</li>
<li>
<a href='#'>Contact</a>
</li>
</ul>
</nav>
</header>
<section>
<h1>A Page Title</h1>
<section>
<h2>A Paragraph%/h2</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>
<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.</p>
</section>
<section>
<h2>A Paragraph</h2>
<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>
<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.</p>
</section>
<section>
<h2>A Paragraph</h2>
<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.</p>
</section>
<footer>
<p>Copyright &copy; 2013 Awesome Company LLC.</p>
</footer>
</section>
</div>
</body>
</html>
45 changes: 45 additions & 0 deletions haml_sass/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions haml_sass/main.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions haml_sass/main.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
42 changes: 24 additions & 18 deletions top-nav-drill/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<title>The Awesome Company</title>
<link rel="stylesheet" href="bower_components/normalize-css/normalize.css">
<link rel="stylesheet" href="main.css">
</head>
</head>

<body>
<div class="container">
Expand All @@ -26,25 +26,31 @@
</header>

<section>
<h1>A Page Title</h1>
<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>
<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.</p>
</section>
<section>
<h2>A Paragraph</h2>
<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>
<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.</p>
</section>
<section>
<h2>A Paragraph</h2>
<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.</p>
<h1>A Page Title</h1>

<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>
<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.</p>
</section>

<section>
<h2>A Paragraph</h2>
<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>
<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.</p>
</section>

<section>
<h2>A Paragraph</h2>
<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.</p>
</section>

<footer>
<p>Copyright &copy; 2013 Awesome Company LLC.</p>
</footer>

</section>

<footer>
<p>Copyright &copy; 2013 Awesome Company LLC.</p>
</footer>
</div>
</body>

Expand Down
71 changes: 69 additions & 2 deletions top-nav-drill/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Copy link

@paradime paradime Jan 11, 2016

Choose a reason for hiding this comment

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

Some of your formatting here is a little hard to follow. Think the most common implementation is

CSS_Selector{
  field: value;
}

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;
}