diff --git a/digitalglarus/admin.py b/digitalglarus/admin.py index a83ac4ad..4f8bdcfa 100644 --- a/digitalglarus/admin.py +++ b/digitalglarus/admin.py @@ -1,15 +1,29 @@ from django.contrib import admin from .models import Supporter, DGGallery, DGPicture, Booking, BookingPrice,\ - MembershipOrder, Membership, MembershipType, BookingOrder + MembershipOrder, Membership, MembershipType, BookingOrder, BookingCancellation +from django.core.urlresolvers import reverse from utils.models import ContactMessage -# +from django.utils.html import format_html + + class DGPictureInline(admin.StackedInline): model = DGPicture + class DGGalleryAdmin(admin.ModelAdmin): inlines = [DGPictureInline] + +class BookingCancellationAdmin(admin.ModelAdmin): + list_display = ('id', 'get_order', 'created_at', 'required_refund', 'refund') + + def get_order(self, obj): + order = obj.order + order_url = reverse("admin:digitalglarus_bookingorder_change", args=[order.id]) + return format_html("{order_id}", url=order_url, order_id=order.id) + + admin.site.register(DGGallery, DGGalleryAdmin) admin.site.register(ContactMessage) admin.site.register(Booking) @@ -18,3 +32,4 @@ admin.site.register(MembershipOrder) admin.site.register(Membership) admin.site.register(MembershipType) admin.site.register(BookingOrder) +admin.site.register(BookingCancellation, BookingCancellationAdmin) diff --git a/digitalglarus/forms.py b/digitalglarus/forms.py index f5bb53aa..9dc35eed 100644 --- a/digitalglarus/forms.py +++ b/digitalglarus/forms.py @@ -8,7 +8,7 @@ from utils.models import BillingAddress from utils.forms import LoginFormMixin, SignupFormMixin, BillingAddressForm from .models import MembershipType, MembershipOrder -from .models import Booking +from .models import Booking, BookingOrder class LoginForm(LoginFormMixin): @@ -74,6 +74,21 @@ class BookingBillingForm(BillingAddressForm): } +class CancelBookingForm(forms.ModelForm): + status = forms.CharField(widget=forms.HiddenInput(), required=False) + + class Meta: + model = BookingOrder + fields = ['status'] + + # def clean(self): + # booking = self.instance.booking + # days_to_start = (booking.start_date - datetime.today().date()).days + # if days_to_start < 7: + # raise forms.ValidationError("You can't cancel your booking") + # return self.cleaned_data + + class BookingDateForm(forms.Form): start_date = forms.DateField(required=False, widget=forms.TextInput(attrs={'id': 'booking-date-1', diff --git a/digitalglarus/migrations/0023_bookingorder_status.py b/digitalglarus/migrations/0023_bookingorder_status.py new file mode 100644 index 00000000..80f6cd83 --- /dev/null +++ b/digitalglarus/migrations/0023_bookingorder_status.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-11-25 03:04 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('digitalglarus', '0022_auto_20161023_0218'), + ] + + operations = [ + migrations.AddField( + model_name='bookingorder', + name='status', + field=models.PositiveIntegerField(choices=[(1, 'Approved'), (2, 'Cancelled')], default=1), + ), + ] diff --git a/digitalglarus/migrations/0024_bookingcancellation.py b/digitalglarus/migrations/0024_bookingcancellation.py new file mode 100644 index 00000000..70c8a23a --- /dev/null +++ b/digitalglarus/migrations/0024_bookingcancellation.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-12-02 02:22 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('digitalglarus', '0023_bookingorder_status'), + ] + + operations = [ + migrations.CreateModel( + name='BookingCancellation', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_at', models.DateTimeField(auto_now=True)), + ('required_refund', models.BooleanField(default=True)), + ('refund', models.BooleanField(default=False)), + ('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='digitalglarus.BookingOrder')), + ], + ), + ] diff --git a/digitalglarus/mixins.py b/digitalglarus/mixins.py index 5392ad37..7c214e14 100644 --- a/digitalglarus/mixins.py +++ b/digitalglarus/mixins.py @@ -1,5 +1,11 @@ +from django.core.urlresolvers import reverse_lazy +from django.contrib.auth.mixins import LoginRequiredMixin +from django.views.generic import UpdateView from django.db import models from django.http import HttpResponseRedirect +from django.contrib import messages + + from membership.models import StripeCustomer from utils.models import BillingAddress @@ -50,3 +56,27 @@ class Ordereable(models.Model): instance.cc_brand = stripe_charge.source.brand instance.save() return instance + + +class ChangeMembershipStatusMixin(LoginRequiredMixin, UpdateView): + success_message = None + success_url = reverse_lazy('digitalglarus:membership_orders_list') + login_url = reverse_lazy('digitalglarus:login') + fields = '__all__' + + def get_object(self): + from .models import MembershipOrder + membership_order = MembershipOrder.objects.\ + filter(customer__user=self.request.user).last() + if not membership_order: + raise AttributeError("Membership does not exists") + membership = membership_order.membership + return membership + + def post(self, *args, **kwargs): + membership = self.get_object() + membership.activate() + + messages.add_message(self.request, messages.SUCCESS, self.success_message) + + return HttpResponseRedirect(self.success_url) diff --git a/digitalglarus/models.py b/digitalglarus/models.py index 876df6d7..26ecb4ff 100644 --- a/digitalglarus/models.py +++ b/digitalglarus/models.py @@ -65,6 +65,19 @@ class Membership(models.Model): start_date = models.DateField() end_date = models.DateField() + @classmethod + def get_current_membership(cls, user): + + has_order_current_month = Q(membershiporder__customer__user=user, + membershiporder__created_at__month=datetime.today().month) + # import pdb;pdb.set_trace() + return cls.objects.\ + filter(has_order_current_month).last() + + # def get_current_active_membership(cls, user): + # membership = cls.get_current_membership(user) + # return membership if membership and membership.active else None + @classmethod def get_by_user(cls, user): return cls.objects.\ @@ -75,15 +88,23 @@ class Membership(models.Model): instance = cls.objects.create(**data) return instance + @classmethod + def activate_or_crete(cls, data, user): + membership = cls.get_by_user(user) + membership_id = membership.id if membership else None + obj, created = cls.objects.update_or_create(id=membership_id, defaults=data) + return obj + @classmethod def is_digitalglarus_active_member(cls, user): - past_month = (datetime.today() - relativedelta(months=1)).month + # past_month = (datetime.today() - relativedelta(months=1)).month has_order_current_month = Q(membershiporder__customer__user=user, membershiporder__created_at__month=datetime.today().month) - has_order_past_month = Q(membershiporder__customer__user=user, - membershiporder__created_at__month=past_month) + # has_order_past_month = Q(membershiporder__customer__user=user, + # membershiporder__created_at__month=past_month) active_membership = Q(active=True) - return cls.objects.filter(has_order_past_month | has_order_current_month).\ + # return cls.objects.filter(has_order_past_month | has_order_current_month).\ + return cls.objects.filter(has_order_current_month).\ filter(active_membership).exists() def update_dates(self, start_date, end_date): @@ -95,6 +116,10 @@ class Membership(models.Model): self.active = False self.save() + def activate(self): + self.active = True + self.save() + class MembershipOrder(Ordereable, models.Model): membership = models.ForeignKey(Membership) @@ -213,9 +238,18 @@ class Booking(models.Model): class BookingOrder(Ordereable, models.Model): + + APPROVED, CANCELLED = range(1, 3) + + STATUS_CHOICES = ( + (APPROVED, 'Approved'), + (CANCELLED, 'Cancelled') + ) + booking = models.OneToOneField(Booking) original_price = models.FloatField() special_month_price = models.FloatField() + status = models.PositiveIntegerField(choices=STATUS_CHOICES, default=1) @classmethod def user_has_not_bookings(cls, user): @@ -230,6 +264,30 @@ class BookingOrder(Ordereable, models.Model): def booking_days(self): return (self.booking.end_date - self.booking.start_date).days + 1 + def refund_required(self): + days_to_start = (self.booking.start_date - datetime.today().date()).days + return True if days_to_start < 7 else False + + def cancel(self): + self.status = self.CANCELLED + self.save() + + +class BookingCancellation(models.Model): + + order = models.ForeignKey(BookingOrder) + created_at = models.DateTimeField(auto_now=True) + required_refund = models.BooleanField(default=True) + refund = models.BooleanField(default=False) + + def __str__(self): + return "Order: {} - Required Refund: {}".format(self.order.id, self.refund) + + @classmethod + def create(cls, booking_order): + required_refund = booking_order.refund_required() + cls.objects.create(order=booking_order, required_refund=required_refund) + class Supporter(models.Model): name = models.CharField(max_length=200) diff --git a/digitalglarus/static/digitalglarus/css/agency.css b/digitalglarus/static/digitalglarus/css/agency.css index 67154295..f66ce70c 100755 --- a/digitalglarus/static/digitalglarus/css/agency.css +++ b/digitalglarus/static/digitalglarus/css/agency.css @@ -67,6 +67,12 @@ h6 { font-size: 18px; } +@media only screen and (max-width: 400px){ + h1, h2 { + font-size: 20px; + } +} + .portfolio-caption-white { text-transform: uppercase; font-family:"Montserrat","Helvetica Neue",Helvetica, Arial,sans-serif; @@ -118,7 +124,7 @@ h6 { border-color: #88c7d7; text-transform: uppercase; font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; - font-weight: 700; + font-weight: 400; color: #fff; background-color: #88c7d7; letter-spacing: 1px; @@ -131,7 +137,7 @@ h6 { .btn-primary.active, .open .dropdown-toggle.btn-primary { text-transform: uppercase; - font-weight: 700; + font-weight: 400; border-color: #ba1924; color: #fff; background-color: #ba1924; @@ -241,8 +247,6 @@ fieldset[disabled] .btn-xl.active { .navbar-default .navbar-collapse { border-color: rgba(255,255,255,.02); - padding-right: 100px; - text-align: right; } .navbar-default .navbar-toggle { @@ -261,7 +265,7 @@ fieldset[disabled] .btn-xl.active { .navbar-default .nav li a { text-transform: uppercase; - font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; font-weight: 400; letter-spacing: 1px; color: #fff; @@ -1076,7 +1080,7 @@ h6 intro-smallcap { .carousel-text { text-transform : none; - font-family:"Raleway" , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-famil:"Raleway" , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; font-size : 20px; font-weight : 100; lign-heignt: 2px; @@ -1172,11 +1176,11 @@ footer { } .map-caption{ - text-transform:uppercase; - font-size: 13px; + text-transform: none; font-family:"Montserrat","Helvetica Neue",Helvetica, Arial,sans-serif; font-weight: 400; color: #ffffff; + font-size: 14px; letter-spacing: 1px; text-align:center; } @@ -1201,4 +1205,33 @@ hr { .navbar-right { float: right!important; margin-right: -100px; -} \ No newline at end of file +} + +.help-box { + padding: 2em; + padding-top: 2em; + padding-bottom: 0.1em; + margin-bottom: 0px; +} + +.help-box-group { + padding-top: 2em; + padding-bottom: 2.5em; +} + +.submit-box { + padding-top: 1.5em; + padding-bottom: 2em; +} + +.help-wrap { + padding-bottom: 2em; + padding-left: 4em; + padding-right: 4em; + padding-top: 2em; +} + +.donate { + font-weight: 600; + font-size: 24px; +} diff --git a/digitalglarus/static/digitalglarus/css/agency1.css b/digitalglarus/static/digitalglarus/css/agency1.css new file mode 100755 index 00000000..67154295 --- /dev/null +++ b/digitalglarus/static/digitalglarus/css/agency1.css @@ -0,0 +1,1204 @@ +/*! + * Start Bootstrap - Agency Bootstrap Theme (http://startbootstrap.com) + * Code licensed under the Apache License v2.0. + * For details, see http://www.apache.org/licenses/LICENSE-2.0. + */ + +body { + overflow-x: hidden; + font-family: "Raleway" , "Helvetica Neue",Helvetica,Arial,sans-serif; +} + +.text-muted { + color: #494949; + font-family: 'Raleway' , "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; +} + +.text-primary { + color: #a1cfd7; +} + +p { + font-size: 14px; + line-height: 1.75; + color: #494949; + font-family: "Raleway" , "Helvetica Neue", Helvetica, Arial, sans-serif; +} + +p.large { + font-size: 16px; +} + +a, +a:hover, +a:focus, +a:active, +a.active { + outline: 0; +} + +a { + color: #a1cfd7; +} + +a:hover, +a:focus, +a:active, +a.active { + color: #fff; + font-style: normal; + text-transform: none; +} + +aside { + padding: 50px 0; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + text-transform: uppercase; + font-family:'Raleway', Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-weight: 400; + color: #494949; + font-size: 18px; +} + +.portfolio-caption-white { + text-transform: uppercase; + font-family:"Montserrat","Helvetica Neue",Helvetica, Arial,sans-serif; + font-weight: 400; + color: #ffffff; + font-size: 18px; + letter-spacing: 1px; + width: 100%; + text-align: center; + position: absolute; + top: 50%; + transform: translateY(-50%); +} + +.aside-caption-white { + text-transform: none; + font-family:"Raleway", "Montserrat","Helvetica Neue",Helvetica, Arial,sans-serif; + font-weight: 200; + color: #ffffff; + font-size: 26px; + letter-spacing: 1px; +} + +.img-centered { + margin: 0 auto; +} + +.bg-light-gray { + background-color: #f7f7f7; +} + +.bg-dark { + background-color: #0f1221; + background-image: url(../img/bg-glarus.png); + background-position: center center; + background-repeat: none; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; + color: white; +} + +.bg-darkest-gray { + background-color: #222; +} + +.btn-primary { + border-color: #88c7d7; + text-transform: uppercase; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-weight: 700; + color: #fff; + background-color: #88c7d7; + letter-spacing: 1px; + padding-right: 10px; +} + +.btn-primary:hover, +.btn-primary:focus, +.btn-primary:active, +.btn-primary.active, +.open .dropdown-toggle.btn-primary { + text-transform: uppercase; + font-weight: 700; + border-color: #ba1924; + color: #fff; + background-color: #ba1924; +} + +.btn-primary:active, +.btn-primary.active, +.open .dropdown-toggle.btn-primary { + background-image: none; +} + +.btn-primary.disabled, +.btn-primary[disabled], +fieldset[disabled] .btn-primary, +.btn-primary.disabled:hover, +.btn-primary[disabled]:hover, +fieldset[disabled] .btn-primary:hover, +.btn-primary.disabled:focus, +.btn-primary[disabled]:focus, +fieldset[disabled] .btn-primary:focus, +.btn-primary.disabled:active, +.btn-primary[disabled]:active, +fieldset[disabled] .btn-primary:active, +.btn-primary.disabled.active, +.btn-primary[disabled].active, +fieldset[disabled] .btn-primary.active { + border-color: #a1cfd7; + background-color: #a1cfd7; +} + +.btn-primary .badge { + color: #a1cfd7; + background-color: #fff; +} + +.btn-xl { + padding: 20px 40px; + border-color: #a1cfd7; + border-radius: 3px; + text-transform: uppercase; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 18px; + font-weight: 700; + color: #fff; + background-color: #a1cfd7; +} + +.btn-xl:hover, +.btn-xl:focus, +.btn-xl:active, +.btn-xl.active, +.open .dropdown-toggle.btn-xl { + border-color: #f6bf01; + color: #fff; + background-color: #fec503; +} + +.btn-xl:active, +.btn-xl.active, +.open .dropdown-toggle.btn-xl { + background-image: none; +} + +.btn-xl.disabled, +.btn-xl[disabled], +fieldset[disabled] .btn-xl, +.btn-xl.disabled:hover, +.btn-xl[disabled]:hover, +fieldset[disabled] .btn-xl:hover, +.btn-xl.disabled:focus, +.btn-xl[disabled]:focus, +fieldset[disabled] .btn-xl:focus, +.btn-xl.disabled:active, +.btn-xl[disabled]:active, +fieldset[disabled] .btn-xl:active, +.btn-xl.disabled.active, +.btn-xl[disabled].active, +fieldset[disabled] .btn-xl.active { + border-color: #a1cfd7; + background-color: #a1cfd7; +} + +.btn-xl .badge { + color: #fed136; + background-color: #fff; +} + +.navbar-default { + border-color: transparent; + background-color: #0f1221; + padding-top: 3px; + padding-bottom: 3px; +} + +.navbar-default .navbar-brand { + font-family: "Helvetica Neue", Helvetica, Arial, cursive; + color: #a1cfd7; + padding-top: 10px; +} + +.navbar-default .navbar-brand:hover, +.navbar-default .navbar-brand:focus, +.navbar-default .navbar-brand:active, +.navbar-default .navbar-brand.active { + color: #fec503; +} + +.navbar-default .navbar-collapse { + border-color: rgba(255,255,255,.02); + padding-right: 100px; + text-align: right; +} + +.navbar-default .navbar-toggle { + border-color: #a1cfd7; + background-color: #a1cfd7; +} + +.navbar-default .navbar-toggle .icon-bar { + background-color: #fff; +} + +.navbar-default .navbar-toggle:hover, +.navbar-default .navbar-toggle:focus { + background-color: #a1cfd7; +} + +.navbar-default .nav li a { + text-transform: uppercase; + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; + font-weight: 400; + letter-spacing: 1px; + color: #fff; +} + +.navbar-default .nav li a:hover, +.navbar-default .nav li a:focus { + outline: 0; + color: #a1cfd7; +} + +.navbar-default .navbar-nav>.active>a { + border-radius: 0; + color: #fff; + background-color: transparent; +} + +.navbar-default .navbar-nav>.active>a:hover, +.navbar-default .navbar-nav>.active>a:focus { + color: #fff; + background-color: transparent; +} + +@media(min-width:768px) { + .navbar-default { + padding: 5px 0; + border: 0; + background-color: transparent; + -webkit-transition: padding .3s; + -moz-transition: padding .3s; + transition: padding .3s; + } + + .navbar-default .navbar-brand { + font-size: 2em; + -webkit-transition: all .3s; + -moz-transition: all .3s; + transition: all .3s; + } + + .navbar-default .navbar-nav>.active>a { + border-radius: 3px; + } + + .navbar-default.navbar-shrink { + padding: 10px 0; + background-color: #0f1221; + } + + .navbar-default.navbar-shrink .navbar-brand { + font-size: 1.5em; + } +} + +header { + text-align: center; + color: #fff; + background-attachment: scroll; + background-image: url(../img/header_bg_2.png); + background-position: center center; + background-repeat: none; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; +} + + +header .intro-text { + padding-top: 100px; + padding-bottom: 50px; +} + +header .intro-text .intro-lead-in { + margin-bottom: 25px; + font-family: 'Raleway', "Droid Serif","Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 22px; + font-style: italic; + line-height: 22px; +} + +header .intro-text .intro-heading { + margin-bottom: 25px; + text-transform: uppercase; + font-family: 'Raleway', Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 50px; + font-weight: 700; + line-height: 50px; +} + +@media(min-width:768px) { + header .intro-text { + padding-top: 200px; + padding-bottom: 200px; + } + + header .intro-text .intro-lead-in { + margin-bottom: 25px; + font-family: "Open Sans Extrabold", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 40px; + line-height: 40px; + font-style: normal; + } + + header .intro-text .intro-heading { + margin-bottom: 50px; + text-transform: uppercase; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 75px; + font-weight: 700; + line-height: 75px; + } +} +/* +section { + padding: 100px 0; +} +*/ +section h2.section-heading { + margin-top: 0; + margin-bottom: 15px; + font-size: 36px; + color: #494949; +} + +section h3.section-subheading { + margin-bottom: 50px; + text-transform: none; + font-family: 'Raleway', "Helvetica Neue", "Open Sans", "Droid Serif", Helvetica, Arial, sans-serif; + font-size: 18px; + font-weight: 400; + color: #494949; + line-height: normal; +} +/* +@media(min-width:768px) { + section { + padding: 50px 0; + } +} +*/ +.service-heading { + margin: 15px 0; + text-transform: none; + font-family: 'Raleway Semi-Bold 600', "Open Sans Extrabold", Montserrat, "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #7f8c8c; +} + +.no-padding { + padding:0; +} + +.no-gutter > [class*='col-'] { + padding-top:0; + padding-bottom:0; + padding-right:0; + padding-left:0; +} + +section#portfolio { + background-color: #0f1221; +} + +#portfolio .portfolio-item { + right: 0; + margin: 0; + text-align: center; + display: block; + max-width: 650px; +} +#portfolio .portfolio-item:hover { + opacity: 1; +} + +#portfolio .portfolio-item .portfolio-link { + display: block; + position: relative; + margin: 0 auto; + max-width: 400px; +} + +#portfolio .portfolio-item .portfolio-link .portfolio-hover { + position: absolute; + width: 100%; + height: 100%; + opacity: 1; + background: rgba(254,209,54,.9); + -webkit-transition: all ease .5s; + -moz-transition: all ease .5s; + transition: all ease .5s; +} + +#portfolio .portfolio-item .portfolio-link .portfolio-hover:hover { + opacity: 1; +} + +#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content { + position: absolute; + top: 50%; + width: 100%; + height: 20px; + margin-top: -12px; + text-align: center; + font-size: 20px; + color: #fff; +} + +#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content i { + margin-top: -12px; +} + +#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content h3, +#portfolio .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content h4 { + margin: 0; +} + +#portfolio .portfolio-item .portfolio-caption { + padding: 25px; + max-width: 400px; + text-align: center; + background-color: #fff; +} + +#portfolio .portfolio-item .portfolio-caption h4 { + margin: 0; + font-size: bold; + text-transform: none; + color: #494949; +} + +#portfolio .portfolio-item .portfolio-caption p { + margin: 0; + font-family: "Raleway", "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; +} + +#portfolio * { + z-index: 2; +} + +.inline-block { + display: inline-block +} + +@media(min-width:767px) { + #portfolio .portfolio-item { + margin: 0 + } +} + +.timeline { + position: relative; + padding: 0; + list-style: none; +} + +.timeline:before { + content: ""; + position: absolute; + top: 0; + bottom: 0; + left: 40px; + width: 2px; + margin-left: -1.5px; + background-color: #f1f1f1; +} + +.timeline>li { + position: relative; + margin-bottom: 50px; + min-height: 50px; +} + +.timeline>li:before, +.timeline>li:after { + content: " "; + display: table; +} + +.timeline>li:after { + clear: both; +} + +.timeline>li .timeline-panel { + float: right; + position: relative; + width: 100%; + padding: 0 20px 0 100px; + text-align: left; +} + +.timeline>li .timeline-panel:before { + right: auto; + left: -15px; + border-right-width: 15px; + border-left-width: 0; +} + +.timeline>li .timeline-panel:after { + right: auto; + left: -14px; + border-right-width: 14px; + border-left-width: 0; +} + +.timeline>li .timeline-image { + z-index: 100; + position: absolute; + left: 0; + width: 80px; + height: 80px; + margin-left: 0; + border: 7px solid #f1f1f1; + border-radius: 100%; + text-align: center; + color: #fff; + background-color: #a1cfd7; +} + +.timeline>li .timeline-image h4 { + margin-top: 12px; + font-size: 10px; + line-height: 14px; +} + +.timeline>li.timeline-inverted>.timeline-panel { + float: right; + padding: 0 20px 0 100px; + text-align: left; +} + +.timeline>li.timeline-inverted>.timeline-panel:before { + right: auto; + left: -15px; + border-right-width: 15px; + border-left-width: 0; +} + +.timeline>li.timeline-inverted>.timeline-panel:after { + right: auto; + left: -14px; + border-right-width: 14px; + border-left-width: 0; +} + +.timeline>li:last-child { + margin-bottom: 0; +} + +.timeline .timeline-heading h4 { + margin-top: 0; + color: inherit; +} + +.timeline .timeline-heading h4.subheading { + text-transform: none; +} + +.timeline .timeline-body>p, +.timeline .timeline-body>ul { + margin-bottom: 0; +} + +@media(min-width:768px) { + .timeline:before { + left: 50%; + } + + .timeline>li { + margin-bottom: 100px; + min-height: 100px; + } + + .timeline>li .timeline-panel { + float: left; + width: 41%; + padding: 0 20px 20px 30px; + text-align: right; + } + + .timeline>li .timeline-image { + left: 50%; + width: 100px; + height: 100px; + margin-left: -50px; + } + + .timeline>li .timeline-image h4 { + margin-top: 16px; + font-size: 12px; + line-height: 18px; + } + + .timeline>li.timeline-inverted>.timeline-panel { + float: right; + padding: 0 30px 20px 20px; + text-align: left; + } +} + +@media(min-width:992px) { + .timeline>li { + min-height: 150px; + } + + .timeline>li .timeline-panel { + padding: 0 20px 20px; + } + + .timeline>li .timeline-image { + width: 150px; + height: 150px; + margin-left: -75px; + } + + .timeline>li .timeline-image h4 { + margin-top: 30px; + font-size: 18px; + line-height: 26px; + } + + .timeline>li.timeline-inverted>.timeline-panel { + padding: 0 20px 20px; + } +} + +@media(min-width:1200px) { + .timeline>li { + min-height: 170px; + } + + .timeline>li .timeline-panel { + padding: 0 20px 20px 100px; + } + + .timeline>li .timeline-image { + width: 170px; + height: 170px; + margin-left: -85px; + } + + .timeline>li .timeline-image h4 { + margin-top: 40px; + } + + .timeline>li.timeline-inverted>.timeline-panel { + padding: 0 100px 20px 20px; + } +} + +.team-member { + margin-bottom: 0px; + text-align: center; +} + +.team-member img { + margin: 0 auto; + border: 7px solid #fff; +} + +.team-member h4 { + margin-top: 25px; + margin-bottom: 0; + text-transform: none; +} + +.team-member p { + margin-top: 0; +} + +aside.clients img { + margin: 50px auto; +} + +section#contact { + background-color: #222; + background-image: url(../img/map-image.png); + background-position: center; + background-repeat: no-repeat; +} + +section#contact .section-heading { + padding-top: 40px; + padding-bottom: 40px; + color: #fff; + font-size: 36px; + letter-spacing: 2px; +} + +section#contact .form-group { + margin-bottom: 25px; +} + +section#contact .form-group input, +section#contact .form-group textarea { + padding: 20px; +} + +section#contact .form-group input.form-control { + height: auto; +} + +section#contact .form-group textarea.form-control { + height: 236px; +} + +section#contact .form-control:focus { + border-color: #a1cfd7; + box-shadow: none; +} + +section#contact::-webkit-input-placeholder { + text-transform: uppercase; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-weight: 700; + color: #bbb; +} + +section#contact:-moz-placeholder { + text-transform: uppercase; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-weight: 700; + color: #bbb; +} + +section#contact::-moz-placeholder { + text-transform: uppercase; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-weight: 700; + color: #bbb; +} + +section#contact:-ms-input-placeholder { + text-transform: uppercase; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-weight: 700; + color: #bbb; +} + +section#contact .text-danger { + color: #e74c3c; +} + +footer { + padding: 25px 0; + text-align: center; +} + +footer span.copyright { + text-transform: uppercase; + text-transform: none; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + line-height: 40px; +} + +footer ul.quicklinks { + margin-bottom: 0; + text-transform: uppercase; + text-transform: none; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + line-height: 40px; +} + +ul.social-buttons { + margin-bottom: 0; +} + +ul.social-buttons li a { + display: block; + width: 40px; + height: 40px; + border-radius: 100%; + font-size: 20px; + line-height: 40px; + outline: 0; + color: #fff; + background-color: #222; + -webkit-transition: all .3s; + -moz-transition: all .3s; + transition: all .3s; +} + +ul.social-buttons li a:hover, +ul.social-buttons li a:focus, +ul.social-buttons li a:active { + background-color: #a1cfd7; +} + +.btn:focus, +.btn:active, +.btn.active, +.btn:active:focus { + outline: 0; +} + +.portfolio-modal .modal-content { + padding: 100px 0; + min-height: 100%; + border: 0; + border-radius: 0; + text-align: center; + background-clip: border-box; + -webkit-box-shadow: none; + box-shadow: none; +} + +.portfolio-modal .modal-content h2 { + margin-bottom: 15px; + font-size: 3em; +} + +.portfolio-modal .modal-content p { + margin-bottom: 30px; +} + +.portfolio-modal .modal-content p.item-intro { + margin: 20px 0 30px; + font-family: "Droid Serif","Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 16px; + font-style: italic; +} + +.portfolio-modal .modal-content ul.list-inline { + margin-top: 0; + margin-bottom: 30px; +} + +.portfolio-modal .modal-content img { + margin-bottom: 30px; +} + +.portfolio-modal .close-modal { + position: absolute; + top: 25px; + right: 25px; + width: 75px; + height: 75px; + background-color: transparent; + cursor: pointer; +} + +.portfolio-modal .close-modal:hover { + opacity: .3; +} + +.portfolio-modal .close-modal .lr { + z-index: 1051; + width: 1px; + height: 75px; + margin-left: 35px; + background-color: #222; + -webkit-transform: rotate(45deg); + -ms-transform: rotate(45deg); + transform: rotate(45deg); +} + +.portfolio-modal .close-modal .lr .rl { + z-index: 1052; + width: 1px; + height: 75px; + background-color: #222; + -webkit-transform: rotate(90deg); + -ms-transform: rotate(90deg); + transform: rotate(90deg); +} + +::-moz-selection { + text-shadow: none; + background: #a1cfd7; +} + +::selection { + text-shadow: none; + background: #a1cfd7; +} + +img::selection { + background: 0 0; +} + +img::-moz-selection { + background: 0 0; +} + +body { + webkit-tap-highlight-color: #a1cfd7; +} + +section h3.section-comment { + margin-bottom: 75px; + text-transform: none; + font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-style:italic + font-size: 18px; + font-weight: 400; + color: #494949; +} + +small-comment { + font-family: "Open Sans", "Droid Serif", "Helvetica Neue", Helvetica, Arial, sans-serif; + margin-bottom: none; + font-transform: none; + font-size:10px; + font-weight:400; + color: #777 +} + +logo-image { + z-index: 100; + position: absolute; + left: 0; + width: 80px; + height: 80px; + margin-left: 0; + border: 7px solid #f1f1f1; + border-radius: 100%; + text-align: center; + color: #fff; + background-color: #a1cfd7; +} + + +intro-cap { + margin-bottom: 25px; + text-transform: uppercase; + font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; + font-size: 24px; + font-weight: 400; + line-height: 50px; + color:#fff + background-color: #a1cfd7; +} +.intro-small { + font-family: 'Montserrat' ,'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; + font-size: 20px; + font-style: normal; + font-weight: 100; + text-transform: uppercase; + color: #FFF; +} +intro-headline { + margin-bottom: 25px; + text-transform: uppercase; + font-family: 'Raleway', "Helvetica Neue", "Helvetica Neue", Helvetica,Arial,sans-serif; + font-size: 24px; + font-weight: 400; + line-height: 100px; + color:#fff + background-color: #a1cfd7; +} +h6 intro-smallcap { + margin-bottom: 25px; + text-transform: none; + font-family:'Raleway' , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 18px; + font-weight: 400; + line-height: 50px; + color:#fff + background-color: #a1cfd7; +} +.darkened-container { + /* Fallback for web browsers that doesn't support RGBa */ + background: rgb(0, 0, 0); +/* RGBa with 0.6 opacity */ + background: rgba(0, 0, 0, 0.5); + /* bottom:0; */ + /* left:0; */ + padding-bottom: 30px; + /* padding-top: 30px; */ + /* bottom: 0px: */ + /* position: absolute; */ + /* right: 0; */ + /* bottom 10px; + box-sizing: border-box; + font-size: 14px; + line-height: 1.43; + height: 86px; /* this is wrong */ + /*color: #484848;*/ +} + +.carousel-indicators li { + display: inline-block; + width: 5px; + height: 5px; + margin: 10px; + text-indent: -999px; + cursor: pointer; + color: #fff; + opacity: .45; + padding: 1px; + border: 0; + background-color: #fff; + border-radius: 10px; + font-size: 6px; +} + +.carousel-indicators li.active, .text-carousel .carousel-indicators li.active { + display: inline-block; + width: 5px; + height: 5px; + margin: 10px; + cursor: pointer; + padding: 1px; + border: 0; + color: #fff; + opacity: .8; +} +@media (min-width: 740px) +.carousel-inner, .text-carousel .carousel-inner { + min-height: 225px; +} + +.carousel-text { + text-transform : none; + font-family:"Raleway" , Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-size : 20px; + font-weight : 100; + lign-heignt: 2px; + color : #666; + text-align : center; +} +/* +.caption { + width: 100%; + text-align: center; + position: absolute; + top: 50%; + transform: translateY(-50%); +} +*/ + +.call-to-action h2 { + margin: 0 auto 20px; +} +/* + * Start Bootstrap - Half Slider (http://startbootstrap.com/) + * Copyright 2013-2016 Start Bootstrap + * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE) + */ + +html, +body { + height: 100%; +} + + +/* You can change the height of the carousel by changing the height in the class below. It is set to 50% by default, but can be any height! */ + +.carousel { + height: 80%; +} + +.item, +.active, +.carousel-inner { + height: 100%; +} + +.carousel-caption-text { + font-family: Raleway, Montserrat, Helvetica Neue, Helvetica, sans-serif; + font-weight: 200; + text-transform: None; + color: #fff; + letter-spacing: 2px; + text-align: left; + line-height: 1.25; + left: 7%; + padding-bottom: 50px; +} + +.carousel-positioned { + position: 50%; + font-size: 30px +} + +.carousel-control { + height: 100%; + +} +/* Background images are set within the HTML using inline CSS, not here */ + +.fill { + width: 100%; + height: 100%; + background-position: center; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; +} +/* +footer { + margin: 50px 0; +}*/ + +.map-responsive{ + overflow:hidden; + padding-bottom:56.25%; + position:relative; + height:0; +} +.map-responsive iframe{ + left:0; + top:0; + height:100%; + width:100%; + position:absolute; +} + +.map-caption{ + text-transform:uppercase; + font-size: 13px; + font-family:"Montserrat","Helvetica Neue",Helvetica, Arial,sans-serif; + font-weight: 400; + color: #ffffff; + letter-spacing: 1px; + text-align:center; +} + +.map-title{ + text-transform: none; + font-family:"Montserrat","Helvetica Neue",Helvetica, Arial,sans-serif; + font-weight: 400; + color: #a1cfd7; + font-size: 18px; + letter-spacing: 1px; + text-align:left; + padding-top: 30px; +} + +hr { + border-color: #88c7d7; + border-width: 3px; + max-width: 50px; +} + +.navbar-right { + float: right!important; + margin-right: -100px; +} \ No newline at end of file diff --git a/digitalglarus/static/digitalglarus/css/history.css b/digitalglarus/static/digitalglarus/css/history.css index d484ddd1..91de1abf 100644 --- a/digitalglarus/static/digitalglarus/css/history.css +++ b/digitalglarus/static/digitalglarus/css/history.css @@ -1,11 +1,11 @@ @charset "UTF-8"; /* CSS Document */ -header.history { +header { text-align: center; color: #fff; background-attachment: scroll; - background-image: url(../img/header_bg_4.png); + background-image: url(../img/header_bg_2.png); background-position: center center; background-repeat: none; -webkit-background-size: cover; @@ -14,64 +14,294 @@ header.history { -o-background-size: cover; } -.supporter { - font-size:18px; - font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif; - text-align:center; - line-height: 2.5; +header.history { + background-image: url(../img/header_bg_4.png); +} + + +.supportus { + background-image: url(../img/bal_header.png); + text-align: center; color: #fff; + background-attachment: scroll; + background-position: center center; + background-repeat: none; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; + display: block; + overflow-x: hidden; +} + +.supportus .intro-text { + padding-top: 100px; + padding-bottom: 50px; +} + +.supportus .intro-text .intro-lead-in { + margin-bottom: 25px; + font-family: 'Raleway', "Droid Serif","Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 22px; + font-style: italic; + line-height: 22px; +} + +.supportus .intro-text .intro-heading { + margin-bottom: 25px; + text-transform: uppercase; + font-family: 'Raleway', Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 50px; + font-weight: 700; + line-height: 50px; +} + +.supportus .intro-headline-big { + font-family: 'Raleway' , "Open Sans Bold", Helvetica, Arial, "Arial Bold", sans-serif; + font-size: 2.6em; + font-style: normal; + font-weight: 200; + text-transform: none; + text-transform: uppercase; + color: #fff; +} +@media(min-width : 320px) { + .supportus .intro-text { + padding-top: 200px; + padding-bottom: 200px; + } + + .supportus .intro-text .intro-lead-in { + margin-bottom: 25px; + font-family: "Open Sans Extrabold", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 40px; + line-height: 40px; + font-style: normal; + } + + .supportus .intro-text .intro-heading { + margin-bottom: 50px; + text-transform: uppercase; + font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 75px; + font-weight: 700; + line-height: 75px; +} +.supportus .intro-headline-big { + font-family: 'Raleway', "Open Sans Bold", Helvetica, Arial, "Arial Bold", + font-size: 2.6em; + font-style: normal; + font-weight: 800; + text-transform: uppercase; + color: #ffffff; + line-height: 1; + opacity: 0.85; + +} + +.supportus-box { + border-style: solid; + border-width: 1px; + border-color: #ddd; + margin-left: 15px; + margin-right: 15px; + padding-left: 0; + padding-right: 0; +} + +/*.supportus .portfolio-item { + right: 0; + margin: 0; + text-align: center; + display: block; + max-width: 650px; + border: 1px; + border-color: #ddd; +} + +.supportus .portfolio-item:hover { + opacity: 1; +} + +.supportus .portfolio-item .portfolio-link { + display: block; + position: relative; + margin: 0 auto; + max-width: 400px; +} + +.supportus .portfolio-item .portfolio-link .portfolio-hover { + position: absolute; + width: 100%; + height: 100%; + opacity: 1; + background: rgba(254,209,54,.9); + -webkit-transition: all ease .5s; + -moz-transition: all ease .5s; + transition: all ease .5s; +} +.supportus .portfolio-item .portfolio-link .portfolio-hover:hover { + opacity: 1; +} + +.supportus .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content { + position: absolute; + top: 50%; + width: 100%; + height: 20px; + margin-top: -12px; + text-align: center; + font-size: 20px; + color: #fff; +} + +.supportus .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content i { + margin-top: -12px; +} +.supportus .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content h3, +.supportus .portfolio-item .portfolio-link .portfolio-hover .portfolio-hover-content h4 { + margin: 0; +} + +.supportus .portfolio-item .portfolio-caption { + padding: 25px; + max-width: 400px; + text-align: center; + background-color: #fff; +} + +.supportus .portfolio-item .portfolio-caption h4 { + margin: 0; + font-size: bold; + text-transform: none; + color: #494949; +} + +.supportus .portfolio-item .portfolio-caption p { + margin: 0; + font-family: "Raleway", "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; +} + +.supportus * { + z-index: 2; +} + +@media(min-width:767px) { + .supportus .portfolio-item { + margin: 0 + } +} +*/ + +.supporter-lead { + padding: 15px 5px 15px; + color: #000; + font-size:18px; + font-weight: 200; + font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif; + text-align:center; + line-height: 1.6; +} + +.white-background { + background-color: #fff; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; + color: #777; +} + +.whatwedowith { + margin-top: 50px; + margin-bottom: 0px; + padding-top: 3em; + padding-bottom: 3em; + background-image: url(../img/bricks_header_inverse.png); + background-size: cover; + background-repeat:no-repeat; + -webkit-background-size:cover; + -moz-background-size:cover; + -o-background-size:cover; + background-position:center; +} + +.www { + margin-top: 3em; + margin-bottom: 15px; + font-size: 36px; + color: #494949; +} + +.whatwe-wrap { + padding-bottom: 2em; + padding-top: 0; + margin-top: 2em; + margin-bottom: 0; + font-size: 36px; + color: #494949; +} + + +.supporter { + font-size:18px; + font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif; + text-align:center; + line-height: 2.5; + color: #fff; } .supporter-intro { padding: 15px 5px 15px; - color: #fff; + color: #fff; } .supporter-black { padding: 15px 5px 15px; - color: #000; - font-size:18px; - font-weight: 200; - font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif; - text-align:center; - line-height: 1.8; + color: #000000; + font-size:18px; + font-weight: 200; + font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif; + text-align:center; + line-height: 1.8; } -@media (max-width: 979px) and (min-width: 768px) +@media (max-width: 979px) .supporter-black{ - width: 100%; + width: 100%; } .supporter-headline { - color: #fff; - font-size: 36px; - text-transform: uppercase; + color: #fff; + font-size: 36px; + text-transform: uppercase; font-family: 'Raleway', Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; font-weight: 400; - padding-top: 50px; - margin-top: 0; + padding-top: 50px; + margin-top: 0; margin-bottom: 15px; } .supporter-bg { - background-image:url(../img/bg-supporter.png); - background-position: center center; - background-repeat: none; - -webkit-background-size: cover; - -moz-background-size: cover; - background-size: cover; - -o-background-size: cover; + background-image:url(../img/bg-supporter.png); + background-position: center center; + background-repeat: none; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; } - + .glyphicon-star { - font-size: 44px; + font-size: 44px; display: block; text-align: center; margin: 30px auto 30px; - color: #88c7d7; + color: #88c7d7; } .glyphicon-heart { - font-size: 42px; + font-size: 42px; display: block; text-align: center; margin: 40px auto 20px; @@ -79,7 +309,7 @@ header.history { } .glyphicon-home { - font-size: 42px; + font-size: 42px; display: block; text-align: center; margin: 40px auto 40px; @@ -88,7 +318,7 @@ header.history { .glyphicon-road { - font-size: 42px; + font-size: 42px; display: block; text-align: center; margin: 40px auto 20px; @@ -96,7 +326,7 @@ header.history { } /*.glyphicon-inverse { - display: block; + display: block; width: 40px; height: 40px; border-radius: 100%; @@ -109,7 +339,7 @@ header.history { -moz-transition: all .3s; transition: all .3s; }*/ - + #hr.grey { border-color: #ddd; border-width: 1px; @@ -117,35 +347,24 @@ header.history { } .img-100days{ - width:220px; - height: 330px; - display: block; + width:220px; + height: 330px; + display: block; position: absolute; left: 0; top: 0; text-decoration: none; } -#price { - background-color: #ddd; - -webkit-background-size: cover; - -moz-background-size: cover; - background-size: cover; - -o-background-size: cover; -} -.price-box{ - padding-left: 15px; - padding-right: 15px; - padding-top: 30px; - padding-bottom: 30px; - margin-bottom: 30px; - color: inherit; - background-color: #fff; - margin-top: 30px; - margin-left: 10px; - margin-right: 10px; +section#waystohelp { + background-color: #fff; + display: block; + margin-top: 50px; } -.graph{ - padding-top: 30px; +.whatwedo{ + margin-top: 0; + margin-bottom: 15px; + font-size: 36px; + color: #f5f5f5; } \ No newline at end of file diff --git a/digitalglarus/static/digitalglarus/css/history1.css b/digitalglarus/static/digitalglarus/css/history1.css new file mode 100644 index 00000000..d484ddd1 --- /dev/null +++ b/digitalglarus/static/digitalglarus/css/history1.css @@ -0,0 +1,151 @@ +@charset "UTF-8"; +/* CSS Document */ + +header.history { + text-align: center; + color: #fff; + background-attachment: scroll; + background-image: url(../img/header_bg_4.png); + background-position: center center; + background-repeat: none; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; +} + +.supporter { + font-size:18px; + font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif; + text-align:center; + line-height: 2.5; + color: #fff; +} + +.supporter-intro { + padding: 15px 5px 15px; + color: #fff; +} + +.supporter-black { + padding: 15px 5px 15px; + color: #000; + font-size:18px; + font-weight: 200; + font-family:raleway, monteserrat, open sans, helvitica neue, sans-serif; + text-align:center; + line-height: 1.8; +} + +@media (max-width: 979px) and (min-width: 768px) +.supporter-black{ + width: 100%; +} + +.supporter-headline { + color: #fff; + font-size: 36px; + text-transform: uppercase; + font-family: 'Raleway', Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif; + font-weight: 400; + padding-top: 50px; + margin-top: 0; + margin-bottom: 15px; +} +.supporter-bg { + background-image:url(../img/bg-supporter.png); + background-position: center center; + background-repeat: none; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; +} + +.glyphicon-star { + font-size: 44px; + display: block; + text-align: center; + margin: 30px auto 30px; + color: #88c7d7; +} + +.glyphicon-heart { + font-size: 42px; + display: block; + text-align: center; + margin: 40px auto 20px; + color: #88c7d7; +} + +.glyphicon-home { + font-size: 42px; + display: block; + text-align: center; + margin: 40px auto 40px; + color: #88c7d7; +} + + +.glyphicon-road { + font-size: 42px; + display: block; + text-align: center; + margin: 40px auto 20px; + color: #88c7d7; +} + +/*.glyphicon-inverse { + display: block; + width: 40px; + height: 40px; + border-radius: 100%; + font-size: 20px; + line-height: 40px; + outline: 0; + color: #fff; + background-color: #88c7d7; + -webkit-transition: all .3s; + -moz-transition: all .3s; + transition: all .3s; +}*/ + +#hr.grey { + border-color: #ddd; + border-width: 1px; + max-width: 100px; +} + +.img-100days{ + width:220px; + height: 330px; + display: block; + position: absolute; + left: 0; + top: 0; + text-decoration: none; +} + +#price { + background-color: #ddd; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; + -o-background-size: cover; +} +.price-box{ + padding-left: 15px; + padding-right: 15px; + padding-top: 30px; + padding-bottom: 30px; + margin-bottom: 30px; + color: inherit; + background-color: #fff; + margin-top: 30px; + margin-left: 10px; + margin-right: 10px; +} + +.graph{ + padding-top: 30px; +} \ No newline at end of file diff --git a/digitalglarus/static/digitalglarus/css/price.css b/digitalglarus/static/digitalglarus/css/price.css index 359b47fe..12a0e2f0 100644 --- a/digitalglarus/static/digitalglarus/css/price.css +++ b/digitalglarus/static/digitalglarus/css/price.css @@ -196,14 +196,29 @@ color: #88c7d7; } +.glyphicon-calendar{ + font-size: 42px; + display: block; + text-align: center; + margin: 40px auto 20px; + color: #88c7d7; +} + .glyphicon-ok { - font-size: 28px; + font-size: 42px; display: block; text-align: center; margin-bottom: 20px; color: #88c7d7; margin-top: 0px; } + +.glyphicon-flag { + font-size: 44px; + display: block; + text-align: center; + margin: 30px auto 30px; + color: #88c7d7; } @@ -364,7 +379,7 @@ } .form-control { - color: #000; + color: #999; border-radius: 0px; box-shadow: none; } @@ -619,4 +634,11 @@ th { color: inherit; background-color: #fff; text-align: left; + font-size: 15px; +} + +.term-head { + font-size: 18px; + font-weight: 700; + margin: 0 0 0px; } \ No newline at end of file diff --git a/digitalglarus/static/digitalglarus/img/bal_header.png b/digitalglarus/static/digitalglarus/img/bal_header.png new file mode 100644 index 00000000..e3859f23 Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/bal_header.png differ diff --git a/digitalglarus/static/digitalglarus/img/bricks_header.png b/digitalglarus/static/digitalglarus/img/bricks_header.png new file mode 100644 index 00000000..266d1f1a Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/bricks_header.png differ diff --git a/digitalglarus/static/digitalglarus/img/bricks_header_inverse.png b/digitalglarus/static/digitalglarus/img/bricks_header_inverse.png new file mode 100644 index 00000000..1c48cb98 Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/bricks_header_inverse.png differ diff --git a/digitalglarus/static/digitalglarus/img/supportus/1.png b/digitalglarus/static/digitalglarus/img/supportus/1.png new file mode 100644 index 00000000..7d0a72ab Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/supportus/1.png differ diff --git a/digitalglarus/static/digitalglarus/img/supportus/2.png b/digitalglarus/static/digitalglarus/img/supportus/2.png new file mode 100644 index 00000000..5ce5868c Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/supportus/2.png differ diff --git a/digitalglarus/static/digitalglarus/img/supportus/3.png b/digitalglarus/static/digitalglarus/img/supportus/3.png new file mode 100644 index 00000000..ed03ccad Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/supportus/3.png differ diff --git a/digitalglarus/static/digitalglarus/img/supportus/4.png b/digitalglarus/static/digitalglarus/img/supportus/4.png new file mode 100644 index 00000000..4e04eea1 Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/supportus/4.png differ diff --git a/digitalglarus/static/digitalglarus/img/supportus/5.png b/digitalglarus/static/digitalglarus/img/supportus/5.png new file mode 100644 index 00000000..60f21389 Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/supportus/5.png differ diff --git a/digitalglarus/static/digitalglarus/img/supportus/6.png b/digitalglarus/static/digitalglarus/img/supportus/6.png new file mode 100644 index 00000000..3c2c6301 Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/supportus/6.png differ diff --git a/digitalglarus/static/digitalglarus/img/supportus/7.png b/digitalglarus/static/digitalglarus/img/supportus/7.png new file mode 100644 index 00000000..b42db82e Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/supportus/7.png differ diff --git a/digitalglarus/static/digitalglarus/js/payment.js b/digitalglarus/static/digitalglarus/js/payment.js index d9c6e0f7..3179f721 100644 --- a/digitalglarus/static/digitalglarus/js/payment.js +++ b/digitalglarus/static/digitalglarus/js/payment.js @@ -24,6 +24,10 @@ $( document ).ready(function() { } }); + //Acept term and conditions button + + + var submit_form_btn = $('#payment_button'); submit_form_btn.on('click', submit_payment); @@ -41,6 +45,12 @@ $( document ).ready(function() { console.log("submiting"); e.preventDefault(); + if (!$('.agree-terms').is(':checked')){ + alert("You must accept terms and conditions."); + return; + } + + /* Visual feedback */ $form.find('[type=submit]').html('Validating '); @@ -119,7 +129,7 @@ $( document ).ready(function() { } else { return false; } - } + }; $form.find('[type=submit]').prop('disabled', true); var readyInterval = setInterval(function() { @@ -129,5 +139,7 @@ $( document ).ready(function() { } }, 250); + + }); diff --git a/digitalglarus/static/digitalglarus/js/utils.js b/digitalglarus/static/digitalglarus/js/utils.js index e824dafc..65584778 100644 --- a/digitalglarus/static/digitalglarus/js/utils.js +++ b/digitalglarus/static/digitalglarus/js/utils.js @@ -19,5 +19,4 @@ $( document ).ready(function() { }); - }); \ No newline at end of file diff --git a/digitalglarus/templates/digitalglarus/booking.html b/digitalglarus/templates/digitalglarus/booking.html index 85b15fd2..f8b2bc6a 100644 --- a/digitalglarus/templates/digitalglarus/booking.html +++ b/digitalglarus/templates/digitalglarus/booking.html @@ -11,8 +11,12 @@

Booking

-

Start coworking at Digital Glarus!
Membership costs only - 35CHF per month.
2 free working days included!

+

+ + When do you want to cowork?
+ All members have 2 free days per month!
+ Additional days cost 15CHF.
+ Work more, get more days free!

diff --git a/digitalglarus/templates/new_base_glarus.html b/digitalglarus/templates/new_base_glarus.html index b156dd45..50d1f24b 100644 --- a/digitalglarus/templates/new_base_glarus.html +++ b/digitalglarus/templates/new_base_glarus.html @@ -7,7 +7,8 @@ - + + @@ -79,7 +80,51 @@ margin: 0px; color:white; } + + + html,body{ + width: 100%; + height: 100%; + margin: 0px; + padding: 0px; + overflow-x: hidden; + } + + @media only screen and (min-width: 769px){ + .dropdown.home-dropdown-mobile { + display: none; + } + .dropdown.home-dropdown { + display: block; + } + } + + @media only screen and (max-width: 768px){ + .dropdown.home-dropdown-mobile { + display: block; + background-color: + } + + .dropdown.home-dropdown-mobile .dropdown-menu{ + display: block; + background-color: #0f1221; + } + + .dropdown.home-dropdown-mobile .dropdown-menu li a { + color:white; + } + .dropdown.home-dropdown-mobile .dropdown-menu li a:hover { + color: #0f1221; + } + + .dropdown.home-dropdown { + display: none; + } + } + + + {% block extra_css %} {% endblock %} @@ -97,17 +142,17 @@ -

+