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
Fixes issue #2242, only images with Lex tags will disable the URL field of the Image dialog
Merge pull request #2245 from dresfdez/hotfix/2242

Fixes issue #2242, only images with Lex tags will disable the URL field ...
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>
Hide the admin header when ckeditor is maximized to avoid overlapping and also toggle the maximize icon to pyrocms logo cause it looks cool.
Login Footer

fix to login footer

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Merge pull request #2246 from obrignoni/2.2/ckeditor-maximize

Hide the admin header when ckeditor is maximized to avoid overlapping an...