1
0
mirror of https://github.com/bigchaindb/site.git synced 2025-02-11 08:09:33 +01:00

merge fixes

This commit is contained in:
Matthias Kretschmann 2017-05-15 11:30:21 +02:00
parent 49ace24131
commit 1e0ab4e11b
Signed by: m
GPG Key ID: BD3C1F3EDD7831FC
5 changed files with 8 additions and 15 deletions

View File

@ -1,7 +1,7 @@
//=include parsleyjs/dist/parsley.js
//=include ../../../../node_modules/textarea-autogrow/textarea-autogrow.js
//=include ../../../../node_modules/select2/dist/js/select2.js
//=include textarea-autogrow/textarea-autogrow.js
//=include select2/dist/js/select2.js
var Forms = (function(w, d, $) {

View File

@ -1,10 +1,12 @@
//=include is-in-viewport/lib/isInViewport.js
//=include bigchain/newsletter.js
//=include bigchain/testimonials.js
jQuery(function($) {
Newsletter.init()
Testimonials.init()
var wrigley = $('#wrigley'),
wrigleyArm = wrigley.find('#arm'),

View File

@ -19,7 +19,7 @@
@import 'bigchain/buttons';
@import 'bigchain/forms';
@import 'bigchain/input-group';
@import 'bigchain/select-theme-bigchaindb';
@import 'bigchain/_select2-bigchaindb/layout';
@import 'bigchain/logo';
@import 'bigchain/icons';
@import 'bigchain/grid';

View File

@ -51,21 +51,12 @@ $menu-height-md: 66px;
}
}
// intro animation
.section-title,
.section-description,
.hero__action {
.wf-active &,
.wf-inactive & {
@extend .animation-slide-in-from-bottom;
animation-fill-mode: backwards;
}
}
//
// intro animation
//
.hero .section-title,
.hero .section-description,
.hero__action {
.wf-active &,
.wf-inactive & {

View File

@ -1,4 +1,4 @@
@import '../../../../../node_modules/select2/src/scss/core.scss';
@import 'select2/src/scss/core';
.select2-container--bigchaindb {
@import 'single';
@ -13,7 +13,7 @@
font-size: $font-size-sm;
// resets
border: none;
border: 0;
}
+ .form-label {