From aff00383cf73706748554b03f5fb32affc3da373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Fri, 11 Dec 2015 09:12:16 +0100 Subject: [PATCH] Long names in wiki brokes UI --- app/partials/wiki/wiki.jade | 5 +++-- app/styles/components/wysiwyg.scss | 6 +++++- app/styles/layout/wiki-edit.scss | 7 ------- app/styles/layout/wiki.scss | 4 ++++ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/partials/wiki/wiki.jade b/app/partials/wiki/wiki.jade index def34e10..ec699d01 100644 --- a/app/partials/wiki/wiki.jade +++ b/app/partials/wiki/wiki.jade @@ -6,13 +6,14 @@ div.wrapper(ng-controller="WikiDetailController as ctrl", sidebar.menu-secondary.extrabar(tg-check-permission="view_wiki_links") section.wiki-nav(tg-wiki-nav, ng-model="wikiLinks") section.main.wiki - .header + header h1 span(tg-bo-bind="project.name") span.green(translate="PROJECT.SECTION.WIKI") - span.wiki-title(ng-bind='wikiTitle') + div.summary.wiki-summary(tg-wiki-summary, ng-model="wiki", ng-if="wiki.id") + h2.wiki-title(ng-bind='wikiTitle') section.wiki-content(tg-editable-wiki-content, ng-model="wiki") tg-attachments(ng-model="wiki", type="wiki_page", ng-if="wiki.id") diff --git a/app/styles/components/wysiwyg.scss b/app/styles/components/wysiwyg.scss index c742fbf3..56c46839 100644 --- a/app/styles/components/wysiwyg.scss +++ b/app/styles/components/wysiwyg.scss @@ -1,5 +1,6 @@ .wysiwyg { line-height: 1.4rem; + margin-bottom: 2rem; overflow: auto; padding: 1rem; h1 { @@ -46,7 +47,6 @@ } } p { - line-height: 1.4rem; margin-bottom: 1rem; } .codehilite { @@ -98,4 +98,8 @@ img { max-width: 100%; } + textarea { + background: $white; + max-height: none; + } } diff --git a/app/styles/layout/wiki-edit.scss b/app/styles/layout/wiki-edit.scss index f1ee14a4..1fe76b62 100644 --- a/app/styles/layout/wiki-edit.scss +++ b/app/styles/layout/wiki-edit.scss @@ -1,10 +1,3 @@ -.wysiwyg { - margin-bottom: 2rem; - textarea { - background: $white; - max-height: none; - } -} .save-wiki { float: right; } diff --git a/app/styles/layout/wiki.scss b/app/styles/layout/wiki.scss index 62fb3b23..1285b1d9 100644 --- a/app/styles/layout/wiki.scss +++ b/app/styles/layout/wiki.scss @@ -1,4 +1,8 @@ .wiki { + .wiki-title { + @extend %light; + @extend %larger; + } .remove { @extend %small; color: $gray-light;