summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Steve Sutton [Thu, 12 Jun 2014 17:03:52 +0000 (13:03 -0400)]
form update
ditching previous idea. That is not working for
responsive. Applying foundation div classes.
Steve Sutton [Thu, 12 Jun 2014 16:40:08 +0000 (12:40 -0400)]
form update
setup the group of checkboxes so they are
in a div class group so we can apply a separate
style to those checkboxes and have them 50% width
then the other checkbox styles can be normal
Steve Sutton [Thu, 12 Jun 2014 15:54:58 +0000 (11:54 -0400)]
Merge branch 'develop' of cvs2:web/SooLocks into develop
Steve Sutton [Thu, 12 Jun 2014 15:54:26 +0000 (11:54 -0400)]
update for headerImage application
Add text for image sizes
configuration in the application.ini file
as application.imageSize
Ove Klykken [Thu, 12 Jun 2014 15:25:33 +0000 (11:25 -0400)]
new admin logo
Ove Klykken [Thu, 12 Jun 2014 15:15:27 +0000 (11:15 -0400)]
Inside header image is responsive. main nav no hover effect
Ove Klykken [Thu, 12 Jun 2014 14:55:22 +0000 (10:55 -0400)]
Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into develop
Ove Klykken [Thu, 12 Jun 2014 14:54:59 +0000 (10:54 -0400)]
main nav break points
Steve Sutton [Thu, 12 Jun 2014 14:46:06 +0000 (10:46 -0400)]
Add flexy for home image
If on home page output the home image
If on inside page don't output the home image
Steve Sutton [Thu, 12 Jun 2014 14:45:21 +0000 (10:45 -0400)]
Adding Header Image output
Output the header image based on the page or page parent.
Ove Klykken [Thu, 12 Jun 2014 14:25:35 +0000 (10:25 -0400)]
Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into develop
Ove Klykken [Thu, 12 Jun 2014 14:24:23 +0000 (10:24 -0400)]
Inside header image w header text and paragraph w rounded corners
Chuck Scott [Thu, 12 Jun 2014 13:52:31 +0000 (09:52 -0400)]
Trivial change to test Git configuration change
cscott [Thu, 12 Jun 2014 13:42:48 +0000 (09:42 -0400)]
Merge branch 'develop' of git@cvs2.gaslightmedia.com:web/SooLocks.git into develop
cscott [Thu, 12 Jun 2014 12:29:43 +0000 (08:29 -0400)]
Adding Event Management V3 to site for Ticketing.
Ove Klykken [Wed, 11 Jun 2014 20:49:55 +0000 (16:49 -0400)]
Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into develop
Ove Klykken [Wed, 11 Jun 2014 20:49:12 +0000 (16:49 -0400)]
footer colums
Ove Klykken [Wed, 11 Jun 2014 20:48:20 +0000 (16:48 -0400)]
centered passport image and footer font color and size
Steve Sutton [Wed, 11 Jun 2014 20:19:43 +0000 (16:19 -0400)]
Merge branch 'develop' of cvs2:web/SooLocks into develop
Steve Sutton [Wed, 11 Jun 2014 20:19:12 +0000 (16:19 -0400)]
remove comment out code
Steve Sutton [Wed, 11 Jun 2014 20:12:24 +0000 (16:12 -0400)]
Update site config
Add client name and address
Steve Sutton [Wed, 11 Jun 2014 18:40:37 +0000 (14:40 -0400)]
update forms
adding form for page id 35
setup separate groups for both form
1 = contact
2 = Cruise Form
setup the config.ini file for contact types
Steve Sutton [Wed, 11 Jun 2014 18:26:20 +0000 (14:26 -0400)]
update forms
Modify the form template to output using
foundation form classes.
Ove Klykken [Wed, 11 Jun 2014 16:42:20 +0000 (12:42 -0400)]
Changed appearance of Homepage headlines and toolbox image captions
Ove Klykken [Wed, 11 Jun 2014 15:25:15 +0000 (11:25 -0400)]
Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into develop
Conflicts:
.gitignore
Ove Klykken [Wed, 11 Jun 2014 15:19:43 +0000 (11:19 -0400)]
Ignoring compiled templates and htaccess file
Steve Sutton [Wed, 11 Jun 2014 15:04:04 +0000 (11:04 -0400)]
Merge branch 'develop' of cvs2:web/SooLocks into develop
Steve Sutton [Wed, 11 Jun 2014 14:57:46 +0000 (10:57 -0400)]
update for output of calendar
remove the times from showing
move comments to above the calendars
setup calendars with grid blocks for foundation.
add gitignore file for the netbeans project
Ove Klykken [Wed, 11 Jun 2014 14:54:19 +0000 (10:54 -0400)]
moving data-equalizer-watch so the white columns are equal height
Ove Klykken [Tue, 10 Jun 2014 20:45:57 +0000 (16:45 -0400)]
reset styles for subnav, styling new elements in column
Steve Sutton [Tue, 10 Jun 2014 19:21:24 +0000 (15:21 -0400)]
Update sidenavigation
Setup class of reset-list on main ul in the side nav
also retab files
Steve Sutton [Tue, 10 Jun 2014 18:59:15 +0000 (14:59 -0400)]
Add css file
Add css/normalize.css
Ove Klykken [Tue, 10 Jun 2014 18:26:45 +0000 (14:26 -0400)]
Merge branch 'feature/template' into develop
Ove Klykken [Tue, 10 Jun 2014 18:24:10 +0000 (14:24 -0400)]
Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into feature/template
Ove Klykken [Tue, 10 Jun 2014 18:11:47 +0000 (14:11 -0400)]
column in small view
Made sure the column items are side by side in small view
Steve Sutton [Tue, 10 Jun 2014 18:00:49 +0000 (14:00 -0400)]
add blocks and side nav
Adding sideNavigation to the template
Adding GLM_Blocks to the template
Ove Klykken [Tue, 10 Jun 2014 17:56:29 +0000 (13:56 -0400)]
Footer
headers colored red
tagline uppercase and times font
Steve Sutton [Tue, 10 Jun 2014 17:26:39 +0000 (13:26 -0400)]
Merge branch 'feature/videos' into develop
Steve Sutton [Tue, 10 Jun 2014 17:16:02 +0000 (13:16 -0400)]
update line ending
unix form for file
Steve Sutton [Tue, 10 Jun 2014 17:11:47 +0000 (13:11 -0400)]
Adding the libraries for videos
working on grid for videos output
Ove Klykken [Tue, 10 Jun 2014 17:10:12 +0000 (13:10 -0400)]
Misc changes
Hiding logo on smaller screens.
Removed redundant CSS rule
custom style for h2 toolbox headers
Ove Klykken [Tue, 10 Jun 2014 16:19:21 +0000 (12:19 -0400)]
Footer and exit-off-canvas
Separated tagline from footer element.
Added element to exit off-canvas mode
Steve Sutton [Tue, 10 Jun 2014 16:19:08 +0000 (12:19 -0400)]
Start work on videos
work on templates
Ove Klykken [Tue, 10 Jun 2014 16:14:04 +0000 (12:14 -0400)]
Bottom tagline
bottom tagline separated from the footer element
Steve Sutton [Tue, 10 Jun 2014 15:50:41 +0000 (11:50 -0400)]
Add photoswipe
needed for demo version of photo gallery
Steve Sutton [Tue, 10 Jun 2014 15:49:28 +0000 (11:49 -0400)]
Update ref for js
use libjs instead
Steve Sutton [Tue, 10 Jun 2014 15:44:18 +0000 (11:44 -0400)]
template updates
setup photo template
small 2
medium 3
large 4
remove ending spaces in templates/template.html
Steve Sutton [Tue, 10 Jun 2014 15:33:32 +0000 (11:33 -0400)]
Add toolbox content
Add toolbox content to template
Steve Sutton [Tue, 10 Jun 2014 15:29:30 +0000 (11:29 -0400)]
Update dev mode
use devdb for database host
Steve Sutton [Tue, 10 Jun 2014 15:26:34 +0000 (11:26 -0400)]
Update template
Add correct path url for all resources
Ove Klykken [Tue, 10 Jun 2014 15:21:45 +0000 (11:21 -0400)]
Changing default template to the one I had been working on
Steve Sutton [Mon, 9 Jun 2014 20:50:43 +0000 (16:50 -0400)]
Updates for schedule app
also updates for php5.3
Steve Sutton [Mon, 9 Jun 2014 19:53:59 +0000 (15:53 -0400)]
Merge branch 'develop' of cvs2:web/SooLocks into develop
Steve Sutton [Mon, 9 Jun 2014 19:53:43 +0000 (15:53 -0400)]
Merge branch 'feature/steve/cruiseSchedule' into develop
Steve Sutton [Mon, 9 Jun 2014 19:51:30 +0000 (15:51 -0400)]
Update .htaccess file for schedule redirect
Needed for the schedule application
Steve Sutton [Mon, 9 Jun 2014 19:27:52 +0000 (15:27 -0400)]
Merge branch 'feature/steve/headerImages' into develop
Steve Sutton [Mon, 9 Jun 2014 19:25:16 +0000 (15:25 -0400)]
update for work on vserver and add header images
add output in template object for header images
comment out for use in vserver php5.3
Steve Sutton [Fri, 6 Jun 2014 15:29:23 +0000 (11:29 -0400)]
Add source for headerImage Application
Bring in the discoverkalamazoo code for headerimages.
Steve Sutton [Fri, 6 Jun 2014 15:20:16 +0000 (11:20 -0400)]
Setting up the boat schedule application from beaverisland
Taking the beaverislandboatcompany schedule application.
This is a start of it as it will need some work.
Steve Sutton [Fri, 6 Jun 2014 14:20:46 +0000 (10:20 -0400)]
Update for working on site locally
add for php 5.5 to work
Steve Sutton [Fri, 6 Jun 2014 14:09:45 +0000 (10:09 -0400)]
Installing Apps to website
Installing:
Contacts
Photos
Blocks
Videos
Coupons
Steve Sutton [Fri, 6 Jun 2014 14:01:09 +0000 (10:01 -0400)]
initial setup of soolocks