From 353fda42555ef84cbe70d65b911996d3611a69bc Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 18 Jul 2016 12:01:14 +0000 Subject: [PATCH] done #558 @0.5 --- framework/application/forms/CMS/Texte.php | 10 ++++++++++ .../views/scripts/templates/texte.phtml | 12 ++++++------ less/002-common.less | 18 ++++++++++++++++++ less/240-text.less | 14 ++++++++++++++ 4 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 less/240-text.less diff --git a/framework/application/forms/CMS/Texte.php b/framework/application/forms/CMS/Texte.php index 372338f..496e410 100644 --- a/framework/application/forms/CMS/Texte.php +++ b/framework/application/forms/CMS/Texte.php @@ -1,5 +1,15 @@ setLabel('Titre'); + $title->setAttrib('rows', 3); + $this->addElement($title); + $content = new CubeIT_Form_Element_Markitup('content'); + $content->setLabel('Contenu'); + $this->addElement($content); + } } \ No newline at end of file diff --git a/framework/application/views/scripts/templates/texte.phtml b/framework/application/views/scripts/templates/texte.phtml index 981ae3a..75c6de1 100644 --- a/framework/application/views/scripts/templates/texte.phtml +++ b/framework/application/views/scripts/templates/texte.phtml @@ -1,7 +1,7 @@ headScript()->addScriptAndStyle('240-text'); +$res = $this->htmlElement('', 'div', array('class' => 'no-intro')); +$c = $this->htmlElement($this->title($this->title), 'div', array('class' => 'col-2')); +$c .= $this->htmlElement($this->markupDotclear($this->content), 'div', array('class' => 'col-6')); +$res .= $this->htmlElement($c, 'div', array('class' => array('content-wrapper', 'grid', 'wrap'))); +echo $res; \ No newline at end of file diff --git a/less/002-common.less b/less/002-common.less index 09f8bed..b3a34e4 100644 --- a/less/002-common.less +++ b/less/002-common.less @@ -151,4 +151,22 @@ a { ul { .list(); } +} + +.no-intro { + height: 0px; + box-sizing: content-box; + padding-top: 152px; // Minimum clearance and top for fixed menu + + @media @m1280 { + padding-top: 120px; + } + + @media @m900 { + padding-top: 100px; + } + + @media @m768 { + padding-top: 80px; + } } \ No newline at end of file diff --git a/less/240-text.less b/less/240-text.less new file mode 100644 index 0000000..4fc837f --- /dev/null +++ b/less/240-text.less @@ -0,0 +1,14 @@ +@import "000-imports"; + +h2 { + font-family: @playfair; + font-weight: 400; + font-size: 30px; + margin-bottom: .5em; + margin-top: .8em; + line-height: 1.1; + + @media @m900 { + font-size: 20px; + } +} \ No newline at end of file -- 2.39.5