This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 0afb344056f45e3d7bb23902467db9dcbd7c8c7f (commit)
from 1642dbe46b5d489c91b482edbb93f744a994ba97 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0afb344056f45e3d7bb23902467db9dcbd7c8c7f
commit 0afb344056f45e3d7bb23902467db9dcbd7c8c7f
Author: Marc-Etienne Vargenau <[email protected]>
Date: Thu Mar 25 12:32:24 2021 +0100
Whitespace
diff --git a/src/common/forum/ForumHTML.class.php
b/src/common/forum/ForumHTML.class.php
index 3d4996d..f6fcd72 100644
--- a/src/common/forum/ForumHTML.class.php
+++ b/src/common/forum/ForumHTML.class.php
@@ -560,9 +560,9 @@ class ForumHTML extends FFError {
/**
* getIsPinned - to get is_pinned value from a thread
- *
+ *
* @param int $thread_id - thread id
- *
+ *
* @return boolean is_pinned - thread is pinned or not
*/
public static function getIsPinned($thread_id) {
@@ -573,7 +573,7 @@ class ForumHTML extends FFError {
}
return $is_pinned;
}
-
+
/**
* @param int $thread_id
* @param int $is_followup_to
@@ -632,7 +632,7 @@ class ForumHTML extends FFError {
if (!session_loggedin()) {
echo '<span class="highlight">';
printf (_('You are posting anonymously because you are
not <a href="%s">logged in</a>'),util_make_url
('/account/login.php?return_to='.
urlencode(getStringFromServer('REQUEST_URI'))));
- echo '</span>';
+ echo '</span>';
}
?> <br />
<input type="submit" name="submit"
diff --git a/src/db/20210308-forum-pinned-thread.sql
b/src/db/20210308-forum-pinned-thread.sql
index 1abbf96..fd497ee 100644
--- a/src/db/20210308-forum-pinned-thread.sql
+++ b/src/db/20210308-forum-pinned-thread.sql
@@ -1 +1 @@
-ALTER TABLE forum ADD is_pinned BOOLEAN DEFAULT 'f';
+ALTER TABLE forum ADD is_pinned BOOLEAN DEFAULT 'f';
diff --git a/src/www/themes/funky-guy/README.txt
b/src/www/themes/funky-guy/README.txt
index ce5bac0..71668ff 100644
--- a/src/www/themes/funky-guy/README.txt
+++ b/src/www/themes/funky-guy/README.txt
@@ -8,9 +8,9 @@ About the Funky Theme:
The Funky theme is Copyright 2010 (c) Capgemini (www.capgemini.com)
AUTHOR: Antoine Mercadal <[email protected]>
-The Funky theme is free software; you can redistribute it and/or modify it
under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
+The Funky theme is free software; you can redistribute it and/or modify it
under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
version.
@@ -18,4 +18,4 @@ Credits:
========
Author: Antoine Mercadal ([email protected])
-Design by: Antoine Mercadal ([email protected])
\ No newline at end of file
+Design by: Antoine Mercadal ([email protected])
diff --git a/src/www/themes/funky-guy/Theme.class.php
b/src/www/themes/funky-guy/Theme.class.php
index dff35ca..7d4514c 100644
--- a/src/www/themes/funky-guy/Theme.class.php
+++ b/src/www/themes/funky-guy/Theme.class.php
@@ -27,7 +27,7 @@
require_once $gfwww.'include/Layout.class.php';
class Theme_Funky_Guy extends Layout {
-
+
function __construct() {
parent::__construct();
$this->themeurl = util_make_uri('themes/funky-guy/');
@@ -100,9 +100,9 @@ class Theme_Funky_Guy extends Layout {
function hamburgerButton() {
$hamburgerIcon = '<svg viewBox="0 0 50 40" width="20"
height="20" fill="#eee">
- <rect width="50" height="7"></rect>
- <rect y="15" width="50" height="7"></rect>
- <rect y="30" width="50" height="7"></rect>
+ <rect width="50" height="7"></rect>
+ <rect y="15" width="50" height="7"></rect>
+ <rect y="30" width="50" height="7"></rect>
</svg>';
echo html_ao('label', array('for' => 'hamburgerButton'));
echo $hamburgerIcon;
@@ -122,7 +122,7 @@ class Theme_Funky_Guy extends Layout {
echo html_ao('header', array('role' => 'banner'));
echo html_ao('nav', array('role' => 'navigation'));
- echo $this->hamburgerButton();
+ echo $this->hamburgerButton();
echo html_ao('logo');
echo util_make_link('/', html_image('header/header-logo.png',
null, null, array('alt'=>'FusionForge Home', 'height'=>'40')));
echo html_ac(html_ap() -1); // </logo>
@@ -141,7 +141,7 @@ class Theme_Funky_Guy extends Layout {
echo implode($template, $links);
echo html_ac(html_ap() -1); // </ul>
echo html_ac(html_ap() -1); // </div> #userlinkdiv
-
+
echo html_ao('div', array('id' => 'menudiv'));
echo html_ao('input', array('id' => 'hamburgerButton', 'type'
=> 'checkbox'));
echo html_ac(html_ap() -1); // </input>
@@ -309,7 +309,7 @@ class Theme_Funky_Guy extends Layout {
$attrs['target'] = '_blank';
}
$return .= html_ao('a', $attrs);
-
+
$attrs = array('title' => $tabs_tooltips[$i]);
if ($selected == $i)
$attrs['class'] = 'selected';
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index dcc4da3..b63464f 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -70,21 +70,21 @@ h1, h2, h3,
}
h1 {
- color: #303030;
- padding-top: 4px;
- font-size: 24px;
- letter-spacing: 2px;
+ color: #303030;
+ padding-top: 4px;
+ font-size: 24px;
+ letter-spacing: 2px;
}
h2 {
margin-top: 30px;
- font-size: 21px;
+ font-size: 21px;
color: #505d77;
}
h3 {
margin-top: 30px;
- font-size: 18px;
+ font-size: 18px;
color: #505d77;
}
@@ -289,7 +289,7 @@ header nav label,
transition-property: background-color, color, height, shadow;
transition-duration: 0.3s;
font-size:1.15em;
-
+
padding: .6em;
white-space: nowrap;
}
@@ -307,7 +307,7 @@ header nav label,
innertabs
*/
.innertabs {
- display: block;
+ display: block;
width: 100%;
}
@@ -323,7 +323,7 @@ header nav label,
flex: 1;
margin: 0;
padding: 0;
-}
+}
.innertabs .tabGenerator a {
display: flex;
@@ -363,46 +363,46 @@ header nav label,
.topTab, a.topTab, a.topTab:visited, a.topTab:hover,
.topTabSelected, a.topTabSelected, a.topTabSelected:visited,
a.topTabSelected:hover {
- text-decoration: none;
- font-weight: bold;
- color: rgb(68, 68, 68);
- font-family: arial, helvetica, sans-serif;
- font-size: 0.9em;
+ text-decoration: none;
+ font-weight: bold;
+ color: rgb(68, 68, 68);
+ font-family: arial, helvetica, sans-serif;
+ font-size: 0.9em;
}
.bottomTab, a.bottomTab, a.bottomTab:visited, a.bottomTab:hover {
- text-decoration: none;
- font-weight: bold;
- color: white;
- font-family: arial, helvetica, sans-serif;
- font-size: 0.9em;
+ text-decoration: none;
+ font-weight: bold;
+ color: white;
+ font-family: arial, helvetica, sans-serif;
+ font-size: 0.9em;
}
.bottomTabSelected, a.bottomTabSelected, a.bottomTabSelected:visited,
a.bottomTabSelected:hover {
- text-decoration: none;
- font-weight: bold;
- color: rgb(68, 68, 68);
- font-family: arial, helvetica, sans-serif;
- font-size: 0.9em;
+ text-decoration: none;
+ font-weight: bold;
+ color: rgb(68, 68, 68);
+ font-family: arial, helvetica, sans-serif;
+ font-size: 0.9em;
}
.topLeft {
- vertical-align: top;
- text-align: left;
+ vertical-align: top;
+ text-align: left;
}
.middleRight {
- vertical-align: middle;
- text-align: right;
+ vertical-align: middle;
+ text-align: right;
}
.pane {
- color: rgb(112, 112, 112);
- background-color: white;
+ color: rgb(112, 112, 112);
+ background-color: white;
}
.field-holder {
- clear: both;
+ clear: both;
}
/* Boxes (top / middle / bottom)
@@ -498,8 +498,8 @@ a.topTabSelected:hover {
.widget_content {
border-bottom: 1px solid #d2d3d4;
- border-bottom-left-radius: 3px;
- border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 3px;
margin: 0;
padding: .4em;
}
@@ -623,13 +623,13 @@ table.listing tbody tr:nth-child(odd),
padding-left: 0;
}
.submenu a {
- background: #51596C;
+ background: #51596C;
color: #fff;
- text-align:center;
+ text-align:center;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
- display: inline-block;
- padding: 4px 8px;
+ display: inline-block;
+ padding: 4px 8px;
}
.submenu a:hover {
color: #ff9;
@@ -652,8 +652,8 @@ table.listing tbody tr:nth-child(odd),
/* error_msg, warning_msg or feedback function
----------------------------------------------- */
span.active, span.deleted, span.pending, span.suspended {
- padding:0 .5em;
- border-radius: 3px;
+ padding:0 .5em;
+ border-radius: 3px;
}
.active {background-color: #cfc;}
.deleted {background-color: #cff;}
@@ -753,9 +753,9 @@ footer img {
.info-box {
background: #f0f0f0;
color: #565c5e;
- padding: .2em .4em;
- margin-bottom: .4em;
- border-radius: 0.7em;
+ padding: .2em .4em;
+ margin-bottom: .4em;
+ border-radius: 0.7em;
border:1px solid #c2c3c4;
box-shadow: 1px 1px 4px #c2c3c4;
}
@@ -805,19 +805,19 @@ table.listing thead tr th {
table.listing thead tr th,
table.listing tbody tr td {
- padding: 4px 8px !important;
+ padding: 4px 8px !important;
}
table.listing thead tr th a {
- color:white;
+ color:white;
}
table.listing tbody tr:nth-child(2n), .even {
- background-color: #e0dfd6 !important;
+ background-color: #e0dfd6 !important;
}
table.listing tbody tr:nth-child(2n+1), .odd {
- background-color: #e6e6e0 !important;
+ background-color: #e6e6e0 !important;
}
input, select {
@@ -825,29 +825,29 @@ input, select {
}
.important {
- background-color: #e10;
- border: none;
- color: white;
- text-shadow: 0 0 1px #300;;
- padding: .2em .4em;
+ background-color: #e10;
+ border: none;
+ color: white;
+ text-shadow: 0 0 1px #300;;
+ padding: .2em .4em;
}
/* Buttons */
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header
.ui-state-default, .ui-button, html .ui-button.ui-state-disabled:hover, html
.ui-button.ui-state-disabled:active {
- background:none !important;
- background-color: #d7d7d7 !important;
- border:1px solid #a7a7a7 !important;
- color: #222 !important;
- text-shadow:1px 1px #eee;
- transition-property: background-color, text-shadow;
+ background:none !important;
+ background-color: #d7d7d7 !important;
+ border:1px solid #a7a7a7 !important;
+ color: #222 !important;
+ text-shadow:1px 1px #eee;
+ transition-property: background-color, text-shadow;
transition-duration: 0.3s;
}
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header
.ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus, .ui-button:hover, .ui-button:focus {
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header
.ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus, .ui-button:hover, .ui-button:focus {
border: 1px solid #505d77;
- background-color: #f7f7f7 !important;
- border:1px solid #878787 !important;
- color: black !important;
- text-shadow:1px 1px #fff;
+ background-color: #f7f7f7 !important;
+ border:1px solid #878787 !important;
+ color: black !important;
+ text-shadow:1px 1px #fff;
}
/* Hide number input spinners */
@@ -920,7 +920,7 @@ div[role="search"] {
#userlinkshamburgerdiv {
margin: 0;
- width: 100%;
+ width: 100%;
}
#userlinkshamburgerdiv ul {
diff --git a/src/www/themes/funky/css/theme.css
b/src/www/themes/funky/css/theme.css
index 0b08ef3..711b24b 100644
--- a/src/www/themes/funky/css/theme.css
+++ b/src/www/themes/funky/css/theme.css
@@ -340,7 +340,7 @@ hr {
padding:0;
margin: 0;
vertical-align: middle;
- border-right: 1px solid white;
+ border-right: 1px solid white;
}
.innertabs .tabGenerator .tg-middle {
-----------------------------------------------------------------------
Summary of changes:
src/common/forum/ForumHTML.class.php | 8 +-
src/db/20210308-forum-pinned-thread.sql | 2 +-
src/www/themes/funky-guy/README.txt | 8 +-
src/www/themes/funky-guy/Theme.class.php | 14 ++--
src/www/themes/funky-guy/css/theme.css | 126 +++++++++++++++----------------
src/www/themes/funky/css/theme.css | 2 +-
6 files changed, 80 insertions(+), 80 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
