merge master

deividuska · Aug 11, 2015 · 6605e80 · 6605e80
1 parent 1a8a596
commit 6605e80
Show file tree

Hide file tree

Showing 189 changed files with 0 additions and 0 deletions.
diff --git a/README.md b/README.md
diff --git a/comment-form.php b/comment-form.php
diff --git a/comments.php b/comments.php
diff --git a/content-none.php b/content-none.php
diff --git a/content-page.php b/content-page.php
diff --git a/content-search.php b/content-search.php
diff --git a/content-single.php b/content-single.php
diff --git a/content.php b/content.php
diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf
diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
diff --git a/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot
diff --git a/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg
diff --git a/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf
diff --git a/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff
diff --git a/footer.php b/footer.php
diff --git a/gruntfile.js b/gruntfile.js
diff --git a/header.php b/header.php
diff --git a/hero.php b/hero.php
diff --git a/inc/bootstrap-wp-navwalker.php b/inc/bootstrap-wp-navwalker.php
diff --git a/inc/custom-header.php b/inc/custom-header.php
diff --git a/inc/customizer.php b/inc/customizer.php
diff --git a/inc/enqueue.php b/inc/enqueue.php
diff --git a/inc/extras.php b/inc/extras.php
diff --git a/inc/jetpack.php b/inc/jetpack.php
diff --git a/inc/scripts.php b/inc/scripts.php
diff --git a/inc/setup.php b/inc/setup.php
diff --git a/inc/template-tags.php b/inc/template-tags.php
diff --git a/inc/widgets.php b/inc/widgets.php
diff --git a/inc/wp-updates-theme.php b/inc/wp-updates-theme.php
diff --git a/inc/wpcom.php b/inc/wpcom.php
diff --git a/index.php b/index.php
diff --git a/languages/_s.pot b/languages/_s.pot
diff --git a/languages/readme.txt b/languages/readme.txt
diff --git a/languages/understrap.pot b/languages/understrap.pot
diff --git a/package.json b/package.json
diff --git a/page.php b/page.php
diff --git a/rtl.css b/rtl.css
diff --git a/sass/bootstrap/_alerts.scss b/sass/bootstrap/_alerts.scss
diff --git a/sass/bootstrap/_badges.scss b/sass/bootstrap/_badges.scss
diff --git a/sass/bootstrap/_breadcrumbs.scss b/sass/bootstrap/_breadcrumbs.scss
diff --git a/sass/bootstrap/_button-groups.scss b/sass/bootstrap/_button-groups.scss
diff --git a/sass/bootstrap/_buttons.scss b/sass/bootstrap/_buttons.scss
diff --git a/sass/bootstrap/_carousel.scss b/sass/bootstrap/_carousel.scss
diff --git a/sass/bootstrap/_close.scss b/sass/bootstrap/_close.scss
diff --git a/sass/bootstrap/_code.scss b/sass/bootstrap/_code.scss
diff --git a/sass/bootstrap/_component-animations.scss b/sass/bootstrap/_component-animations.scss
diff --git a/sass/bootstrap/_dropdowns.scss b/sass/bootstrap/_dropdowns.scss
diff --git a/sass/bootstrap/_forms.scss b/sass/bootstrap/_forms.scss
diff --git a/sass/bootstrap/_glyphicons.scss b/sass/bootstrap/_glyphicons.scss
diff --git a/sass/bootstrap/_grid.scss b/sass/bootstrap/_grid.scss
diff --git a/sass/bootstrap/_input-groups.scss b/sass/bootstrap/_input-groups.scss
diff --git a/sass/bootstrap/_jumbotron.scss b/sass/bootstrap/_jumbotron.scss
diff --git a/sass/bootstrap/_labels.scss b/sass/bootstrap/_labels.scss
diff --git a/sass/bootstrap/_list-group.scss b/sass/bootstrap/_list-group.scss
diff --git a/sass/bootstrap/_media.scss b/sass/bootstrap/_media.scss
diff --git a/sass/bootstrap/_mixins.scss b/sass/bootstrap/_mixins.scss
diff --git a/sass/bootstrap/_modals.scss b/sass/bootstrap/_modals.scss
diff --git a/sass/bootstrap/_navbar.scss b/sass/bootstrap/_navbar.scss
diff --git a/sass/bootstrap/_navs.scss b/sass/bootstrap/_navs.scss
diff --git a/sass/bootstrap/_normalize.scss b/sass/bootstrap/_normalize.scss
diff --git a/sass/bootstrap/_pager.scss b/sass/bootstrap/_pager.scss
diff --git a/sass/bootstrap/_pagination.scss b/sass/bootstrap/_pagination.scss
diff --git a/sass/bootstrap/_panels.scss b/sass/bootstrap/_panels.scss
diff --git a/sass/bootstrap/_popovers.scss b/sass/bootstrap/_popovers.scss
diff --git a/sass/bootstrap/_print.scss b/sass/bootstrap/_print.scss
diff --git a/sass/bootstrap/_progress-bars.scss b/sass/bootstrap/_progress-bars.scss
diff --git a/sass/bootstrap/_responsive-embed.scss b/sass/bootstrap/_responsive-embed.scss
diff --git a/sass/bootstrap/_responsive-utilities.scss b/sass/bootstrap/_responsive-utilities.scss
diff --git a/sass/bootstrap/_scaffolding.scss b/sass/bootstrap/_scaffolding.scss
diff --git a/sass/bootstrap/_tables.scss b/sass/bootstrap/_tables.scss
diff --git a/sass/bootstrap/_theme.scss b/sass/bootstrap/_theme.scss
diff --git a/sass/bootstrap/_thumbnails.scss b/sass/bootstrap/_thumbnails.scss
diff --git a/sass/bootstrap/_tooltip.scss b/sass/bootstrap/_tooltip.scss
diff --git a/sass/bootstrap/_type.scss b/sass/bootstrap/_type.scss
diff --git a/sass/bootstrap/_utilities.scss b/sass/bootstrap/_utilities.scss
diff --git a/sass/bootstrap/_variables.scss b/sass/bootstrap/_variables.scss
diff --git a/sass/bootstrap/_wells.scss b/sass/bootstrap/_wells.scss
diff --git a/sass/bootstrap/bootstrap.scss b/sass/bootstrap/bootstrap.scss
diff --git a/sass/bootstrap/mixins/_alerts.scss b/sass/bootstrap/mixins/_alerts.scss
diff --git a/sass/bootstrap/mixins/_background-variant.scss b/sass/bootstrap/mixins/_background-variant.scss
diff --git a/sass/bootstrap/mixins/_border-radius.scss b/sass/bootstrap/mixins/_border-radius.scss
diff --git a/sass/bootstrap/mixins/_buttons.scss b/sass/bootstrap/mixins/_buttons.scss
diff --git a/sass/bootstrap/mixins/_center-block.scss b/sass/bootstrap/mixins/_center-block.scss
diff --git a/sass/bootstrap/mixins/_clearfix.scss b/sass/bootstrap/mixins/_clearfix.scss
diff --git a/sass/bootstrap/mixins/_forms.scss b/sass/bootstrap/mixins/_forms.scss
diff --git a/sass/bootstrap/mixins/_gradients.scss b/sass/bootstrap/mixins/_gradients.scss
diff --git a/sass/bootstrap/mixins/_grid-framework.scss b/sass/bootstrap/mixins/_grid-framework.scss
diff --git a/sass/bootstrap/mixins/_grid.scss b/sass/bootstrap/mixins/_grid.scss
diff --git a/sass/bootstrap/mixins/_hide-text.scss b/sass/bootstrap/mixins/_hide-text.scss
diff --git a/sass/bootstrap/mixins/_image.scss b/sass/bootstrap/mixins/_image.scss
diff --git a/sass/bootstrap/mixins/_labels.scss b/sass/bootstrap/mixins/_labels.scss
diff --git a/sass/bootstrap/mixins/_list-group.scss b/sass/bootstrap/mixins/_list-group.scss
diff --git a/sass/bootstrap/mixins/_nav-divider.scss b/sass/bootstrap/mixins/_nav-divider.scss
diff --git a/sass/bootstrap/mixins/_nav-vertical-align.scss b/sass/bootstrap/mixins/_nav-vertical-align.scss
diff --git a/sass/bootstrap/mixins/_opacity.scss b/sass/bootstrap/mixins/_opacity.scss
diff --git a/sass/bootstrap/mixins/_pagination.scss b/sass/bootstrap/mixins/_pagination.scss
diff --git a/sass/bootstrap/mixins/_panels.scss b/sass/bootstrap/mixins/_panels.scss
diff --git a/sass/bootstrap/mixins/_progress-bar.scss b/sass/bootstrap/mixins/_progress-bar.scss
diff --git a/sass/bootstrap/mixins/_reset-filter.scss b/sass/bootstrap/mixins/_reset-filter.scss
diff --git a/sass/bootstrap/mixins/_resize.scss b/sass/bootstrap/mixins/_resize.scss
diff --git a/sass/bootstrap/mixins/_responsive-visibility.scss b/sass/bootstrap/mixins/_responsive-visibility.scss
diff --git a/sass/bootstrap/mixins/_size.scss b/sass/bootstrap/mixins/_size.scss
diff --git a/sass/bootstrap/mixins/_tab-focus.scss b/sass/bootstrap/mixins/_tab-focus.scss
diff --git a/sass/bootstrap/mixins/_table-row.scss b/sass/bootstrap/mixins/_table-row.scss
diff --git a/sass/bootstrap/mixins/_text-emphasis.scss b/sass/bootstrap/mixins/_text-emphasis.scss
diff --git a/sass/bootstrap/mixins/_text-overflow.scss b/sass/bootstrap/mixins/_text-overflow.scss
diff --git a/sass/bootstrap/mixins/_vendor-prefixes.scss b/sass/bootstrap/mixins/_vendor-prefixes.scss
diff --git a/sass/bootstrap/understrap_bootstrap.scss b/sass/bootstrap/understrap_bootstrap.scss
diff --git a/sass/font-awesome/_bordered-pulled.scss b/sass/font-awesome/_bordered-pulled.scss
diff --git a/sass/font-awesome/_core.scss b/sass/font-awesome/_core.scss
diff --git a/sass/font-awesome/_fixed-width.scss b/sass/font-awesome/_fixed-width.scss
diff --git a/sass/font-awesome/_icons.scss b/sass/font-awesome/_icons.scss
diff --git a/sass/font-awesome/_larger.scss b/sass/font-awesome/_larger.scss
diff --git a/sass/font-awesome/_list.scss b/sass/font-awesome/_list.scss
diff --git a/sass/font-awesome/_mixins.scss b/sass/font-awesome/_mixins.scss
diff --git a/sass/font-awesome/_path.scss b/sass/font-awesome/_path.scss
diff --git a/sass/font-awesome/_rotated-flipped.scss b/sass/font-awesome/_rotated-flipped.scss
diff --git a/sass/font-awesome/_spinning.scss b/sass/font-awesome/_spinning.scss
diff --git a/sass/font-awesome/_stacked.scss b/sass/font-awesome/_stacked.scss
diff --git a/sass/font-awesome/_variables.scss b/sass/font-awesome/_variables.scss
diff --git a/sass/font-awesome/font-awesome.scss b/sass/font-awesome/font-awesome.scss
diff --git a/sass/font-awesome/understrap_font-awesome.scss b/sass/font-awesome/understrap_font-awesome.scss
diff --git a/sass/owlcarousel-slider/_mixins.scss b/sass/owlcarousel-slider/_mixins.scss
diff --git a/sass/owlcarousel-slider/_theme.scss b/sass/owlcarousel-slider/_theme.scss
diff --git a/sass/owlcarousel-slider/owl.animate.css b/sass/owlcarousel-slider/owl.animate.css
diff --git a/sass/owlcarousel-slider/owl.animate.css.map b/sass/owlcarousel-slider/owl.animate.css.map
diff --git a/sass/owlcarousel-slider/owl.animate.scss b/sass/owlcarousel-slider/owl.animate.scss
diff --git a/sass/owlcarousel-slider/owl.autoheight.css b/sass/owlcarousel-slider/owl.autoheight.css
diff --git a/sass/owlcarousel-slider/owl.autoheight.css.map b/sass/owlcarousel-slider/owl.autoheight.css.map
diff --git a/sass/owlcarousel-slider/owl.autoheight.scss b/sass/owlcarousel-slider/owl.autoheight.scss
diff --git a/sass/owlcarousel-slider/owl.carousel.css b/sass/owlcarousel-slider/owl.carousel.css
diff --git a/sass/owlcarousel-slider/owl.carousel.css.map b/sass/owlcarousel-slider/owl.carousel.css.map
diff --git a/sass/owlcarousel-slider/owl.carousel.scss b/sass/owlcarousel-slider/owl.carousel.scss
diff --git a/sass/owlcarousel-slider/owl.lazyload.css b/sass/owlcarousel-slider/owl.lazyload.css
diff --git a/sass/owlcarousel-slider/owl.lazyload.css.map b/sass/owlcarousel-slider/owl.lazyload.css.map
diff --git a/sass/owlcarousel-slider/owl.lazyload.scss b/sass/owlcarousel-slider/owl.lazyload.scss
diff --git a/sass/owlcarousel-slider/owl.theme.default.css b/sass/owlcarousel-slider/owl.theme.default.css
diff --git a/sass/owlcarousel-slider/owl.theme.default.css.map b/sass/owlcarousel-slider/owl.theme.default.css.map
diff --git a/sass/owlcarousel-slider/owl.theme.default.scss b/sass/owlcarousel-slider/owl.theme.default.scss
diff --git a/sass/owlcarousel-slider/owl.theme.green.css b/sass/owlcarousel-slider/owl.theme.green.css
diff --git a/sass/owlcarousel-slider/owl.theme.green.css.map b/sass/owlcarousel-slider/owl.theme.green.css.map
diff --git a/sass/owlcarousel-slider/owl.theme.green.scss b/sass/owlcarousel-slider/owl.theme.green.scss
diff --git a/sass/owlcarousel-slider/owl.video.css b/sass/owlcarousel-slider/owl.video.css
diff --git a/sass/owlcarousel-slider/owl.video.css.map b/sass/owlcarousel-slider/owl.video.css.map
diff --git a/sass/owlcarousel-slider/owl.video.scss b/sass/owlcarousel-slider/owl.video.scss
diff --git a/sass/theme.scss b/sass/theme.scss
diff --git a/sass/theme/_theme.scss b/sass/theme/_theme.scss
diff --git a/sass/theme/_theme_variables.scss b/sass/theme/_theme_variables.scss
diff --git a/sass/underscores/_reset.scss b/sass/underscores/_reset.scss
diff --git a/sass/underscores/elements/_elements.scss b/sass/underscores/elements/_elements.scss
diff --git a/sass/underscores/elements/_lists.scss b/sass/underscores/elements/_lists.scss
diff --git a/sass/underscores/elements/_tables.scss b/sass/underscores/elements/_tables.scss
diff --git a/sass/underscores/forms/_buttons.scss b/sass/underscores/forms/_buttons.scss
diff --git a/sass/underscores/forms/_fields.scss b/sass/underscores/forms/_fields.scss
diff --git a/sass/underscores/forms/_forms.scss b/sass/underscores/forms/_forms.scss
diff --git a/sass/underscores/layout/_content-sidebar.scss b/sass/underscores/layout/_content-sidebar.scss
diff --git a/sass/underscores/layout/_sidebar-content.scss b/sass/underscores/layout/_sidebar-content.scss
diff --git a/sass/underscores/media/_captions.scss b/sass/underscores/media/_captions.scss
diff --git a/sass/underscores/media/_galleries.scss b/sass/underscores/media/_galleries.scss
diff --git a/sass/underscores/media/_media.scss b/sass/underscores/media/_media.scss
diff --git a/sass/underscores/mixins/_mixins-master.scss b/sass/underscores/mixins/_mixins-master.scss
diff --git a/sass/underscores/modules/_accessibility.scss b/sass/underscores/modules/_accessibility.scss
diff --git a/sass/underscores/modules/_alignments.scss b/sass/underscores/modules/_alignments.scss
diff --git a/sass/underscores/modules/_clearings.scss b/sass/underscores/modules/_clearings.scss
diff --git a/sass/underscores/modules/_infinite-scroll.scss b/sass/underscores/modules/_infinite-scroll.scss
diff --git a/sass/underscores/navigation/_links.scss b/sass/underscores/navigation/_links.scss
diff --git a/sass/underscores/navigation/_menus.scss b/sass/underscores/navigation/_menus.scss
diff --git a/sass/underscores/navigation/_navigation.scss b/sass/underscores/navigation/_navigation.scss
diff --git a/sass/underscores/site/_site.scss b/sass/underscores/site/_site.scss
diff --git a/sass/underscores/site/primary/_asides.scss b/sass/underscores/site/primary/_asides.scss
diff --git a/sass/underscores/site/primary/_comments.scss b/sass/underscores/site/primary/_comments.scss
diff --git a/sass/underscores/site/primary/_posts-and-pages.scss b/sass/underscores/site/primary/_posts-and-pages.scss
diff --git a/sass/underscores/site/secondary/_widgets.scss b/sass/underscores/site/secondary/_widgets.scss
diff --git a/sass/underscores/typography/_copy.scss b/sass/underscores/typography/_copy.scss
diff --git a/sass/underscores/typography/_headings.scss b/sass/underscores/typography/_headings.scss
diff --git a/sass/underscores/typography/_typography.scss b/sass/underscores/typography/_typography.scss
diff --git a/sass/underscores/understrap_underscores.scss b/sass/underscores/understrap_underscores.scss
diff --git a/sass/underscores/variables-site/_colors.scss b/sass/underscores/variables-site/_colors.scss
diff --git a/sass/underscores/variables-site/_structure.scss b/sass/underscores/variables-site/_structure.scss
diff --git a/sass/underscores/variables-site/_typography.scss b/sass/underscores/variables-site/_typography.scss
diff --git a/sass/underscores/variables-site/_variables-site.scss b/sass/underscores/variables-site/_variables-site.scss
diff --git a/sass/understrap/understrap.scss b/sass/understrap/understrap.scss
diff --git a/sidebar.php b/sidebar.php
diff --git a/single.php b/single.php
diff --git a/sticky.php b/sticky.php
diff --git a/style.css b/style.css