Fixed conlitc
Fixed conlitc
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge git://github.com/pyrocms/pyrocms into 2.2/develop
Merge git://github.com/pyrocms/pyrocms into 2.2/develop
Merge git://github.com/pyrocms/pyrocms into 2.2/develop
Merge git://github.com/pyrocms/pyrocms into 2.2/develop
Merge git://github.com/pyrocms/pyrocms into 2.2/develop
Default Theme

updated lots of style and layout stuff for the default website theme

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Fix for issue #2240 - pages with no fields can now be edited and saved
Default Theme Updates

- updated various styles for default theme
- added font face

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Theme

viewport config

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Merge git://github.com/pyrocms/pyrocms into 2.2/develop
Theme and CKeditor

- Updated default theme
- Customized coeditor color and updated pyro's image and files icons

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Theme Updates

Updated some admin theme css

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Login Footer

fix to login footer

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Merge remote-tracking branch 'origin/2.2/develop' into feature/default-theme
Merge git://github.com/pyrocms/pyrocms into 2.2/develop
Add recursive function to allow has_current navigation links to be found in any level of navigation
Update CKEditors existing SCAYT plugin

And added the menubutton plugin SCAYT depends on.