Merge branch 'master' of github.com:neocities/neocities

This commit is contained in:
Kyle Drake 2015-03-13 11:38:34 -05:00
commit 1721502cda
2 changed files with 27 additions and 4 deletions

View file

@ -6,7 +6,7 @@ The web site for Neocities! It's open source. Want a feature on the site? Send a
## Getting Started ## Getting Started
Neocities can be quickly launched in development mode with (Vagrant)[https://www.vagrantup.com]. Vagrant builds a virtual machine that automatically installs everything you need to run Neocities as a developer. Install Vagrant, then from the command line: Neocities can be quickly launched in development mode with [Vagrant](https://www.vagrantup.com). Vagrant builds a virtual machine that automatically installs everything you need to run Neocities as a developer. Install Vagrant, then from the command line:
``` ```
vagrant up --provision vagrant up --provision
@ -26,7 +26,7 @@ Now you can access the running site from your browser: http://127.0.0.1:9292
If you'd like to fix a bug, or make an improvement, or add a new feature, it's easy! Just send us a Pull Request. If you'd like to fix a bug, or make an improvement, or add a new feature, it's easy! Just send us a Pull Request.
1. Fork it ( http://github.com/YOURUSERNAME/neocities/fork ) 1. Fork it (<http://github.com/YOURUSERNAME/neocities/fork>)
2. Create your feature branch (`git checkout -b my-new-feature`) 2. Create your feature branch (`git checkout -b my-new-feature`)
3. Commit your changes (`git commit -am 'Add some feature'`) 3. Commit your changes (`git commit -am 'Add some feature'`)
4. Push to the branch (`git push origin my-new-feature`) 4. Push to the branch (`git push origin my-new-feature`)

View file

@ -158,18 +158,41 @@
margin-bottom: 0; margin-bottom: 0;
padding-left: 0; padding-left: 0;
width: 55%; width: 55%;
@media (max-device-width:480px), screen and (max-width:800px){
width: 100%;
text-align: center;
}
} }
.footer-Nav{ .footer-Nav{
text-transform:uppercase; text-transform:uppercase;
width: 45%; width: 45%;
padding-left: 0; padding-left: 0;
.h-Nav{float:right; @media (max-device-width:480px), screen and (max-width:800px){
width: 100%;
text-align: center;
}
.h-Nav{
float:right;
@media (max-device-width:480px), screen and (max-width:800px){ @media (max-device-width:480px), screen and (max-width:800px){
float:none; float:none;
margin-top:15px; margin-top:15px;
margin-bottom: 6px;
li:first-child a{padding-left:0} li {
float: none;
display: inline;
a {
padding-left: 0;
margin-right: 10px;
margin-top: 5px;
margin-bottom: 3px;
}
}
} }
} }
.h-Nav a{ .h-Nav a{