Skip to content
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.

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

CSS chapter - added explanations about CSS and fixed some language mistakes #54

Merged
merged 4 commits into from
Jul 26, 2014

Conversation

shmool
Copy link
Contributor

@shmool shmool commented Jul 26, 2014

Added some info about how CSS works (selectors - tags, classes and ids, declaration blocks...) with some useful links to w3schools pages.
Changed some text that relates to my additions.
Fixed some language issues and typos.
My first pull request!! :)

shmool added 3 commits July 26, 2014 15:27
Added info about CSS, fixed typos
Few small changes
@@ -16,13 +16,14 @@ It was written by programmers who worked for Twitter and is now developed by vol

## Install Boostrap

To install Bootstrap, you need to add this to your `<head>` in you `.html` file (`mysite/blog/templates/blog/post_list.html`):
To install Bootstrap, you need to add this to your `<head>` in your `.html` file (`mysite/blog/templates/blog/post_list.html`):

Choose a reason for hiding this comment

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

There are changes in the master branch that are clashing with yours :)

change mysite/blog/templates to blog/templates

deleted "mysite" dir since there was directory change in the tutorial files.
@oinopion oinopion merged commit 54f087b into DjangoGirls:master Jul 26, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants