Commit Graph

11 Commits

Author SHA1 Message Date
Duncan Sommerville a8955e2ea1 Fix side-menu position 2015-08-19 17:18:42 -04:00
Albert Santoni 93d2d8ad67 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
Conflicts:
	airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-19 15:00:35 -04:00
Albert Santoni f82558a5c0 Navigation sidebar finalization 2015-08-19 14:59:33 -04:00
drigato 8dcd0a2595 CC-6071: Icons for navigation bar 2015-08-19 12:58:31 -04:00
drigato 59a9862ba3 CC-6072: Wrapper has weird positioning during page load 2015-08-19 10:56:41 -04:00
Albert Santoni 8afc652ff1 Submenu and body background color tweaks 2015-08-18 18:40:09 -04:00
Albert Santoni 2c443bd27a Some navbar and page title fixes 2015-08-18 17:52:23 -04:00
Albert Santoni a04f5afcbd More navbar and submenu layout fixes 2015-08-18 17:13:17 -04:00
Duncan Sommerville 3f25ab2647 CC-6079 - merge and remove underscore files 2015-08-18 15:23:42 -04:00
drigato e5f5ff4c88 SAAS-1019: Re-work Navigation Menu
Created Widget sub menu and moved widgets into separate controller
actions
2015-08-17 16:15:26 -04:00
drigato 3aee9a49bc SAAS-1019: Re-work Navigation Menu 2015-08-17 12:46:32 -04:00