web/TroutCreek.git
9 years agoMerge tag 'v1.0.18' into develop
Steve Sutton [Wed, 17 Feb 2016 14:42:37 +0000 (09:42 -0500)]
Merge tag 'v1.0.18' into develop

Version 1.0.18

9 years agoMerge branch 'hotfix/1.0.18' v1.0.18
Steve Sutton [Wed, 17 Feb 2016 14:42:27 +0000 (09:42 -0500)]
Merge branch 'hotfix/1.0.18'

9 years agoUpdate the home page buttons
Steve Sutton [Wed, 17 Feb 2016 14:41:57 +0000 (09:41 -0500)]
Update the home page buttons

Reorder them and change the enews to Winter Activities

9 years agoMerge tag 'v1.0.17' into develop
Steve Sutton [Thu, 5 Nov 2015 21:39:31 +0000 (16:39 -0500)]
Merge tag 'v1.0.17' into develop

Version 1.0.17

9 years agoMerge branch 'hotfix/1.0.17' v1.0.17
Steve Sutton [Thu, 5 Nov 2015 21:39:21 +0000 (16:39 -0500)]
Merge branch 'hotfix/1.0.17'

9 years agoUpdate for res mobile form
Steve Sutton [Thu, 5 Nov 2015 21:38:47 +0000 (16:38 -0500)]
Update for res mobile form

update spacing on how it output
use small 12 and small 12

9 years agoMerge tag 'v1.0.16' into develop
Steve Sutton [Thu, 5 Nov 2015 21:33:52 +0000 (16:33 -0500)]
Merge tag 'v1.0.16' into develop

Version 1.0.16

9 years agoMerge branch 'hotfix/1.0.16' v1.0.16
Steve Sutton [Thu, 5 Nov 2015 21:33:44 +0000 (16:33 -0500)]
Merge branch 'hotfix/1.0.16'

9 years agobump version number for style sheet
Steve Sutton [Thu, 5 Nov 2015 21:33:38 +0000 (16:33 -0500)]
bump version number for style sheet

9 years agoMerge tag 'v1.0.15' into develop
Steve Sutton [Thu, 5 Nov 2015 21:32:06 +0000 (16:32 -0500)]
Merge tag 'v1.0.15' into develop

Version 1.0.15

9 years agoMerge branch 'hotfix/1.0.15' v1.0.15
Steve Sutton [Thu, 5 Nov 2015 21:31:58 +0000 (16:31 -0500)]
Merge branch 'hotfix/1.0.15'

9 years agoFix for mobile reservations
Steve Sutton [Thu, 5 Nov 2015 21:31:34 +0000 (16:31 -0500)]
Fix for mobile reservations

Remove the mobile form dates.

9 years agoMerge tag 'v1.0.14' into develop
Steve Sutton [Thu, 5 Nov 2015 18:12:03 +0000 (13:12 -0500)]
Merge tag 'v1.0.14' into develop

Version 1.0.14

9 years agoMerge branch 'hotfix/1.0.14' v1.0.14
Steve Sutton [Thu, 5 Nov 2015 18:11:55 +0000 (13:11 -0500)]
Merge branch 'hotfix/1.0.14'

9 years agoUpdate urls
Steve Sutton [Thu, 5 Nov 2015 18:11:23 +0000 (13:11 -0500)]
Update urls

one is for desktop reservations and the other is for mobile

9 years agoMerge tag 'v1.0.13' into develop
Steve Sutton [Mon, 2 Nov 2015 21:19:24 +0000 (16:19 -0500)]
Merge tag 'v1.0.13' into develop

Version 1.0.13

9 years agoMerge branch 'hotfix/1.0.13' v1.0.13
Steve Sutton [Mon, 2 Nov 2015 21:19:15 +0000 (16:19 -0500)]
Merge branch 'hotfix/1.0.13'

9 years agoPut the only in the header place
Steve Sutton [Mon, 2 Nov 2015 21:18:56 +0000 (16:18 -0500)]
Put the only in the header place

