Commit 5e667783 authored by nirgendswo's avatar nirgendswo

change themes

bugfix from crispy-boilerplate
change handling animations
parent d9139a78
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -14,7 +14,17 @@ $(function() {
function toggle(event) {
event.preventDefault();
var $wrap = $('.site-navigation__list-wrap');
$button.toggleClass('site-navigation__button--open');
$('.site-navigation__list').toggleClass('site-navigation__list--open');
// add max-height for animation and toggle
if ($wrap.hasClass('site-navigation__list-wrap--open')) {
$wrap.css('max-height', '0px');
} else {
$wrap.css('max-height', $wrap.find('.site-navigation__list').outerHeight() + 'px');
}
$wrap.toggleClass('site-navigation__list-wrap--open');
}
});
......@@ -8,7 +8,7 @@
},
"dependencies": {
"cash-dom": "^1.3.5",
"crispy-boilerplate": "^0.9.1",
"crispy-boilerplate": "^0.9.2",
"reflex-grid": "^1.3.0"
},
"config": {
......@@ -25,7 +25,7 @@
"scripts": {
"preinstall": "npm install -g browserify browserify-shim uglify-js node-sass clean-css-cli postcss-cli autoprefixer make-dir-cli svgo svg-sprite",
"build": "npm run js:build && npm run css:build && npm run svg:build",
"js:build": "npm run js:clean && npm run js:browserify",
"js:build": "npm run js:clean && npm run js:browserify && npm run js:minify",
"js:clean": "make-dir $npm_package_config_public_dir/js && rimraf $npm_package_config_public_dir/js/*",
"js:browserify": "browserify js/index.js > $npm_package_config_public_dir/js/scripts.js",
"js:minify": "uglifyjs $npm_package_config_public_dir/js/scripts.js -mc -o $npm_package_config_public_dir/js/scripts.js",
......
......@@ -9,7 +9,7 @@
$inner__padding: pxToEm(20px);
@mixin fuzzy-cms-inner() {
.--inner {
.inner {
padding: $inner__padding;
&--right {
......
......@@ -12,26 +12,28 @@ $site-navigation__item-color--hover: white;
@mixin fuzzy-cms-site-navigation() {
.site-navigation {
&__list {
height: 0;
line-height: 3.2em;
text-align: left;
&__list-wrap {
max-height: 0;
overflow: hidden;
@media (max-width: $reflex-sm) {
transition: height 0.1s ease-in-out;
@media (min-width: $reflex-sm) {
overflow: visible;
}
&--open {
padding: 20px 0 0;
height: 100%;
@media (max-width: $reflex-sm) {
transition: max-height 0.1s ease-in-out;
}
}
&__list {
padding: 20px 0 0;
line-height: 3.2em;
text-align: left;
@media (min-width: $reflex-sm) {
padding: 0;
height: 100%;
text-align: right;
overflow: visible;
}
}
......@@ -39,7 +41,7 @@ $site-navigation__item-color--hover: white;
color: $site-navigation__item-color;
display: block;
margin: 0 0 0 5px;
margin: 0 0 0 10px;
@media (min-width: $reflex-sm) {
display: inline-block;
......
@extends('FuzzyCms.views.layout')
@section('header')
@endsection
@section('content')
{!! $page->html() !!}
<div class="grid">
<div class="grid__col-xs-12">
<article class="inner">
<h1 class="page__title">
{!! $page->data['title'] !!}
</h1>
<hr class="hr">
<div class="content">
{!! $page->html() !!}
</div>
</article>
</div>
</div>
@endsection
......@@ -7,7 +7,7 @@
@section('content')
<div class="grid">
<div class="grid__col-xs-12">
<section class="--inner">
<section class="inner">
<h1 class="page__title">
{!! $page->data['title'] !!}
</h1>
......
......@@ -7,7 +7,7 @@
@section('content')
<div class="grid">
<div class="grid__col-xs-12">
<article class="page --inner">
<article class="page inner">
<header class="page__header">
<h1 class="page__title">
{!! $page->data['title'] !!}
......
......@@ -16,7 +16,7 @@
['parent' => '/features', 'orderBy' => ['order' => 'asc']]) as $feature)
<div class="grid__col-xs-6 grid__col-md-3">
<div class="hutch">
<div class="hutch__content --inner">
<div class="hutch__content inner">
<div class="grid">
<div class="grid__col-xs-12 grid--justify-center">
<article class="feature">
......@@ -39,12 +39,12 @@
@section('content')
<div class="grid">
<div class="grid__col-xs-12 grid__col-md-6">
<div class="--inner --inner--left">
<div class="inner inner--left">
<header>
<h2 class="h2 --margin-top-y0 --margin-bottom-y0">
<h2 class="h2 margin-top-y0 margin-bottom-y0">
Next Features
</h2>
<hr class="--margin-top-y0 --margin-bottom-y0">
<hr class="margin-top-y0 margin-bottom-y0">
</header>
@foreach($pageRepository->find(
['type' => 'next'],
......@@ -64,12 +64,12 @@
</div>
</div>
<div class="grid__col-xs-12 grid__col-md-6">
<div class="--inner --inner--right">
<div class="inner inner--right">
<header>
<h2 class="h2 --margin-top-y0 --margin-bottom-y0">
<h2 class="h2 margin-top-y0 margin-bottom-y0">
Blog
</h2>
<hr class="--margin-top-y0 --margin-bottom-y0">
<hr class="margin-top-y0 margin-bottom-y0">
</header>
@foreach($pageRepository->find(
['type' => 'post'],
......
......@@ -16,7 +16,7 @@
<link rel="manifest" href="/manifest.json">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="theme-color" content="#ffffff">
<link href="{{ $viewHelper->route($page) }}" rel="canonical">
<link href="/assets/css/styles.css" rel="stylesheet" type="text/css">
......@@ -35,8 +35,8 @@
<div class="grid">
<div class="grid__col-xs-12">
<div>
<a href="/" class="--float-left">
<div class="h2 site-header__title --margin-top-y0 --margin-bottom-y0">
<a href="/" class="float-left">
<div class="h2 site-header__title margin-top-y0 margin-bottom-y0">
Fuzzy CMS
</div>
</a>
......
......@@ -11,7 +11,7 @@
@section('content')
<div class="grid">
<div class="grid__col-xs-12">
<article class="--inner">
<article class="inner">
<h1 class="page__title">
{!! $page->data['title'] !!}
</h1>
......
......@@ -9,21 +9,20 @@
</svg>
</button>
</div>
<nav class="site-navigation__list">
@foreach($pageRepository->find(
['type' => 'page', 'exclude' => ['imprint', 'privacy-policy']],
['orderBy' => ['title' => 'desc']]) as $page)
<a class="site-navigation__item {{ $viewHelper->current($page, 'site-navigation__item--current') }}"
href="{{ $viewHelper->route($page) }}"
>
<svg class="icon site-navigation__icon">
<use xlink:href="/assets/svg/icons.svg#{{ $page->data['icon'] }}" />
</svg>
<span class="site-navigation__text">
{{ $page->data['title'] }}
</span>
</a>
@endforeach
</nav>
<div class="site-navigation__list-wrap">
<nav class="site-navigation__list">
@foreach($pageRepository->find(
['type' => 'page', 'exclude' => ['imprint', 'privacy-policy']],
['orderBy' => ['title' => 'desc']]) as $page)
<a class="site-navigation__item {{ $viewHelper->current($page, 'site-navigation__item--current') }}" href="{{ $viewHelper->route($page) }}">
<svg class="icon site-navigation__icon">
<use xlink:href="/assets/svg/icons.svg#{{ $page->data['icon'] }}" />
</svg>
<span class="site-navigation__text">
{{ $page->data['title'] }}
</span>
</a>
@endforeach
</nav>
</div>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment