diff --git a/app/Resources/HWIOAuthBundle/views/Connect/registration.html.twig b/app/Resources/HWIOAuthBundle/views/Connect/registration.html.twig index dd0aef8..dacb541 100644 --- a/app/Resources/HWIOAuthBundle/views/Connect/registration.html.twig +++ b/app/Resources/HWIOAuthBundle/views/Connect/registration.html.twig @@ -2,8 +2,7 @@ {% block body %}
- {{ dump(userInformation) }} -
+ {{ dump(form) }} {% if userInformation.resourceOwner.name == 'yahoo' %} {% set name = userInformation.nickname %} {% else %} diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index c50d679..c5cd9f2 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -15,21 +15,56 @@ {% block debug %}{% endblock %} +
-
-
+
+
+ +
+
+ +
{% include 'flash_messages.html.twig' %} + + {% include 'off_canvas.html.twig' %} {% block body %}{% endblock %} - check - check - check {% include "social_login.html.twig" %} {% block footer %}{% endblock %} +
+
+
+ + + +
+
diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig index 3677789..23fb9ba 100644 --- a/app/Resources/views/default/index.html.twig +++ b/app/Resources/views/default/index.html.twig @@ -2,28 +2,54 @@ {% extends 'base.html.twig' %} {% block body %} -
+
-
- - -
-

About Us

+
+ +
+

our story

- -
- +
+
+
+
+ +
+

RSVP

+
+
+
+ +
+

photo gallery

-
-
Small2
-
-
-
Medium
+
+ +
+

location

+
+
+
+ +
+

get in touch

+
+
+
+

Want to attend but can't make it to Oregon?

+
+
+

+ Watch us tie the knot on Facebook! We know many of you wont be here in person. so we'll be broadcasting the ceremony live. Join our wedding group on Facebook and you'll be able to see the doughnut festivities as they happen! +

+
+
+

Join Group

{% endblock %} diff --git a/app/Resources/views/off_canvas.html.twig b/app/Resources/views/off_canvas.html.twig new file mode 100644 index 0000000..e69de29 diff --git a/app/config/security.yml b/app/config/security.yml index 7fdca2a..dac9320 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -33,7 +33,7 @@ security: yahoo: /login/callback/yahoo login_path: /connect use_forward: false - failure_path: /connect + failure_path: /login oauth_user_provider: service: hwi_oauth.user.provider.fosub_bridge access_control: diff --git a/build/less/doughnut.less b/build/less/doughnut.less index 3b2f7fb..9a4b940 100644 --- a/build/less/doughnut.less +++ b/build/less/doughnut.less @@ -9,6 +9,68 @@ @base-heading-font-weight: 300; @form-background: #ffffff; +.uk-home { + + .uk-overlay { + h3 { + a { + text-decoration:none; + border:0; + letter-spacing:.15rem; + text-transform: uppercase; + &:hover { + text-shadow: #000000; + } + } + } + } + .uk-background-fade { + transition-duration: .3s; + transition-timing-function: ease-out; + transition-property: background-image,transform,filter; + } + + .uk-our-story-home { + height:465px !important; + background-image: url('/images/home_our_story_1.jpg'); + &:hover { + background-image: url('/images/home_our_story_2.jpg') + } + } + // photo + // location + .uk-photo-home { + background-image: url('/images/home_photo.jpg'); + &:hover { + + } + } + .uk-location-home { + margin-bottom:15px !important; + background-image: url('/images/home_location.jpg'); + &:hover { + + } + } + .uk-doughnut-rsvp { + margin-bottom:15px !important; + background-image: url('/images/home_doughnut_1.jpg'); + &:hover { + background-image: url('/images/home_doughnut_2.jpg'); + } + } + .uk-doughnut-get-in-touch-home { + background-image: url('/images/home_doughnut_2.jpg'); + &:hover { + background-image: url('/images/home_doughnut_1.jpg'); + } + } + + .uk-background-home { + + } +} + .uk-input, .uk-select, .uk-textarea {