9 years agoMerge tag 'v1.0.12' into develop
Steve Sutton [Mon, 2 Nov 2015 21:15:58 +0000 (16:15 -0500)]
Merge tag 'v1.0.12' into develop

Version 1.0.12

9 years agoMerge branch 'hotfix/1.0.12' v1.0.12
Steve Sutton [Mon, 2 Nov 2015 21:15:51 +0000 (16:15 -0500)]
Merge branch 'hotfix/1.0.12'

9 years agoFix forms for reservations
Steve Sutton [Mon, 2 Nov 2015 21:15:09 +0000 (16:15 -0500)]
Fix forms for reservations

need two forms because the one before was overwriting the dates

9 years agoMerge tag 'v1.0.11' into develop
Steve Sutton [Mon, 2 Nov 2015 20:24:20 +0000 (15:24 -0500)]
Merge tag 'v1.0.11' into develop

Version 1.0.11

9 years agoMerge branch 'hotfix/1.0.11' v1.0.11
Steve Sutton [Mon, 2 Nov 2015 20:24:13 +0000 (15:24 -0500)]
Merge branch 'hotfix/1.0.11'

9 years agoUpdate the reservation js
Steve Sutton [Mon, 2 Nov 2015 20:24:01 +0000 (15:24 -0500)]
Update the reservation js

make first date be min +3

9 years agoupdate the reservation url
Steve Sutton [Mon, 2 Nov 2015 20:15:38 +0000 (15:15 -0500)]
update the reservation url

9 years agoMerge tag 'v1.0.10' into develop
Steve Sutton [Wed, 21 Oct 2015 20:06:44 +0000 (16:06 -0400)]
Merge tag 'v1.0.10' into develop

Version 1.0.10

9 years agoMerge branch 'hotfix/1.0.10' v1.0.10
Steve Sutton [Wed, 21 Oct 2015 20:06:35 +0000 (16:06 -0400)]
Merge branch 'hotfix/1.0.10'

9 years agoupdate reservation url
Steve Sutton [Wed, 21 Oct 2015 20:06:30 +0000 (16:06 -0400)]
update reservation url

9 years agoMerge tag 'v1.0.9' into develop
Steve Sutton [Wed, 21 Oct 2015 19:40:08 +0000 (15:40 -0400)]
Merge tag 'v1.0.9' into develop

Version 1.0.9

9 years agoMerge branch 'hotfix/1.0.9' v1.0.9
Steve Sutton [Wed, 21 Oct 2015 19:40:01 +0000 (15:40 -0400)]
Merge branch 'hotfix/1.0.9'

9 years agoUpdate the template to add google analytics code
Steve Sutton [Wed, 21 Oct 2015 19:39:14 +0000 (15:39 -0400)]
Update the template to add google analytics code

per client request

10 years agoMerge tag 'v1.0.8' into develop
Steve Sutton [Wed, 18 Mar 2015 17:32:04 +0000 (13:32 -0400)]
Merge tag 'v1.0.8' into develop

Version 1.0.8

10 years agoMerge branch 'hotfix/1.0.8' v1.0.8
Steve Sutton [Wed, 18 Mar 2015 17:31:55 +0000 (13:31 -0400)]
Merge branch 'hotfix/1.0.8'

10 years agoTurn off mobile
Steve Sutton [Wed, 18 Mar 2015 17:31:40 +0000 (13:31 -0400)]
Turn off mobile

10 years agoMerge tag 'v1.0.7' into develop
Steve Sutton [Tue, 10 Mar 2015 19:05:31 +0000 (15:05 -0400)]
Merge tag 'v1.0.7' into develop

Version 1.0.7

10 years agoMerge branch 'hotfix/1.0.7' v1.0.7
Steve Sutton [Tue, 10 Mar 2015 19:05:23 +0000 (15:05 -0400)]
Merge branch 'hotfix/1.0.7'

10 years agobump vrs # for css
Steve Sutton [Tue, 10 Mar 2015 19:05:14 +0000 (15:05 -0400)]
bump vrs # for css

10 years agoMerge tag 'v1.0.6' into develop
Steve Sutton [Tue, 10 Mar 2015 19:04:30 +0000 (15:04 -0400)]
Merge tag 'v1.0.6' into develop

Version 1.0.6

10 years agoMerge branch 'hotfix/1.0.6' v1.0.6
Steve Sutton [Tue, 10 Mar 2015 19:04:20 +0000 (15:04 -0400)]
Merge branch 'hotfix/1.0.6'

10 years agofix padding on top of bullet list
Steve Sutton [Tue, 10 Mar 2015 19:04:13 +0000 (15:04 -0400)]
fix padding on top of bullet list

10 years agoMerge tag 'v1.0.5' into develop
Steve Sutton [Fri, 20 Feb 2015 16:56:36 +0000 (11:56 -0500)]
Merge tag 'v1.0.5' into develop

Version 1.0.5

10 years agoMerge branch 'release/1.0.5' v1.0.5
Steve Sutton [Fri, 20 Feb 2015 16:56:28 +0000 (11:56 -0500)]
Merge branch 'release/1.0.5'

10 years agoOne more update on res form
Steve Sutton [Fri, 20 Feb 2015 16:55:09 +0000 (11:55 -0500)]
One more update on res form

Redo for small view the markup for the res fields

10 years agoMerge tag 'v1.0.4' into develop
Steve Sutton [Fri, 20 Feb 2015 16:39:28 +0000 (11:39 -0500)]
Merge tag 'v1.0.4' into develop

Version 1.0.4

10 years agoMerge branch 'hotfix/1.0.4' v1.0.4
Steve Sutton [Fri, 20 Feb 2015 16:39:19 +0000 (11:39 -0500)]
Merge branch 'hotfix/1.0.4'

10 years agoUpdate the reservation fields
Steve Sutton [Fri, 20 Feb 2015 16:37:44 +0000 (11:37 -0500)]
Update the reservation fields

Use the image as background instead of the extra field

10 years agoMerge tag 'v1.0.3' into develop
Steve Sutton [Fri, 20 Feb 2015 15:28:58 +0000 (10:28 -0500)]
Merge tag 'v1.0.3' into develop

Version 1.0.3

10 years agoMerge branch 'release/1.0.3' v1.0.3
Steve Sutton [Fri, 20 Feb 2015 15:28:47 +0000 (10:28 -0500)]
Merge branch 'release/1.0.3'

10 years agoMake sure res link doesn't open new window
Steve Sutton [Fri, 20 Feb 2015 15:28:04 +0000 (10:28 -0500)]
Make sure res link doesn't open new window

update the external.js file in js/custom

10 years agoMerge tag 'v1.0.2' into develop
Steve Sutton [Fri, 20 Feb 2015 15:21:17 +0000 (10:21 -0500)]
Merge tag 'v1.0.2' into develop

Version 1.0.2

10 years agoMerge branch 'release/1.0.2' v1.0.2
Steve Sutton [Fri, 20 Feb 2015 15:21:09 +0000 (10:21 -0500)]
Merge branch 'release/1.0.2'

10 years agoUpdates for changes to the reservation part
Steve Sutton [Fri, 20 Feb 2015 15:20:03 +0000 (10:20 -0500)]
Updates for changes to the reservation part

10 years agoMerge tag 'v1.0.1' into develop
Steve Sutton [Thu, 19 Feb 2015 15:59:49 +0000 (10:59 -0500)]
Merge tag 'v1.0.1' into develop

Version 1.0.1

10 years agoMerge branch 'release/1.0.1' v1.0.1
Steve Sutton [Thu, 19 Feb 2015 15:59:38 +0000 (10:59 -0500)]
Merge branch 'release/1.0.1'

10 years agoMay this will be the final one
Steve Sutton [Thu, 19 Feb 2015 15:55:23 +0000 (10:55 -0500)]
May this will be the final one

For the reservation inputs

10 years agoUpdate for small phones
Steve Sutton [Thu, 19 Feb 2015 15:46:54 +0000 (10:46 -0500)]
Update for small phones

10 years agoMerge tag 'v1.0.0' into develop
Steve Sutton [Thu, 19 Feb 2015 15:31:56 +0000 (10:31 -0500)]
Merge tag 'v1.0.0' into develop

Version 1.0.0

10 years agoMerge branch 'release/1.0.0' v1.0.0
Steve Sutton [Thu, 19 Feb 2015 15:31:44 +0000 (10:31 -0500)]
Merge branch 'release/1.0.0'

10 years agoupdate htaccess file
Steve Sutton [Thu, 19 Feb 2015 15:27:34 +0000 (10:27 -0500)]
update htaccess file

10 years agoI change reservation wrapper for mobile
Steve Sutton [Thu, 19 Feb 2015 15:16:25 +0000 (10:16 -0500)]
I change reservation wrapper for mobile

10 years agoUpdate style again for the reservation Form
Steve Sutton [Thu, 19 Feb 2015 15:11:53 +0000 (10:11 -0500)]
Update style again for the reservation Form

10 years agoMore adjustments on res form for mobile
Steve Sutton [Thu, 19 Feb 2015 15:06:45 +0000 (10:06 -0500)]
More adjustments on res form for mobile

10 years agoUpdate checkin and checkout fields
Steve Sutton [Thu, 19 Feb 2015 14:57:22 +0000 (09:57 -0500)]
Update checkin and checkout fields

10 years agoone more time with date fields
Steve Sutton [Thu, 19 Feb 2015 14:38:21 +0000 (09:38 -0500)]
one more time with date fields

10 years agoUpdate back to text
Steve Sutton [Thu, 19 Feb 2015 14:35:45 +0000 (09:35 -0500)]
Update back to text

10 years agoUpdate for placeholder
Steve Sutton [Thu, 19 Feb 2015 14:31:44 +0000 (09:31 -0500)]
Update for placeholder

10 years agoset to date type
Steve Sutton [Thu, 19 Feb 2015 14:28:45 +0000 (09:28 -0500)]
set to date type

10 years agoRedo Reservation form view and footer in mobile
Steve Sutton [Thu, 19 Feb 2015 14:22:02 +0000 (09:22 -0500)]
Redo Reservation form view and footer in mobile

For the Reservation form created two views. One for the medium and up
and one for the small only view. To change the text on the inputs and
the submit button in small view only.
Footer separate out the Name and Street part.

10 years agoBetter spacing for the javascript code
Steve Sutton [Thu, 19 Feb 2015 13:23:00 +0000 (08:23 -0500)]
Better spacing for the javascript code

Use 4 spaces per block indent

10 years agoWorking on the reservation js and css
Steve Sutton [Thu, 19 Feb 2015 13:18:09 +0000 (08:18 -0500)]
Working on the reservation js and css

10 years agoUpdate text for the res form
Steve Sutton [Wed, 18 Feb 2015 21:50:06 +0000 (16:50 -0500)]
Update text for the res form

10 years agoUpdate for medium view on the menu
Steve Sutton [Wed, 18 Feb 2015 19:58:56 +0000 (14:58 -0500)]
Update for medium view on the menu

10 years agoUpdate styles in mobile
Steve Sutton [Wed, 18 Feb 2015 19:45:58 +0000 (14:45 -0500)]
Update styles in mobile

Update the reservation part
Update the off-canvas-list section (add social and number)
Update top bar to include Menu Label
Put mixins into their own partial

10 years agoAdding files for the reservations
Steve Sutton [Wed, 18 Feb 2015 19:45:24 +0000 (14:45 -0500)]
Adding files for the reservations

These are for the styling of the reservation.troutcreek.com

10 years agoAdd image dimensions
Steve Sutton [Wed, 18 Feb 2015 15:00:24 +0000 (10:00 -0500)]
Add image dimensions

10 years agouse compressed
Steve Sutton [Wed, 18 Feb 2015 14:48:55 +0000 (09:48 -0500)]
use compressed

10 years agoMove css into app.css
Steve Sutton [Wed, 18 Feb 2015 14:43:06 +0000 (09:43 -0500)]
Move css into app.css

moving from the inline used in slideshow templates

10 years agoMore updates on the footer info line
Steve Sutton [Mon, 16 Feb 2015 19:34:48 +0000 (14:34 -0500)]
More updates on the footer info line

