maj
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
node_modules
|
||||
images/logo/*
|
||||
@@ -1,3 +1,39 @@
|
||||
# v1.2.1
|
||||
## 08/23/2018
|
||||
|
||||
1. [](#improved)
|
||||
* Added additional "mobile custom logo" support
|
||||
1. [](#bugfix)
|
||||
* Addressed some CSS issues by forcing logo height
|
||||
|
||||
# v1.2.0
|
||||
## 08/23/2018
|
||||
|
||||
1. [](#new)
|
||||
* Added new "custom logo" support [#3](https://github.com/getgrav/grav-theme-quark/issues/3)
|
||||
* Added option JSON feed syndication support in sidebar [#47](https://github.com/getgrav/grav-theme-quark/pull/47)
|
||||
* Added basic form field `array` styling
|
||||
|
||||
# v1.1.0
|
||||
## 07/25/2018
|
||||
|
||||
1. [](#new)
|
||||
* Responsive font sizing [#28](https://github.com/getgrav/grav-theme-quark/issues/28)
|
||||
1. [](#improved)
|
||||
* Updated [Spectre.css](https://picturepan2.github.io/spectre/) to latest `0.5.3` version
|
||||
* Make blog settings toggleable [#38](https://github.com/getgrav/grav-theme-quark/pull/38)
|
||||
1. [](#bugfix)
|
||||
* Proper fix for sticky footer in IE10 and IE11 [#21](https://github.com/getgrav/grav-theme-quark/issues/21)
|
||||
* Fix for lists wrapping weirdly due to `outside` attribute
|
||||
* Updated checkbox + radio to take into account `client_side_validation` form option
|
||||
* Fixes for fallback values [#37](https://github.com/getgrav/grav-theme-quark/pull/37)
|
||||
* Fix inheritance for images folder [#30](https://github.com/getgrav/grav-theme-quark/pull/30)
|
||||
* Added blueprint option for `continue_link` [#45](https://github.com/getgrav/grav-theme-quark/issues/45)
|
||||
* Added blueprint option for Feature `class` [#14](https://github.com/getgrav/grav-theme-quark/issues/14)
|
||||
* Fixed `Duplicate ID` issues with modular sections. Might break CSS on first load, need to refresh to pick up new CSS [#24](https://github.com/getgrav/grav-theme-quark/issues/24)
|
||||
* Fixed Text feature alignment issue [#4](https://github.com/getgrav/grav-theme-quark/issues/4)
|
||||
* Overlapping menu and mobile button [#7](https://github.com/getgrav/grav-theme-quark/issues/7)
|
||||
|
||||
# v1.0.3
|
||||
## 05/11/2018
|
||||
|
||||
|
||||
@@ -61,12 +61,27 @@ header-dark: false # Inverts the text/logo to work better on dark bac
|
||||
header-transparent: false # Allows the fixed header to be transparent over the page
|
||||
sticky-footer: true # Causes the footer to be sticky at the bottom of the page
|
||||
blog-page: '/blog' # The route to the blog listing page, useful for a blog style layout with sidebar
|
||||
custom_logo: # A custom logo rather than the default (see below)
|
||||
custom_logo_mobile: # A custom logo to use for mobile navigation
|
||||
```
|
||||
|
||||
To make modifications, you can copy the `user/themes/quark/quark.yaml` file to `user/config/themes/` folder and modify, or you can use the admin plugin.
|
||||
|
||||
> NOTE: Do not modify the `user/themes/quark/quark.yaml` file directly or your changes will be lost with any updates
|
||||
|
||||
## Custom Logos
|
||||
|
||||
To add a custom logo, you should put the log into the `user/themes/quark/images/logo` folder. Standard image formats are support (`.png`,`.jpg`, `.gif`, `.svg`, etc.). Then reference the logo via the YAML like so:
|
||||
|
||||
```yaml
|
||||
custom_logo:
|
||||
- name: 'my-logo.png'
|
||||
custom_logo_mobile:
|
||||
- name: 'my-mobile-logo.png'
|
||||
```
|
||||
|
||||
Alternatively, you can you use the drag-n-drop "Custom Logo" field in the Quark theme options.
|
||||
|
||||
## Page Overrides
|
||||
|
||||
Quark has the ability to allow pages to override some of the default options by letting the user set `body_classes` for any page. The theme will merge the combination of the defaults with any `body_classes` set. For example:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: Quark
|
||||
version: 1.0.3
|
||||
version: 1.2.1
|
||||
description: New Grav Default Theme
|
||||
icon: microchip
|
||||
author:
|
||||
@@ -13,7 +13,7 @@ bugs: https://github.com/getgrav/grav-theme-quark/issues
|
||||
license: MIT
|
||||
|
||||
dependencies:
|
||||
- { name: grav, version: '>=1.4.0-rc.1' }
|
||||
- { name: grav, version: '>=1.4.0' }
|
||||
|
||||
form:
|
||||
validation: loose
|
||||
@@ -47,6 +47,26 @@ form:
|
||||
title: Header Defaults
|
||||
underline: true
|
||||
|
||||
custom_logo:
|
||||
type: file
|
||||
label: Custom Logo
|
||||
size: large
|
||||
destination: 'theme://images/logo'
|
||||
multiple: false
|
||||
markdown: true
|
||||
description: Will be used instead of default logo `theme://images/grav-logo.svg`
|
||||
accept:
|
||||
- image/*
|
||||
|
||||
custom_logo_mobile:
|
||||
type: file
|
||||
label: Mobile Custom Logo
|
||||
size: large
|
||||
destination: 'theme://images/logo'
|
||||
multiple: false
|
||||
accept:
|
||||
- image/*
|
||||
|
||||
header-fixed:
|
||||
type: toggle
|
||||
label: Fixed header
|
||||
|
||||
@@ -11,11 +11,24 @@ form:
|
||||
|
||||
fields:
|
||||
|
||||
header_image:
|
||||
header_options:
|
||||
type: section
|
||||
title: Header Image
|
||||
title: Header Options
|
||||
underline: true
|
||||
|
||||
header.continue_link:
|
||||
type: toggle
|
||||
toggleable: true
|
||||
label: DF Style Link
|
||||
help: Daring Fireball style title link
|
||||
highlight: 1
|
||||
default: 1
|
||||
options:
|
||||
1: PLUGIN_ADMIN.ENABLED
|
||||
0: PLUGIN_ADMIN.DISABLED
|
||||
validate:
|
||||
type: bool
|
||||
|
||||
header.header_image:
|
||||
type: toggle
|
||||
toggleable: true
|
||||
|
||||
@@ -9,6 +9,15 @@ form:
|
||||
type: tab
|
||||
title: Features
|
||||
fields:
|
||||
class:
|
||||
type: select
|
||||
label: Layout
|
||||
default: small
|
||||
size: medium
|
||||
options:
|
||||
small: Small = 4 / 3 / 2 columns
|
||||
standard: Standard = 3 / 2 / 1 columns
|
||||
|
||||
header.features:
|
||||
name: features
|
||||
type: list
|
||||
|
||||
@@ -23,17 +23,18 @@ form:
|
||||
|
||||
header.blog_url:
|
||||
type: text
|
||||
toggleable: true
|
||||
label: Blog Route
|
||||
help: The route to this main blog page that contains this configuration
|
||||
help: The route to the main blog page that contains the "Show ..." configuration
|
||||
default: '/blog'
|
||||
placeholder: '/blog'
|
||||
size: medium
|
||||
|
||||
header.show_sidebar:
|
||||
type: toggle
|
||||
toggleable: true
|
||||
label: Show Sidebar
|
||||
highlight: 1
|
||||
default: 1
|
||||
options:
|
||||
1: PLUGIN_ADMIN.ENABLED
|
||||
0: PLUGIN_ADMIN.DISABLED
|
||||
@@ -42,9 +43,9 @@ form:
|
||||
|
||||
header.show_breadcrumbs:
|
||||
type: toggle
|
||||
toggleable: true
|
||||
label: Show Breadcrumbs
|
||||
highlight: 1
|
||||
default: 1
|
||||
options:
|
||||
1: PLUGIN_ADMIN.ENABLED
|
||||
0: PLUGIN_ADMIN.DISABLED
|
||||
@@ -53,9 +54,9 @@ form:
|
||||
|
||||
header.show_pagination:
|
||||
type: toggle
|
||||
toggleable: true
|
||||
label: Show Pagination
|
||||
highlight: 1
|
||||
default: 1
|
||||
options:
|
||||
1: PLUGIN_ADMIN.ENABLED
|
||||
0: PLUGIN_ADMIN.DISABLED
|
||||
|
||||
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
@@ -254,3 +254,35 @@ hr:
|
||||
FORM_DATA:
|
||||
SUMMARY: "Ovo je sažetak onog što ste nam napisali:"
|
||||
ERROR: Greška
|
||||
|
||||
nl:
|
||||
TRANSLATION_TEST: Quark!
|
||||
BLOG:
|
||||
ITEM:
|
||||
CONTINUE_READING: Lees Meer...
|
||||
NEXT_POST: Volgende Bericht
|
||||
PREV_POST: Vorige Bericht
|
||||
SHOP:
|
||||
ITEM:
|
||||
BACK: Teru
|
||||
NEXT_ITEM: Volgende Onderdeel
|
||||
PREV_ITEM: Vorige Onderdeel
|
||||
SIDEBAR:
|
||||
SIMPLE_SEARCH:
|
||||
HEADLINE: Zoek
|
||||
RELATED_POSTS:
|
||||
HEADLINE: Gerelateerde Berichten
|
||||
RANDOM_ARTICLE:
|
||||
HEADLINE: Willekeurig Artikel
|
||||
FEELING_LUCKY: Ik Voel Me Gelukkig!
|
||||
SOME_TEXT_WIDGET:
|
||||
HEADLINE: Een Tekst Widget
|
||||
POPULAR_TAGS:
|
||||
HEADLINE: Populaire Labels
|
||||
ARCHIVES:
|
||||
HEADLINE: Archieven
|
||||
SYNDICATE:
|
||||
HEADLINE: Syndicatie
|
||||
FORM_DATA:
|
||||
SUMMARY: "Hier is de samenvatting van wat je aan ons schreef:"
|
||||
ERROR: Fout
|
||||
|
||||
Generated
-3754
File diff suppressed because it is too large
Load Diff
@@ -26,7 +26,7 @@
|
||||
"devDependencies": {
|
||||
"gulp": "latest",
|
||||
"gulp-autoprefixer": "latest",
|
||||
"gulp-clean-css": "^3.9.3",
|
||||
"gulp-clean-css": "^3.9.4",
|
||||
"gulp-csscomb": "^3.0.8",
|
||||
"gulp-rename": "^1.2.2",
|
||||
"gulp-sass": "^4.0.1"
|
||||
|
||||
@@ -24,7 +24,7 @@ class Quark extends Theme
|
||||
public function onTwigLoader()
|
||||
{
|
||||
$theme_paths = Grav::instance()['locator']->findResources('theme://images');
|
||||
foreach(array_reverse($theme_paths) as $images_path) {
|
||||
foreach($theme_paths as $images_path) {
|
||||
$this->grav['twig']->addPath($images_path, 'images');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
// Components
|
||||
@import "spectre/accordions";
|
||||
@import "spectre/autocomplete";
|
||||
@import "spectre/avatars";
|
||||
@import "spectre/badges";
|
||||
@import "spectre/breadcrumbs";
|
||||
@@ -49,11 +48,4 @@
|
||||
@import "spectre/utilities";
|
||||
|
||||
// Extras
|
||||
.search-input {
|
||||
@extend .form-input;
|
||||
}
|
||||
|
||||
.button {
|
||||
@extend .btn;
|
||||
}
|
||||
|
||||
@import "theme/extensions";
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
// Optimized for East Asian CJK
|
||||
:lang(zh) {
|
||||
font-family: $cjk-zh-font-family;
|
||||
:lang(zh),
|
||||
:lang(zh-Hans) {
|
||||
font-family: $cjk-zh-hans-font-family;
|
||||
}
|
||||
|
||||
:lang(zh-Hant) {
|
||||
font-family: $cjk-zh-hant-font-family;
|
||||
}
|
||||
|
||||
:lang(ja) {
|
||||
|
||||
@@ -74,4 +74,4 @@
|
||||
transform: translate(-50%, -50%);
|
||||
z-index: $zindex-0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
color: $light-color;
|
||||
content: attr(data-badge);
|
||||
display: inline-block;
|
||||
transform: translate(-.1rem, -.5rem);
|
||||
transform: translate(-.05rem, -.5rem);
|
||||
}
|
||||
}
|
||||
&[data-badge] {
|
||||
@@ -57,14 +57,4 @@
|
||||
z-index: $zindex-1;
|
||||
}
|
||||
}
|
||||
|
||||
&.avatar-xs {
|
||||
&::after {
|
||||
content: "";
|
||||
height: $unit-2;
|
||||
min-width: $unit-2;
|
||||
padding: 0;
|
||||
width: $unit-2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,4 +37,8 @@ a {
|
||||
color: $link-color-dark;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
&:visited {
|
||||
color: $link-color-light;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,13 +98,22 @@
|
||||
}
|
||||
}
|
||||
|
||||
&.disabled .date-item,
|
||||
&.disabled .calendar-event,
|
||||
.date-item:disabled,
|
||||
.calendar-event:disabled {
|
||||
cursor: default;
|
||||
opacity: .25;
|
||||
pointer-events: none;
|
||||
.date-item,
|
||||
.calendar-event {
|
||||
&:disabled,
|
||||
&.disabled {
|
||||
cursor: default;
|
||||
opacity: .25;
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
&.prev-month,
|
||||
&.next-month {
|
||||
.date-item,
|
||||
.calendar-event {
|
||||
opacity: .25;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -132,11 +141,21 @@
|
||||
}
|
||||
}
|
||||
|
||||
&.range-start,
|
||||
&.range-end {
|
||||
.date-item {
|
||||
background: $primary-color-dark;
|
||||
border-color: darken($primary-color-dark, 5%);
|
||||
color: $light-color;
|
||||
}
|
||||
}
|
||||
|
||||
.date-item {
|
||||
color: $primary-color;
|
||||
}
|
||||
}
|
||||
|
||||
// Calendars size
|
||||
&.calendar-lg {
|
||||
.calendar-body {
|
||||
padding: 0;
|
||||
|
||||
@@ -17,6 +17,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
.card-body {
|
||||
flex: 1 1 auto;
|
||||
}
|
||||
|
||||
.card-image {
|
||||
padding-top: $layout-spacing-lg;
|
||||
|
||||
|
||||
@@ -23,4 +23,8 @@
|
||||
margin-left: -$unit-2;
|
||||
margin-right: $unit-1;
|
||||
}
|
||||
|
||||
.btn-clear {
|
||||
transform: scale(.75);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Codes
|
||||
code {
|
||||
@include label-base();
|
||||
@include label-variant($code-color, lighten($code-color, 33%));
|
||||
@include label-variant($code-color, lighten($code-color, 42.5%));
|
||||
font-size: 85%;
|
||||
}
|
||||
|
||||
|
||||
@@ -193,7 +193,7 @@ textarea.form-input {
|
||||
.form-checkbox,
|
||||
.form-radio,
|
||||
.form-switch {
|
||||
display: inline-block;
|
||||
display: block;
|
||||
line-height: $line-height;
|
||||
margin: ($control-size - $control-size-sm) / 2 0;
|
||||
min-height: 1.2rem;
|
||||
@@ -381,6 +381,7 @@ textarea.form-input {
|
||||
.form-input,
|
||||
.form-select {
|
||||
flex: 1 1 auto;
|
||||
width: 1%;
|
||||
}
|
||||
|
||||
.input-group-btn {
|
||||
@@ -461,6 +462,18 @@ textarea.form-input {
|
||||
}
|
||||
}
|
||||
|
||||
.form-checkbox {
|
||||
.has-error &,
|
||||
&.is-error {
|
||||
input {
|
||||
&:indeterminate + .form-icon {
|
||||
background: $error-color;
|
||||
border-color: $error-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// validation based on :placeholder-shown (Edge doesn't support it yet)
|
||||
.form-input {
|
||||
&:not(:placeholder-shown) {
|
||||
@@ -516,7 +529,7 @@ input {
|
||||
}
|
||||
}
|
||||
|
||||
// Form Horizontal
|
||||
// Form horizontal
|
||||
.form-horizontal {
|
||||
padding: $layout-spacing 0;
|
||||
|
||||
@@ -525,3 +538,8 @@ input {
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
}
|
||||
|
||||
// Form inline
|
||||
.form-inline {
|
||||
display: inline-block;
|
||||
}
|
||||
@@ -31,8 +31,6 @@
|
||||
|
||||
.modal-container {
|
||||
animation: slide-down .2s ease 1;
|
||||
max-width: $control-width-md;
|
||||
width: 100%;
|
||||
z-index: $zindex-0;
|
||||
}
|
||||
}
|
||||
@@ -60,15 +58,23 @@
|
||||
@include shadow-variant(.2rem);
|
||||
background: $bg-color-light;
|
||||
border-radius: $border-radius;
|
||||
display: block;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
max-height: 75vh;
|
||||
max-width: $control-width-md;
|
||||
padding: 0 $unit-4;
|
||||
width: 100%;
|
||||
|
||||
&.modal-fullheight {
|
||||
max-height: 100vh;
|
||||
}
|
||||
|
||||
.modal-header {
|
||||
color: $dark-color;
|
||||
padding: $unit-4;
|
||||
}
|
||||
|
||||
.modal-body {
|
||||
max-height: 50vh;
|
||||
overflow-y: auto;
|
||||
padding: $unit-4;
|
||||
position: relative;
|
||||
|
||||
@@ -86,6 +86,10 @@ $off-canvas-breakpoint: $size-lg !default;
|
||||
position: relative;
|
||||
transform: none;
|
||||
}
|
||||
|
||||
.off-canvas-overlay {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,11 +16,10 @@
|
||||
}
|
||||
|
||||
*:focus + .popover-container,
|
||||
&:hover .popover-container,
|
||||
.popover-container:hover {
|
||||
&:hover .popover-container {
|
||||
display: block;
|
||||
opacity: 1;
|
||||
transform: translate(-50%, -100%) scale(1);
|
||||
transform: translate(-50%, -100%);
|
||||
}
|
||||
|
||||
&.popover-right {
|
||||
@@ -29,10 +28,9 @@
|
||||
top: 50%;
|
||||
}
|
||||
|
||||
:focus + .popover-container,
|
||||
&:hover .popover-container,
|
||||
.popover-container:hover {
|
||||
transform: translate(0, -50%) scale(1);
|
||||
*:focus + .popover-container,
|
||||
&:hover .popover-container {
|
||||
transform: translate(0, -50%);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,10 +40,9 @@
|
||||
top: 100%;
|
||||
}
|
||||
|
||||
:focus + .popover-container,
|
||||
&:hover .popover-container,
|
||||
.popover-container:hover {
|
||||
transform: translate(-50%, 0) scale(1);
|
||||
*:focus + .popover-container,
|
||||
&:hover .popover-container {
|
||||
transform: translate(-50%, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,10 +52,9 @@
|
||||
top: 50%;
|
||||
}
|
||||
|
||||
:focus + .popover-container,
|
||||
&:hover .popover-container,
|
||||
.popover-container:hover {
|
||||
transform: translate(-100%, -50%) scale(1);
|
||||
*:focus + .popover-container,
|
||||
&:hover .popover-container {
|
||||
transform: translate(-100%, -50%);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Core variables
|
||||
$version: "0.5.1";
|
||||
$version: "0.5.3";
|
||||
|
||||
// Core features
|
||||
$rtl: false !default;
|
||||
@@ -31,19 +31,21 @@ $warning-color: #ffb700 !default;
|
||||
$error-color: #e85600 !default;
|
||||
|
||||
// Other colors
|
||||
$code-color: #e06870 !default;
|
||||
$code-color: #d73e48 !default;
|
||||
$highlight-color: #ffe9b3 !default;
|
||||
$body-bg: $bg-color-light !default;
|
||||
$body-font-color: lighten($dark-color, 5%) !default;
|
||||
$link-color: $primary-color !default;
|
||||
$link-color-dark: darken($link-color, 5%) !default;
|
||||
$link-color-dark: darken($link-color, 10%) !default;
|
||||
$link-color-light: lighten($link-color, 10%) !default;
|
||||
|
||||
// Fonts
|
||||
// Credit: https://www.smashingmagazine.com/2015/11/using-system-ui-fonts-practical-guide/
|
||||
$base-font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto !default;
|
||||
$mono-font-family: "SF Mono", "Segoe UI Mono", "Roboto Mono", Menlo, Courier, monospace !default;
|
||||
$fallback-font-family: "Helvetica Neue", sans-serif !default;
|
||||
$cjk-zh-font-family: $base-font-family, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", $fallback-font-family !default;
|
||||
$cjk-zh-hans-font-family: $base-font-family, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", $fallback-font-family !default;
|
||||
$cjk-zh-hant-font-family: $base-font-family, "PingFang TC", "Hiragino Sans CNS", "Microsoft JhengHei", $fallback-font-family !default;
|
||||
$cjk-jp-font-family: $base-font-family, "Hiragino Sans", "Hiragino Kaku Gothic Pro", "Yu Gothic", YuGothic, Meiryo, $fallback-font-family !default;
|
||||
$cjk-ko-font-family: $base-font-family, "Malgun Gothic", $fallback-font-family !default;
|
||||
$body-font-family: $base-font-family, $fallback-font-family !default;
|
||||
@@ -70,7 +72,7 @@ $html-line-height: 1.5 !default;
|
||||
$font-size: .8rem !default;
|
||||
$font-size-sm: .7rem !default;
|
||||
$font-size-lg: .9rem !default;
|
||||
$line-height: 1rem !default;
|
||||
$line-height: 1.2rem !default;
|
||||
|
||||
// Sizes
|
||||
$layout-spacing: $unit-2 !default;
|
||||
|
||||
@@ -20,5 +20,8 @@
|
||||
&:hover {
|
||||
color: darken($color, 5%);
|
||||
}
|
||||
&:visited {
|
||||
color: lighten($color, 5%);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
@mixin label-base() {
|
||||
border-radius: $border-radius;
|
||||
line-height: 1.2;
|
||||
padding: .1rem .15rem;
|
||||
padding: .1rem .2rem;
|
||||
}
|
||||
|
||||
@mixin label-variant($color: $light-color, $bg-color: $primary-color) {
|
||||
|
||||
@@ -1,65 +1,65 @@
|
||||
// Margin utility mixin
|
||||
@mixin margin-variant($id: 1, $size: $unit-1) {
|
||||
.m-#{$id} {
|
||||
margin: $size;
|
||||
margin: $size !important;
|
||||
}
|
||||
|
||||
.mb-#{$id} {
|
||||
margin-bottom: $size;
|
||||
margin-bottom: $size !important;
|
||||
}
|
||||
|
||||
.ml-#{$id} {
|
||||
margin-left: $size;
|
||||
margin-left: $size !important;
|
||||
}
|
||||
|
||||
.mr-#{$id} {
|
||||
margin-right: $size;
|
||||
margin-right: $size !important;
|
||||
}
|
||||
|
||||
.mt-#{$id} {
|
||||
margin-top: $size;
|
||||
margin-top: $size !important;
|
||||
}
|
||||
|
||||
.mx-#{$id} {
|
||||
margin-left: $size;
|
||||
margin-right: $size;
|
||||
margin-left: $size !important;
|
||||
margin-right: $size !important;
|
||||
}
|
||||
|
||||
.my-#{$id} {
|
||||
margin-bottom: $size;
|
||||
margin-top: $size;
|
||||
margin-bottom: $size !important;
|
||||
margin-top: $size !important;
|
||||
}
|
||||
}
|
||||
|
||||
// Padding utility mixin
|
||||
@mixin padding-variant($id: 1, $size: $unit-1) {
|
||||
.p-#{$id} {
|
||||
padding: $size;
|
||||
padding: $size !important;
|
||||
}
|
||||
|
||||
.pb-#{$id} {
|
||||
padding-bottom: $size;
|
||||
padding-bottom: $size !important;
|
||||
}
|
||||
|
||||
.pl-#{$id} {
|
||||
padding-left: $size;
|
||||
padding-left: $size !important;
|
||||
}
|
||||
|
||||
.pr-#{$id} {
|
||||
padding-right: $size;
|
||||
padding-right: $size !important;
|
||||
}
|
||||
|
||||
.pt-#{$id} {
|
||||
padding-top: $size;
|
||||
padding-top: $size !important;
|
||||
}
|
||||
|
||||
.px-#{$id} {
|
||||
padding-left: $size;
|
||||
padding-right: $size;
|
||||
padding-left: $size !important;
|
||||
padding-right: $size !important;
|
||||
}
|
||||
|
||||
.py-#{$id} {
|
||||
padding-bottom: $size;
|
||||
padding-top: $size;
|
||||
padding-bottom: $size !important;
|
||||
padding-top: $size !important;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
@include text-color-variant(".text-light", $light-color);
|
||||
|
||||
@include text-color-variant(".text-dark", $body-font-color);
|
||||
|
||||
@include text-color-variant(".text-success", $success-color);
|
||||
|
||||
@include text-color-variant(".text-warning", $warning-color);
|
||||
|
||||
@@ -12,15 +12,15 @@
|
||||
}
|
||||
|
||||
.relative {
|
||||
position: relative;
|
||||
position: relative !important;
|
||||
}
|
||||
|
||||
.absolute {
|
||||
position: absolute;
|
||||
position: absolute !important;
|
||||
}
|
||||
|
||||
.fixed {
|
||||
position: fixed;
|
||||
position: fixed !important;
|
||||
}
|
||||
|
||||
.centered {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// Shapes
|
||||
.rounded {
|
||||
.s-rounded {
|
||||
border-radius: $border-radius;
|
||||
}
|
||||
|
||||
.circle {
|
||||
.s-circle {
|
||||
border-radius: 50%;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
.search-input, [data-grav-field="array"] input, [data-grav-field="array"] textarea {
|
||||
@extend .form-input;
|
||||
}
|
||||
|
||||
.button {
|
||||
@extend .btn;
|
||||
}
|
||||
@@ -1,11 +1,12 @@
|
||||
// Sticky Footer solution
|
||||
body.sticky-footer {
|
||||
min-height: 100%;
|
||||
height: 100%;
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
#page-wrapper {
|
||||
flex: 1;
|
||||
flex: 1 0 auto;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ form {
|
||||
span.required {
|
||||
color: $error-color;
|
||||
font-weight: 700;
|
||||
font-size: 150%;
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
.form-input[type=range] {
|
||||
|
||||
@@ -40,24 +40,34 @@ section.section {
|
||||
background-size: cover;
|
||||
background-position: center;
|
||||
|
||||
h1 {
|
||||
color: $header-text-dark;
|
||||
font-size: 4rem;
|
||||
}
|
||||
|
||||
h2 {
|
||||
color: rgba($header-text-dark, 0.8);
|
||||
font-size: 2.5rem;
|
||||
}
|
||||
|
||||
&.hero-fullscreen {
|
||||
height: 100vh;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
&.hero-large {
|
||||
height: 500px;
|
||||
min-height: 500px;
|
||||
}
|
||||
|
||||
&.hero-medium {
|
||||
height: 400px;
|
||||
min-height: 400px;
|
||||
}
|
||||
|
||||
&.hero-small {
|
||||
height: 110px;
|
||||
min-height: 110px;
|
||||
}
|
||||
|
||||
&.hero-tiny {
|
||||
height: 8rem;
|
||||
min-height: 8rem;
|
||||
}
|
||||
|
||||
.header-fixed & {
|
||||
@@ -68,19 +78,24 @@ section.section {
|
||||
// background-attachment: fixed;
|
||||
//}
|
||||
|
||||
h1 {
|
||||
color: $header-text-dark;
|
||||
font-size: 4rem !important;
|
||||
@include breakpoint(md) {
|
||||
h1 {
|
||||
font-size: 3rem;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.75rem;
|
||||
}
|
||||
}
|
||||
|
||||
h2 {
|
||||
color: rgba($header-text-dark, 0.8);
|
||||
font-size: 2.5rem !important;
|
||||
@include breakpoint(sm) {
|
||||
h1 {
|
||||
font-size: 2rem;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.25rem;
|
||||
}
|
||||
}
|
||||
|
||||
h1 + h2 {
|
||||
margin-top: -45px !important;
|
||||
}
|
||||
|
||||
&.text-light {
|
||||
h1 {
|
||||
@@ -92,7 +107,7 @@ section.section {
|
||||
}
|
||||
|
||||
p {
|
||||
font-size: 130%;
|
||||
font-size: .9rem;
|
||||
font-weight: 300;
|
||||
}
|
||||
|
||||
|
||||
@@ -47,13 +47,18 @@
|
||||
.navbar-section {
|
||||
height: $header-height-large;
|
||||
@extend .default-animation;
|
||||
|
||||
@include breakpoint(md) {
|
||||
margin-right: 2rem;
|
||||
}
|
||||
}
|
||||
|
||||
.logo svg {
|
||||
width: 150px;
|
||||
display: inherit;
|
||||
|
||||
@extend .default-animation;
|
||||
.logo {
|
||||
svg, img {
|
||||
height: 42px;
|
||||
display: inherit;
|
||||
@extend .default-animation;
|
||||
}
|
||||
}
|
||||
|
||||
// Fixed Header solution
|
||||
@@ -73,8 +78,10 @@ body.header-fixed.header-animated {
|
||||
height: $header-height-small;
|
||||
}
|
||||
|
||||
.logo svg {
|
||||
width: 100px;
|
||||
.logo {
|
||||
svg, img {
|
||||
height: 28px;
|
||||
}
|
||||
}
|
||||
|
||||
~ .mobile-menu .button_container {
|
||||
@@ -85,8 +92,4 @@ body.header-fixed.header-animated {
|
||||
|
||||
.login-status-wrapper {
|
||||
white-space: nowrap;
|
||||
|
||||
.icon {
|
||||
font-size: 120%;
|
||||
}
|
||||
}
|
||||
@@ -52,3 +52,26 @@
|
||||
color: $light-color;
|
||||
}
|
||||
}
|
||||
|
||||
@function strip-unit($value) {
|
||||
@return $value / ($value * 0 + 1);
|
||||
}
|
||||
|
||||
@mixin fluid-type($min-vw, $max-vw, $min-font-size, $max-font-size) {
|
||||
$u1: unit($min-vw);
|
||||
$u2: unit($max-vw);
|
||||
$u3: unit($min-font-size);
|
||||
$u4: unit($max-font-size);
|
||||
|
||||
@if $u1 == $u2 and $u1 == $u3 and $u1 == $u4 {
|
||||
& {
|
||||
font-size: $min-font-size;
|
||||
@media screen and (min-width: $min-vw) {
|
||||
font-size: calc(#{$min-font-size} + #{strip-unit($max-font-size - $min-font-size)} * ((100vw - #{$min-vw}) / #{strip-unit($max-vw - $min-vw)}));
|
||||
}
|
||||
@media screen and (min-width: $max-vw) {
|
||||
font-size: $max-font-size;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
}
|
||||
|
||||
.mobile-logo {
|
||||
svg {
|
||||
max-width: 150px;
|
||||
margin-top: 1rem;
|
||||
svg, img {
|
||||
height: 42px;
|
||||
margin-top: .7rem;
|
||||
margin-left: 1.4rem;
|
||||
|
||||
path {
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
.button_container {
|
||||
position: absolute;
|
||||
top: 1rem;
|
||||
top: 1.3rem;
|
||||
right: $horiz-padding;
|
||||
height: $mobile-button-height;
|
||||
width: $mobile-button-width;
|
||||
@@ -47,6 +47,8 @@
|
||||
z-index: 100;
|
||||
transition: opacity .25s ease, top 0.5s ease;
|
||||
|
||||
$bar-offset: $mobile-button-height / 3;
|
||||
|
||||
&:hover {
|
||||
opacity: .7;
|
||||
}
|
||||
@@ -55,7 +57,7 @@
|
||||
position: fixed;
|
||||
|
||||
.top {
|
||||
transform: translateY(11px) translateX(0) rotate(45deg);
|
||||
transform: translateY($bar-offset) translateX(0) rotate(45deg);
|
||||
background: $mobile-color-active;
|
||||
}
|
||||
.middle {
|
||||
@@ -64,7 +66,7 @@
|
||||
}
|
||||
|
||||
.bottom {
|
||||
transform: translateY(-11px) translateX(0) rotate(-45deg);
|
||||
transform: translateY(-($bar-offset)) translateX(0) rotate(-45deg);
|
||||
background: $mobile-color-active;
|
||||
}
|
||||
}
|
||||
@@ -72,7 +74,7 @@
|
||||
span {
|
||||
background: $mobile-color-main;
|
||||
border: none;
|
||||
height: 5px;
|
||||
height: 4px;
|
||||
width: 100%;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
@@ -81,11 +83,11 @@
|
||||
cursor: pointer;
|
||||
|
||||
&:nth-of-type(2) {
|
||||
top: 11px;
|
||||
top: $bar-offset;
|
||||
}
|
||||
|
||||
&:nth-of-type(3) {
|
||||
top: 22px;
|
||||
top: $bar-offset * 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#modular-hero {
|
||||
.modular-hero {
|
||||
#to-start {
|
||||
bottom: 3.5rem;
|
||||
}
|
||||
}
|
||||
|
||||
#modular-features {
|
||||
.modular-features {
|
||||
text-align: center;
|
||||
|
||||
&.offset-box {
|
||||
@@ -112,7 +112,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
#modular-text {
|
||||
.modular-text {
|
||||
padding-top: 4rem;
|
||||
padding-bottom: 4rem;
|
||||
|
||||
.columns.left {
|
||||
flex-direction: row-reverse;
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,7 @@
|
||||
html {
|
||||
@include fluid-type($size-xs, $size-xl, $min-responsive-font-size, $html-font-size);
|
||||
}
|
||||
|
||||
// Header Overrides
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
margin-top: 2rem;
|
||||
@@ -26,9 +30,16 @@ h6, .h6 {
|
||||
.title-h1h2 {
|
||||
h1 {
|
||||
font-weight: 100;
|
||||
margin-bottom: 0;
|
||||
line-height: 1.1;
|
||||
|
||||
strong, bold {
|
||||
font-weight: 400;
|
||||
font-weight: 400;
|
||||
}
|
||||
}
|
||||
h1 + h2 {
|
||||
line-height: 1.1;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -36,7 +47,6 @@ h6, .h6 {
|
||||
// Typography Hints
|
||||
.title-h1h2, .title-center {
|
||||
h1 + h2 {
|
||||
margin-top: -35px;
|
||||
margin-bottom: 50px;
|
||||
font-weight: 700;
|
||||
}
|
||||
@@ -119,10 +129,29 @@ strong {
|
||||
margin-bottom: 1rem;
|
||||
|
||||
.icon {
|
||||
font-size: 120%;
|
||||
font-size: 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
// Lists
|
||||
ul,
|
||||
ol {
|
||||
margin-left: $unit-8;
|
||||
|
||||
ul,
|
||||
ol {
|
||||
margin-left: $unit-8;
|
||||
}
|
||||
}
|
||||
|
||||
ul {
|
||||
list-style: disc outside;
|
||||
}
|
||||
|
||||
ol {
|
||||
list-style: decimal outside;
|
||||
}
|
||||
|
||||
// Notices
|
||||
.notices {
|
||||
margin: 1.5rem 0;
|
||||
|
||||
@@ -3,6 +3,7 @@ $horiz-padding: 1rem;
|
||||
$vert-padding: 2rem 0 2rem;
|
||||
|
||||
// Fonts
|
||||
$min-responsive-font-size: 16px;
|
||||
$title-font-family: $base-font-family, $fallback-font-family !default;
|
||||
|
||||
// Header
|
||||
@@ -24,5 +25,5 @@ $dropmenu-shadow: 0 3px 5px rgba(0, 0, 0, 0.1);
|
||||
$mobile-color-main: $primary-color;
|
||||
$mobile-color-active: #FFF;
|
||||
$mobile-color-link: #FFF;
|
||||
$mobile-button-height: 27px;
|
||||
$mobile-button-width: 35px;
|
||||
$mobile-button-height: 24px;
|
||||
$mobile-button-width: 28px;
|
||||
@@ -1,9 +1,10 @@
|
||||
{% extends 'partials/base.html.twig' %}
|
||||
{% set blog_image = page.media.images[page.header.hero_image] ?: page.media.images|first %}
|
||||
{% set collection = page.collection() %}
|
||||
{% set show_breadcrumbs = header_var('show_sidebar', '/blog')|default(true) %}
|
||||
{% set show_sidebar = header_var('show_sidebar')|default(true) %}
|
||||
{% set show_pagination = header_var('show_sidebar')|default(true) %}
|
||||
{% set blog = page.find(header_var('blog_url')|defined(theme_var('blog-page'))) %}
|
||||
{% set show_breadcrumbs = header_var('show_breadcrumbs', [page, blog])|defined(true) %}
|
||||
{% set show_sidebar = header_var('show_sidebar', [page, blog])|defined(true) %}
|
||||
{% set show_pagination = header_var('show_pagination', [page, blog])|defined(true) %}
|
||||
|
||||
{% block stylesheets %}
|
||||
{% do assets.addCss('theme://css/bricklayer.css') %}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
{% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
|
||||
{% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
|
||||
{% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
|
||||
{% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
|
||||
{% if required %}required="required"{% endif %}
|
||||
{% endblock %}
|
||||
/>
|
||||
<i class="form-icon"></i>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
{% if field.classes is defined %}class="{{ field.classes }}" {% endif %}
|
||||
{% if key == value %}checked="checked" {% endif %}
|
||||
{% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
|
||||
{% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
|
||||
{% if required %}required="required"{% endif %}
|
||||
/>
|
||||
<i class="form-icon"></i>
|
||||
{% if grav.twig.twig.filters['tu'] is defined %}{{ text|tu|raw }}{% else %}{{ text|t|raw }}{% endif %}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{% extends 'partials/base.html.twig' %}
|
||||
{% set blog = page.find(theme_var('blog-page')|default('/blog')) %}
|
||||
{% set show_breadcrumbs = header_var('show_breadcrumbs', [page, blog]) %}
|
||||
{% set show_sidebar = header_var('show_sidebar', [page, blog]) %}
|
||||
{% set show_pagination = header_var('show_pagination', [page, blog]) %}
|
||||
{% set blog = page.find(header_var('blog_url')|defined(theme_var('blog-page'))) %}
|
||||
{% set show_breadcrumbs = header_var('show_breadcrumbs', [page, blog])|defined(true) %}
|
||||
{% set show_sidebar = header_var('show_sidebar', [page, blog])|defined(true) %}
|
||||
{% set show_pagination = header_var('show_pagination', [page, blog])|defined(true) %}
|
||||
{% set hero_image_name = page.header.hero_image %}
|
||||
|
||||
{% block hero %}
|
||||
@@ -39,4 +39,3 @@
|
||||
</section>
|
||||
</section>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{% set grid_size = theme_var('grid-size') %}
|
||||
{% set columns = page.header.class == 'small' ? 'col-3 col-md-4 col-sm-6' : 'col-4 col-md-6 col-sm-12' %}
|
||||
<section id="modular-features" class="section {{ page.header.class}}">
|
||||
<section class="section modular-features {{ page.header.class}}">
|
||||
<section class="container {{ grid_size }}">
|
||||
<div class="frame-box">
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% set grid_size = theme_var('grid-size') %}
|
||||
{% set hero_image = page.header.hero_image ? page.media[page.header.hero_image] : page.media.images|first %}
|
||||
|
||||
{% include 'partials/hero.html.twig' with {id: 'modular-hero'} %}
|
||||
{% include 'partials/hero.html.twig' %}
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{% set grid_size = theme_var('grid-size') %}
|
||||
{% set image = page.media.images|first %}
|
||||
|
||||
<section id="modular-text" class="section {{ page.header.class}} bg-gray">
|
||||
<section class="section modular-text {{ page.header.class}} bg-gray">
|
||||
<section class="container {{ grid_size }}">
|
||||
<div class="columns">
|
||||
<div class="columns {{ page.header.image_align|default('align-right') }}">
|
||||
<div class="column col-6 col-md-12">
|
||||
{{ content }}
|
||||
</div>
|
||||
<div class="column col-6 col-md-12">
|
||||
{% if image %}
|
||||
{{ image.html('','','align-'~page.header.image_align) }}
|
||||
{{ image.html }}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
<section class="container {{ grid_size }}">
|
||||
<nav class="navbar">
|
||||
<section class="navbar-section logo">
|
||||
<a href="{{ home_url }}" class="navbar-brand mr-10">{% include('@images/grav-logo.svg') %}</a>
|
||||
{% include 'partials/logo.html.twig' %}
|
||||
</section>
|
||||
<section class="navbar-section">
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
<div class="mobile-container">
|
||||
<div class="overlay" id="overlay">
|
||||
<div class="mobile-logo">
|
||||
{% include('@images/grav-logo.svg') %}
|
||||
{% include 'partials/logo.html.twig' with {mobile: true} %}
|
||||
</div>
|
||||
<nav class="overlay-menu">
|
||||
{% include 'partials/navigation.html.twig' with {tree: true} %}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<section id="{{ id }}" class="section hero {{ page.header.hero_classes }} {{ page.header.background.parallax ? 'parallax' : '' }}" {% if hero_image %}style="background-image: url({{ hero_image.url }});"{% endif %}>
|
||||
<section id="{{ id }}" class="section modular-hero hero {{ page.header.hero_classes }} {{ page.header.background.parallax ? 'parallax' : '' }}" {% if hero_image %}style="background-image: url({{ hero_image.url }});"{% endif %}>
|
||||
<div class="image-overlay"></div>
|
||||
<section class="container {{ grid_size }}" style="text-align: {{ page.header.hero_align|default('center') }}">
|
||||
{{ content }}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
{% set logo = theme_var(mobile ? 'custom_logo_mobile' : 'custom_logo') %}
|
||||
<a href="{{ home_url }}" class="navbar-brand mr-10">
|
||||
{% if logo %}
|
||||
{% set logo_file = (logo|first).name %}
|
||||
<img src="{{ url('theme://images/logo/' ~ logo_file) }}" alt="{{ site.name }}" />
|
||||
{% else %}
|
||||
{% include('@images/grav-logo.svg') %}
|
||||
{% endif %}
|
||||
</a>
|
||||
@@ -38,5 +38,6 @@
|
||||
<h4>{{ 'SIDEBAR.SYNDICATE.HEADLINE'|t }}</h4>
|
||||
<a class="btn" href="{{ feed_url }}.atom"><i class="fa fa-rss-square"></i> Atom 1.0</a>
|
||||
<a class="btn" href="{{ feed_url }}.rss"><i class="fa fa-rss-square"></i> RSS</a>
|
||||
{% if config.plugins.feed.enable_json_feed %}<a class="btn" href="{{ feed_url }}.json"><i class="fa fa-rss-square"></i> JSON</a>{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@@ -138,12 +138,6 @@ function drag() {
|
||||
"height": 'auto',
|
||||
})
|
||||
|
||||
$rs.css({
|
||||
"top": yPos2,
|
||||
"bottom":0,
|
||||
"height": 'auto',
|
||||
})
|
||||
|
||||
$links.css({
|
||||
"top": yPos2,
|
||||
"left":xPos2,
|
||||
@@ -152,6 +146,12 @@ function drag() {
|
||||
"height": 'auto',
|
||||
})
|
||||
|
||||
$rs.css({
|
||||
"top": yPos2,
|
||||
"bottom":0,
|
||||
"height": 'auto',
|
||||
})
|
||||
|
||||
// if itw < 200
|
||||
var testPourcent = parseFloat( p * parseFloat(ui.position.left + 238) / oW ) + "%";
|
||||
var img200 = parseFloat( p * parseFloat( (oW - (pos11 - 25 )) / oW) ) + "%" ;
|
||||
@@ -160,7 +160,7 @@ function drag() {
|
||||
$img.css({
|
||||
"width": img200,
|
||||
})
|
||||
$links.css({
|
||||
$rs.css({
|
||||
"width": img200,
|
||||
})
|
||||
$hand2.css({
|
||||
@@ -269,7 +269,7 @@ function drag() {
|
||||
})
|
||||
|
||||
// if itw < 200
|
||||
var test = ui.position.left - 200;
|
||||
var test = ui.position.left - 225;
|
||||
var testPourcent = ( p * parseFloat(test) / oW ) + "%";
|
||||
var img200 = ( p * parseFloat( ((pos.left) ) / oW) + "%" );
|
||||
|
||||
@@ -283,7 +283,7 @@ function drag() {
|
||||
$itw.css({
|
||||
"left": img200,
|
||||
})
|
||||
$rs.css({
|
||||
$links.css({
|
||||
"left": img200,
|
||||
})
|
||||
$hand1.css({
|
||||
@@ -305,11 +305,10 @@ function drag() {
|
||||
};
|
||||
|
||||
function dragcanvas() {
|
||||
var $links = $('#reseaux-sociaux canvas');
|
||||
var $reseau = $('#links svg')
|
||||
var $reseau = $('#reseaux-sociaux canvas');
|
||||
var $links = $('#links svg')
|
||||
|
||||
$links.draggable({
|
||||
// containment:"#start",
|
||||
scroll: false
|
||||
});
|
||||
|
||||
@@ -318,15 +317,12 @@ function dragcanvas() {
|
||||
});
|
||||
}
|
||||
|
||||
function D3js() {
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
// gestionarray();
|
||||
clickhand();
|
||||
drag();
|
||||
dragcanvas();
|
||||
map();
|
||||
D3js();
|
||||
// D3js();
|
||||
// scrollbar();
|
||||
});
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
var color = d3.scaleOrdinal(d3.schemeCategory20);
|
||||
|
||||
var simulation = d3.forceSimulation()
|
||||
.force("link", d3.forceLink().distance(300).id(function(d) { return d.id; }))
|
||||
.force("link", d3.forceLink().distance(200).id(function(d) { return d.id; }))
|
||||
.force("charge", d3.forceManyBody())
|
||||
.force("center", d3.forceCenter(width / 2, height / 2));
|
||||
|
||||
@@ -47,7 +47,6 @@
|
||||
.attr("x2", function(d) { return d.target.x; })
|
||||
.attr("y2", function(d) { return d.target.y; });
|
||||
|
||||
|
||||
node
|
||||
.attr("x", function(d) { return d.x; })
|
||||
.attr("y", function(d) { return d.y; });
|
||||
@@ -55,7 +54,7 @@
|
||||
});
|
||||
|
||||
function dragstarted(d) {
|
||||
if (!d3.event.active) simulation.alphaTarget(0.3).restart();
|
||||
if (!d3.event.active) simulation.alphaTarget(0.1).restart();
|
||||
d.fx = d.x;
|
||||
d.fy = d.y;
|
||||
}
|
||||
|
||||
@@ -105,7 +105,7 @@ body{
|
||||
#streetmap{
|
||||
#mapid{
|
||||
filter: grayscale(100%) contrast(1);
|
||||
|
||||
|
||||
}
|
||||
& > div:nth-of-type(1){
|
||||
height: 100%;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
{% block body %}
|
||||
{% for module in page.collection %}
|
||||
<div id="{{ _self.pageLinkName(module.folder)|replace({"0":"", "1":"", "2":"", "3":"", "4":"", "5":"", "6":"", "7":"", "8":"", "9":"", ".":"","_":"" }) }}">
|
||||
{{ module.content }}
|
||||
{{ module.content }}
|
||||
</div>
|
||||
{% endfor %}
|
||||
<svg width="3960" height="2160" resize hidpi="on"></svg>
|
||||
|
||||
@@ -6,6 +6,5 @@
|
||||
{% for module in page.collection %}
|
||||
{{ module.content }}
|
||||
<canvas id="canvas" resize hidpi="on" style="background:white"></canvas>
|
||||
|
||||
{% endfor %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
title: Text
|
||||
'@extends': default
|
||||
|
||||
form:
|
||||
fields:
|
||||
tabs:
|
||||
fields:
|
||||
content:
|
||||
fields:
|
||||
header.media_order:
|
||||
label: Page Media (first one will be displayed next to your content)
|
||||
header.image_align:
|
||||
type: select
|
||||
label: Image position
|
||||
classes: fancy
|
||||
default: left
|
||||
options:
|
||||
'left': 'Left'
|
||||
'right': 'Right'
|
||||
options:
|
||||
|
||||
fields:
|
||||
|
||||
identifiant:
|
||||
type: section
|
||||
title: Identifiant
|
||||
|
||||
fields:
|
||||
header.id:
|
||||
type: text
|
||||
label: Id
|
||||
multiple: true
|
||||
|
||||
Reference in New Issue
Block a user