Beanz/flatpress
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #203 from Fraenkiman/upstream/issue201

Browse Source 
fixes several layout/css-glitches in the previous administration area and in the styles
This commit is contained in:
Arvid Zimmermann 2023-06-11 13:38:13 +02:00 committed by GitHub
commit 909d48296b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 108 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/panels/entry/admin.entry.commentlist.tpl
View File

@ -2,7 +2,7 @@
{entry_block}
{entry}
<h2>{$panelstrings.head} <a href="admin.php?p=entry&amp;action=write&amp;entry={$id}">{$subject}</a></h2>
<h2>{$panelstrings.head} <a class="head-link" href="admin.php?p=entry&amp;action=write&amp;entry={$id}">{$subject}</a></h2>
{include file="shared:errorlist.tpl"}
<p>{$panelstrings.descr}</p>

2
admin/panels/entry/admin.entry.delete.tpl
View File

@ -4,7 +4,7 @@
{entry_block}
{html_form}
<fieldset><legend>{$panelstrings.preview}</legend>
<fieldset id="post-preview"><legend>{$panelstrings.preview}</legend>
{include file="preview.tpl"}
</fieldset>
<p>{$panelstrings.confirm}</p>

2
admin/panels/static/admin.static.delete.tpl
View File

@ -2,7 +2,7 @@
<p>{$panelstrings.descr}</p>
{statics}
<fieldset><legend>{$panelstrings.preview}</legend>
<fieldset id="post-preview"><legend>{$panelstrings.preview}</legend>
{include file="previewstatic.tpl"}
</fieldset>
{/statics}

2
fp-interface/themes/leggero/default.tpl
View File

@ -4,7 +4,7 @@
<div class="entry">
<h3 class="title">{$subject}</h3>
<h2 class="title">{$subject}</h2>
<div class="body">
{if isset($rawcontent) and $rawcontent} {$content}

4
fp-interface/themes/leggero/entry-default.tpl
View File

@ -5,11 +5,11 @@
{$date|date_format_daily:"<h2 class=\"date\">`$fp_config.locale.dateformat`</h2>"}
<h3 itemprop="name">
<h2 itemprop="name" class="entry-title">
<a href="{$id|link:post_link}">
{$subject|tag:the_title}
</a>
</h3>
</h2>
{include file="shared:entryadminctrls.tpl"}
<div itemprop="articleBody">

12
fp-interface/themes/leggero/flatmaas-rev/res/admin.css
View File

@ -124,11 +124,6 @@ input#subject {
#admin-bbcode-toolbar select {width: 10em}
#admin-content {
background: url(../imgs/nib-logo.png) bottom right no-repeat;
}
#admin-content table {
border-collapse: collapse;
width: 100%;
@ -367,6 +362,8 @@ input.maxsize, select.maxsize { width: 100% }
/* ===== PREVIEW SETTINGS ===== */
#post-preview .entry { padding: 2em }
#post-preview div.entry h3 { font-size: 1.3em }
#post-preview ul { list-style: none; padding: 0 0 0 1.6em }
#post-preview ol { list-style-position: inside; Padding: 0 1.6em 0 1.6em }
@ -654,3 +651,8 @@ a.link-enable:hover {
margin-bottom: 2em;
padding: 1em 2em
}
form {
margin: auto;
}

14
fp-interface/themes/leggero/flatmaas-rev/res/common.css
View File