Redo for going into mobile view

10 years agoUpdate footer
Steve Sutton [Mon, 16 Feb 2015 18:30:59 +0000 (13:30 -0500)]
Update footer

redo with foundation inline li's

10 years agocache bust style sheet
Steve Sutton [Mon, 16 Feb 2015 17:39:31 +0000 (12:39 -0500)]
cache bust style sheet

10 years agoUpdate style for figcaption
Steve Sutton [Mon, 16 Feb 2015 17:38:37 +0000 (12:38 -0500)]
Update style for figcaption

use 12 size font

10 years agoUpdate contact form template
Steve Sutton [Mon, 16 Feb 2015 16:35:11 +0000 (11:35 -0500)]
Update contact form template

use small-11 and center

10 years agoUpdate font size for the offcanvas menu
Steve Sutton [Mon, 16 Feb 2015 16:28:09 +0000 (11:28 -0500)]
Update font size for the offcanvas menu

make rem-calc(14)

10 years agoRedo tabs to spaces
Steve Sutton [Mon, 16 Feb 2015 16:27:57 +0000 (11:27 -0500)]
Redo tabs to spaces

10 years agoSet margins on contact form and the footer
Steve Sutton [Mon, 16 Feb 2015 16:09:27 +0000 (11:09 -0500)]
Set margins on contact form and the footer

Set footer info to same margin as the footer address.
Set left and right margin to the contact id to auto.

10 years agoSet display none on lefcol on the reservation page.
Steve Sutton [Mon, 16 Feb 2015 14:06:20 +0000 (09:06 -0500)]
Set display none on lefcol on the reservation page.

10 years agouse https
Steve Sutton [Mon, 16 Feb 2015 13:22:45 +0000 (08:22 -0500)]
use https

10 years agoready for review, finally
Ian Weller [Fri, 13 Feb 2015 21:48:34 +0000 (16:48 -0500)]
ready for review, finally

10 years agoRemove Mobile Detect
Steve Sutton [Fri, 13 Feb 2015 20:40:51 +0000 (15:40 -0500)]
Remove Mobile Detect

10 years agomoving
Steve Sutton [Fri, 13 Feb 2015 20:36:28 +0000 (15:36 -0500)]
moving

10 years agoMerge branch 'feature/forms' into develop
Steve Sutton [Fri, 13 Feb 2015 20:33:04 +0000 (15:33 -0500)]
Merge branch 'feature/forms' into develop

10 years agoremove ian part
Steve Sutton [Fri, 13 Feb 2015 20:32:42 +0000 (15:32 -0500)]
remove ian part

10 years agoUpdate form
Steve Sutton [Fri, 13 Feb 2015 20:30:59 +0000 (15:30 -0500)]
Update form

missed the package form and enews

10 years agomay be complete
Ian Weller [Fri, 13 Feb 2015 20:24:56 +0000 (15:24 -0500)]
may be complete

10 years agoaction links presume complete
Ian Weller [Fri, 13 Feb 2015 15:49:38 +0000 (10:49 -0500)]
action links presume complete

10 years agourl corrections for assets references
Ian Weller [Thu, 12 Feb 2015 20:22:06 +0000 (15:22 -0500)]
url corrections for assets references

10 years agoUpdate row for the maincol to small-12
Steve Sutton [Thu, 12 Feb 2015 20:03:41 +0000 (15:03 -0500)]
Update row for the maincol to small-12

10 years agoredo
Steve Sutton [Thu, 12 Feb 2015 19:40:20 +0000 (14:40 -0500)]
redo

10 years agoMerge branch 'feature/Galleries' into develop
Steve Sutton [Thu, 12 Feb 2015 19:35:35 +0000 (14:35 -0500)]
Merge branch 'feature/Galleries' into develop

Conflicts:
css/app.css
scss/_settings.scss
scss/_structure.scss
templates/template.html

10 years agoredo buttons
Ian Weller [Thu, 12 Feb 2015 19:23:41 +0000 (14:23 -0500)]
redo buttons