@ -153,17 +153,23 @@ h1 {
}
h2 { /* */ }
h3 {
h2 {
/* Titles of the entry */
font-size: 1.3em;
font-size: 1.4em;
color: #333333;
margin: 0;
}
.entry-title {
padding: 2px 0 2px 30px;
background: transparent url('../imgs/entry.png') center left no-repeat
}
.entry-title a {
color: #333333 !IMPORTANT;
}
h3 { margin: 0; font-size: 1.3em; }
h4 { font-size: 1.2em; }
/* in the specific ID */

22
fp-interface/themes/leggero/leggero-v2/res/admin.css
View File

@ -34,6 +34,10 @@ h2 {
border-bottom: 1px solid #ddd;
}
.head-link {
font-size: 0.83em;
}
body { background: #eee; }
/* === Redefines some stuff in inline mode === */
@ -282,6 +286,16 @@ input.maxsize, select.maxsize { width: 99% }
/* ===== PREVIEW SETTINGS ===== */
#post-preview .entry { padding: 2em; max-height: 20em; overflow: auto }
#post-preview div.entry h2 {
font-family: sans-serif;
border-bottom: none;
margin: 0.83em 0;
}
#post-preview div.entry h4 {
margin: 2em 0 0 0;
}
.entry-footer {
margin: 2em 0 0.5em 0;
text-align: right;
@ -433,7 +447,7 @@ li.widget-class {
.admin-widgetset h3 {
margin-bottom:1em;
margin-bottom: 1em;
padding: .3em;
background: #eee;
border: 1px solid #ddd;
@ -596,4 +610,8 @@ a.link-general:hover, .main-cell a:hover {
#footer {
color: black;
}
}
form {
margin: auto;
}

22
fp-interface/themes/leggero/leggero-v2/res/common.css
View File

@ -124,13 +124,22 @@ h1 {
margin: 1em 0 0.5em 0;
}
h2 { } /* see h2.date */
h3 {
h2 {
/* Titles of the entry */
font-style: normal;
font-size: 1.6em;
margin: 0
margin: 0.83em 0;
}
h2.entry-title,
h2.title {
margin: 0 !IMPORTANT;
}
h3 {
font-style: normal;
font-size: 1.4em;
margin: 0;
}
h4 { font-size: 1.2em; }
@ -247,7 +256,7 @@ h4#addcomment {clear:both;}
}
/* === Class of main block === */
h2.date {
h6.date {
font-size: 0.8em;
color: #444;
}
@ -300,7 +309,8 @@ h4#addcomment {clear:both;}
.navigation { /* next entries & previous entries link */
font-size: 90%;
margin-bottom: 3em
/* margin-bottom: 3em; */
display: flow-root;
}
form#search ul {

3
fp-interface/themes/leggero/leggero-v2/res/print.css
View File

@ -81,6 +81,9 @@ pre {
background-color: #eee;
font-size: 70%;
border: 1px dotted #333;
white-space: pre-line;
overflow: auto;
text-overflow: ellipsis;
}
.link-comments {

33
fp-interface/themes/leggero/leggero/res/admin.css
View File

@ -38,6 +38,12 @@ h2 {
border-bottom: 1px solid #ddd;
}
#admin-content h2,
#admin-content form h2 {
font-style: normal;
padding: unset;
}
body { background: #eee; }
/* === Redefines some stuff in inline mode === */
@ -279,6 +285,24 @@ input.maxsize, select.maxsize { width: 100% }
/* ===== PREVIEW SETTINGS ===== */
#post-preview .entry { padding: 2em; max-height: 20em; overflow: auto }
#post-preview div.entry h2,
#post-preview div.entry h3 {
border-bottom: none;
}
#post-preview div.entry h2 {
font-style: italic;
margin: 0;
padding: 1em 0 1em 0;
}
#post-preview div.entry h4 {
margin: 2em 0 0 0;
}
.entry-footer {
text-align: right;
}
/* ===== UPLOAD PANEL ===== */
#admin-uploader-filelist {
@ -426,6 +450,7 @@ li.widget-class {
.admin-widgetset h3 {
font-style: italic;
margin-bottom:1em;
padding: .3em;
background: #eee;
@ -492,6 +517,10 @@ li.widget-class {
margin-bottom: 4em;
}
.option-list ul li {
list-style-type: none;
}
.option-set dt {
width: 33%;
text-align:right;
@ -586,3 +615,7 @@ a.link-general:hover, .main-cell a:hover {
#admin-content ul.msgs {
margin:0;
}
form {
margin: auto;
}

12
fp-interface/themes/leggero/leggero/res/common.css
View File

@ -158,9 +158,7 @@ h1 {
margin: 2em 0 0 0.5em
}
h2 { } /* see h2.date */
h3 {
h2 {
/* Titles of the entry */
font-family: 'book antiqua', georgia, garamond, times, 'times new roman', serif;
font-style: italic;
@ -170,6 +168,12 @@ h3 {
padding: 1em 0 1em 0;
}
h3 {
margin: 0;
font-size: 1.3em;
padding: 1em 0 1em 0;
}
h4 { font-size: 1.2em; }
@ -272,7 +276,7 @@ h4 { font-size: 1.2em; }
}
/* === Class of main block === */
h2.date {
h6.date {
font-size: 80%;
color: #aaa;
}

4
fp-interface/themes/leggero/preview.tpl
View File

@ -1,7 +1,7 @@
{entry content=$entry}
<div class="entry">
{$date|date_format_daily:"<h2 class=\"date\">`$fp_config.locale.dateformat`</h2>"}
<h3>{$subject|tag:the_title}</h3>
{$date|date_format_daily:"<h6 class=\"date\">`$fp_config.locale.dateformat`</h6>"}
<h2 class="entry-title">{$subject|tag:the_title}</h2>
{$content|tag:the_content}
<ul class="entry-footer">
<li class="entry-info">

2
fp-interface/themes/leggero/previewstatic.tpl
View File

@ -1,6 +1,6 @@
{static content=$entry}
<div class="entry">
<h3>{$subject|tag:the_title}</h3>
<h2 class="entry-title">{$subject|tag:the_title}</h2>
<p class="date">{$lang.staticauthor.published_by} {$author} {$lang.staticauthor.on} {$date|date_format_daily} </p>
{$content|tag:the_content}
</div>

2
fp-interface/themes/leggero/static.tpl
View File

@ -6,7 +6,7 @@
{static_block}
{static}
<div id="{$id}" class="entry page-{$id}">
<h3>{$subject}</h3>
<h2 class="entry-title">{$subject}</h2>
<p class="date">{$lang.staticauthor.published_by} {$author} {$lang.staticauthor.on} {$date|date_format_daily}</p>
{$content|tag:the_content}

BIN
fp-plugins/bbcode/res/toolbaricons/h4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 416 B

1
fp-plugins/bbcode/tpls/toolbar.tpl
View File

@ -15,6 +15,7 @@
<img src="fp-plugins/bbcode/res/toolbaricons/mail.png" id="bb_mail" accesskey="" alt="mail" title="mail" onclick="insBBCode('mail');" />
<img src="fp-plugins/bbcode/res/toolbaricons/h2.png" id="bb_h2" accesskey="" alt="h2" title="h2" onclick="insBBCode('h2');" />
<img src="fp-plugins/bbcode/res/toolbaricons/h3.png" id="bb_h3" accesskey="" alt="h3" title="h3" onclick="insBBCode('h3');" />
<img src="fp-plugins/bbcode/res/toolbaricons/h4.png" id="bb_h4" accesskey="" alt="h4" title="h4" onclick="insBBCode('h4');" />
<img src="fp-plugins/bbcode/res/toolbaricons/ul.png" id="bb_ul" accesskey="" alt="ul" title="unordered list" onclick="insBBCodeWithContent('list', '\n[*]\n[*]\n');" />
<img src="fp-plugins/bbcode/res/toolbaricons/ol.png" id="bb_ol" accesskey="" alt="ol" title="ordered list" onclick="insBBCodeWithParamsAndContent('list', '#', '\n[*]\n[*]\n');" />
<img src="fp-plugins/bbcode/res/toolbaricons/quote.png" id="bb_quote" accesskey="" alt="quote" title="{$lang.admin.plugin.bbcode.editor.quotetitle}" onclick="insBBCode('quote');" />