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, 6.1 has been updated
via e0bae14ad4b99244183002537ab24235a0b268ec (commit)
via 9ac7e465bb4af87141d2c40b7f042b014caf8fac (commit)
via db0801d202f841dd75e6b451c5f0fa8796b4bdba (commit)
via e233fb7b0abb3841bc77661fc0640a933f343531 (commit)
via fb4e65193923873ec7651757b5a4b5d70e108914 (commit)
from b20706d9045a306129c6358be5413f032e388f00 (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=e0bae14ad4b99244183002537ab24235a0b268ec
commit e0bae14ad4b99244183002537ab24235a0b268ec
Author: Franck Villaume <[email protected]>
Date: Mon Dec 25 14:00:28 2017 +0100
funky-wOw theme: reorg css
diff --git a/src/www/themes/funky-wOw/css/theme-pages.css
b/src/www/themes/funky-wOw/css/theme-pages.css
new file mode 100644
index 0000000..39eee77
--- /dev/null
+++ b/src/www/themes/funky-wOw/css/theme-pages.css
@@ -0,0 +1,288 @@
+/*
+ * FusionForge Funky Theme
+ *
+ * Copyright 2009 Matthieu FAURE // Open-S: global clean-up
+ * Copyright 2010, Antoine Mercadal - Capgemini
+ * Copyright 2017, Franck Villaume - TrivialDev
+ * http://fusionforge.org
+ *
+ * This file is part of FusionForge. FusionForge 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 Licence, or (at your option)
+ * any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * CONTENT: all page-related styles
+ * ========================================================
+ */
+
+/*
+ * PAGE: home page
+ * ========================================================
+ */
+
+/* =bd (main body)
+----------------------------------------------- */
+#bd td {
+ vertical-align: top;
+ padding: 5px;
+}
+
+#bd-col1 {
+ width: 65%;
+}
+
+#bd-col2 {
+ width: 35%;
+}
+
+#title-home-page {
+ text-align: center;
+}
+
+#Latest_News h3 {
+ margin-top: 0;
+ margin-bottom: 0;
+ font-weight: bold;
+}
+
+#Latest_News em {
+ padding-left: 1em;
+}
+
+/* remove inherited background-image */
+#title_Features_Boxes {
+ display: none;
+}
+
+#Features_Boxes {
+ background-image: none;
+}
+
+#Features_Boxes #title_Associated_Forges {
+ margin-top: 0;
+}
+
+#Associated_Forges td {
+ padding-right: 1em;
+}
+
+#Associated_Forges .align-right {
+ text-align: right;
+}
+
+#Recently_Registered_Projects td {
+ padding: 0.2em;
+}
+
+#search_associated_forges {
+ float: left;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
+#search_associated_forges_submit {
+ margin-top: 6px;
+ padding-left: 5px;
+}
+
+/*
+ * PAGE: project home
+ * ========================================================
+ */
+#project-summary-and-devs {
+ margin-top: 0.5em;
+}
+
+#file-releases {
+ margin: 0 0.5em;
+}
+
+#latest-major-contributions {
+ margin: 1em 0.5em;
+}
+
+/*
+ * PAGE: frs
+ * ========================================================
+ */
+.frs-table-files {
+ width: 100%;
+ margin: 0 0 2.5em 0;
+}
+
+.frs-table-files th {
+ background: #e8dfd4;
+}
+
+.frs-table-files tr {
+ border-bottom: solid 1px #c9c9c9;
+}
+
+.frs-table-files th,
+.frs-table-files td {
+ vertical-align:middle;
+}
+
+.frs-table-files h3 {
+ margin:0;
+}
+
+#forge-frs .blue-box {
+ padding-top: 2em;
+ padding-bottom: 2em;
+}
+
+#forge-frs h2 {
+ padding-top: 1em;
+}
+
+#forge-frs h3 {
+ font-size: small;
+}
+
+#forge-frs .box-surround {
+ margin: 0 0.5em 0.5em 2em;
+}
+
+#forge-frs .box-content {
+ padding-left: 2em;
+}
+
+#forge-frs .listTable {
+ margin: 0;
+}
+
+#forge-frs .listTable td {
+ width: 12%;
+}
+
+/*
+ * PAGE: user_home (eg: http://fusionforge/user/<username>)
+ * ========================================================
+ */
+#user-profile-homepage {
+
+}
+
+/*
+ * PAGE: Activity (eg: http://fusionforge/activity/?group_id=<id>)
+ * ========================================================
+ */
+#activity_left {
+ display: table;
+ width: 100%;
+}
+
+#activity_right {
+ margin-top:5px;
+}
+
+#activity_select {
+ float: left;
+}
+
+#activity_startdate,
+#activity_enddate {
+ float: left;
+ margin-left: 5px;
+}
+
+#activity_submit {
+ margin-top:10px;
+}
+
+#activity_submit input {
+ margin-top: 23px;
+ margin-left: 5px;
+}
+
+/*
+ * PAGE: docman (eg: http://fusionforge/docman/?group_id=<id>)
+ * ========================================================
+ */
+.docman_h3 {
+ margin-top: 0;
+}
+
+.docman_h4 {
+ padding: 0;
+ margin: 2px;
+ font-style: italic;
+}
+
+.docman_div_include {
+ border: 1px solid #C2C7D1;
+ padding: 2px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
+
+.docmanDivIncluded {
+ font-size: 0.95em;
+}
+
+.docmanSubmitDiv input {
+ margin: 5px;
+}
+
+.docmanDiv {
+ padding-bottom: 5px;
+ font-size: 0.9em;
+}
+
+.docmanDiv table {
+ border: 1px solid #C2C7D1;
+ border-collapse: collapse;
+ text-align: left;
+ vertical-align: middle;
+ width: 100%;
+ margin: 2px;
+}
+
+.docmanDiv td, .docmanDiv th {
+ border: 1px solid #C2C7D1;
+ border-collapse: collapse;
+ padding: 3px;
+}
+
+.docman_li_treecontent {
+ list-style-image: url('../images/ic/folder.png');
+ margin: 2px;
+}
+
+.docman_li_treecontent_selected {
+ list-style-image: url('../images/docman/directory-with-documents.png');
+ margin: 2px;
+}
+
+.docman_editfile_title,
+#docman_search_query_label {
+ font-weight:bold;
+}
+
+/*
+ * PAGE: tracker (eg: http://fusionforge/tracker/?group_id=<id>)
+ * ========================================================
+ */
+#trackermodform table {
+ width: 100%;
+}
+
+#trackermodform input[type=submit] {
+ float: right;
+}
+
+.artifact_closed,
+.artifact_closed:hover {
+ text-decoration:line-through;
+}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9ac7e465bb4af87141d2c40b7f042b014caf8fac
commit 9ac7e465bb4af87141d2c40b7f042b014caf8fac
Author: Franck Villaume <[email protected]>
Date: Mon Dec 25 13:58:52 2017 +0100
funky-wOw theme: fix jquery version, reorg css
diff --git a/src/www/themes/funky-wOw/Theme.class.php
b/src/www/themes/funky-wOw/Theme.class.php
index 688ec1f..e87f7a1 100644
--- a/src/www/themes/funky-wOw/Theme.class.php
+++ b/src/www/themes/funky-wOw/Theme.class.php
@@ -37,9 +37,9 @@ class Theme_Funky_Wow extends Theme_Funky {
$this->addStylesheet('/themes/css/fusionforge.css');
$this->addStylesheet('/themes/funky-wOw/css/theme.css');
$this->addStylesheet('/themes/funky-wOw/css/theme-pages.css');
-
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui-1.12.4.css');
-
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.structure-1.12.4.css');
-
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.theme-1.12.4.css');
+
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui-1.12.1.css');
+
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.structure-1.12.1.css');
+
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.theme-1.12.1.css');
}
}
diff --git a/src/www/themes/funky-wOw/css/theme.css
b/src/www/themes/funky-wOw/css/theme.css
index 5dc3d16..00db77e 100644
--- a/src/www/themes/funky-wOw/css/theme.css
+++ b/src/www/themes/funky-wOw/css/theme.css
@@ -4,8 +4,8 @@
* Copyright 2010, Antoine Mercadal - Capgemini
* Copyright 2010, Franck Villaume - Capgemini
* Copyright 2011, Iñigo Martinez
- * Copyright 2013-2014, Franck Villaume - TrivialDev
- * Copyright 2015, Roland Mas
+ * Copyright 2013-2014,2017, Franck Villaume - TrivialDev
+ * Copyright 2014, Benoit Debaenst - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -25,31 +25,505 @@
*/
/* HTML elements */
+html {
+ background-color: #CCCCCC;
+}
+
+body {
+ font-size:11px;
+ font-family:"Lucida Grande",sans-serif;
+ color:rgb(68,68,68);
+ background-color:white;
+ text-align:left;
+ border-radius: 6px;
+ margin: 8px;
+}
+
+#maindiv {
+ margin:1em;
+}
+
+form {
+ margin:0;
+}
+
+img {
+ border:0;
+ vertical-align: middle;
+}
+
+h1 {
+ color: black;
+ -webkit-mask-image: -webkit-gradient(linear, 0% 0%, 0% 100%,
from(rgba(0, 0, 0, 0.296875)), to(black));
+}
+
+h2 {
+ margin-top: 30px;
+ color: black;
+ -webkit-mask-image: -webkit-gradient(linear, 0% 0%, 0% 100%,
from(rgba(0, 0, 0, 0.296875)), to(black));
+}
+
+h3 {
+ margin-top: 30px;
+ color: black;
+ -webkit-mask-image: -webkit-gradient(linear, 0% 0%, 0% 100%,
from(rgba(0, 0, 0, 0.296875)), to(black));
+}
+
+ul {
+ list-style-type: circle;
+ margin: 0;
+}
+
+li {
+ margin: 10px;
+}
+
a {
+ text-decoration:none;
+ font-weight: bold;
color: #A66B00;
+ transition-property: background-color, color, height, shadow;
+ transition-duration: 0.3s;
}
a:hover {
+ text-decoration: none;
color: #A68B00;
+ font-weight: bold;
+}
+
+th, td {
+ text-align:left;
+ border:none;
+ border-collapse: collapse;
+}
+
+input[type="text"], input[type="password"], input[type="url"],
input[type="email"], textarea {
+ width: auto;
+ border-radius: 6px;
+ border: 1px solid #e6e6e6;
+ padding: 3px;
+ font-family:"Lucida Grande",sans-serif;
+}
+
+hr {
+ border: 0;
+ background-color: #E2E2E2;
+ height: 1px;
+}
+
+/* =header */
+#header {
+ background: white url("../images/header/header-bg.png");
+ margin: 0;
+ border-top-left-radius: 6px;
+ border-top-right-radius: 6px;
+ border-collapse: collapse;
+}
+
+#header-col1 {
+ padding:10px;
+}
+
+#header-col1 img {
+ padding:0;
+ height: 30px;
+}
+
+#header-col1 h1 {
+ padding: 0;
+ margin: 0;
+}
+
+#header-col2 {
+ text-align: right;
+ padding: 0 7px 0 0;
+ font-size: 10px;
+ color: #7D88CC;
+ text-shadow: 1px 1px white;
+ font-weight: bold;
+}
+
+#header-col2 a {
+ font-size: 10px;
+ color: #7D88CC;
+ font-weight: 800;
+ text-shadow: 1px 1px white;
+}
+
+#header-col2 a:hover {
+ font-size: 10px;
+ color: #7eaaee;
+ font-weight: bold;
+ text-decoration: none;
+ text-shadow: 1px 1px white;
+}
+
+#header-line2 {
+ background: #41495C url("../images/header/tabs-bg.png") repeat-x;
+ text-align: right;
+ padding-top: 10px;
+}
+
+#header-news {
+ background-color: #41495C;
+ display: table-cell;
+}
+
+#header-news span {
+ background-color: #41495C;
+ height: 200px;
}
-#searchBox a{
- color: #A66B00;
+.quicknews-toggle {
+ display: inline;
+ font-size: 12px;
+}
+
+.quicknews .title {
+ font-size: 12px;
+ color: red;
+}
+
+.quicknews ul {
+ background-color: white;
+ width: 100%;
+ margin: 10px;
+ display: block;
+}
+
+.quicknews ul li {
+ display: inline;
+ list-style: none;
+ margin: 0;
+}
+
+.quicknews ul li:hover {
+ background-color:blue;
+}
+
+/* =searchBox */
+#searchBox {
+ display: inline;
+}
+
+#searchBox a {
+ font-size: 10px;
+ margin-right: 10px;
+ text-decoration:none;
+ font-weight: bold;
+ color: #A66B00;
+ transition-property: background-color, color, height, shadow;
+ transition-duration: 0.3s;
}
#searchBox a:hover {
+ text-decoration: none;
color: #A68B00;
+ font-weight: bold;
+}
+
+
+#searchBox span {
+ margin-left: 20px;
+}
+
+#searchBox span input[type=text] {
+ padding-left: 20px;
+ border-radius: 20px;
+ border: 1px solid white;
+ background-image: url(../images/search-logo.png);
+ background-repeat: no-repeat;
+ background-position: 3px 2px;
+ display: inline;
+ width: 130px;
+ margin-right: 7px;
+ height: 10px;
+}
+
+#searchBox span input[type=submit] {
+ display:none;
+}
+
+#quicknavdiv {
+ display: inline;
+ float: left;
}
+
+#quicknav {
+ margin-left: 7px;
+ width: 180px;
+}
+
+/* =tabGenerator */
+.tabGenerator {
+ font-weight:bold;
+ border-collapse: collapse;
+ height: 36px;
+}
+
+.tabGenerator tbody {
+ margin-left: 50px;
+}
+
+.tabGenerator td {
+ padding:0;
+ margin: 0;
+ vertical-align: middle;
+}
+
+.tabGenerator .tg-middle {
+ background-color: #41495C;
+ vertical-align: bottom;
+}
+
+.tabGenerator .tg-middle span {
+ background-color: #41495C;
+ margin-top: 0;
+}
+
.tabGenerator .tg-middle span span {
+ display: block;
+ text-align:center;
+ vertical-align: middle;
+ height: 20px;
+ border-bottom: 0;
+ border-top-left-radius: 6px;
+ border-top-right-radius: 6px;
background-color: #FFE673;
+ line-height: 17px;
+ color: black;
+ text-shadow: 1px 1px #B2BFD9;
+ margin: 0 2px;
+ transition-property: background-color, color, height, shadow;
+ transition-duration: 0.3s;
}
.tabGenerator .tg-middle span span:hover {
+ display: block;
background-color: #FFE613;
+ text-shadow: 1px 1px white;
+ height: 30px;
+}
+
+.tabGenerator .tg-middle span span a {
+ display: block;
+ color: black;
}
.tabGenerator .tg-middle span.selected span {
background-color: #FFE613;
+ text-shadow: 1px 1px white;
+ height: 30px;
+}
+
+.tabGenerator .tg-right span.selected span {
+ display:none;
+}
+
+/*
+ innertabs
+*/
+.innertabs .tabGenerator {
+ font-weight:bold;
+ border-collapse: collapse;
+ height: 20px;
+}
+
+.innertabs .tabGenerator tbody {
+ margin-left: 50px;
+}
+
+.innertabs .tabGenerator td {
+ padding:0;
+ margin: 0;
+ vertical-align: middle;
+}
+
+.innertabs .tabGenerator .tg-middle {
+ background-color: #F7F7F7;
+ vertical-align: middle;
+}
+
+.innertabs .tabGenerator .tg-middle span {
+ background-color: #F7F7F7;
+ margin-top: 0;
+}
+
+.innertabs .tabGenerator .tg-middle span span {
+ display: block;
+ text-align:center;
+ vertical-align: middle;
+ height: 20px;
+ margin: 0;
+ border-bottom: 0;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ background-color: #F7F7F7;
+ line-height: 17px;
+ color: black;
+ text-shadow: 1px 1px white;
+ border-left: 1px solid white;
+ border-right: 1px solid white;
+}
+
+.innertabs .tabGenerator .tg-middle span span:hover {
+ display: block;
+ background-color: white;
+}
+
+.innertabs .tabGenerator .tg-middle span span a {
+ display: block;
+ color: black;
+}
+
+.innertabs .tabGenerator .tg-middle span.selected span {
+ background-color: white;
+ text-shadow: 1px 1px white;
+}
+
+.innertabs .tabGenerator .tg-right span.selected span {
+ display:none;
+}
+
+.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;
+}
+
+.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;
+}
+
+.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;
+}
+
+.topLeft {
+ vertical-align: top;
+ text-align: left;
+}
+
+.middleRight {
+ vertical-align: middle;
+ text-align: right;
+}
+
+.pane {
+ color: rgb(112, 112, 112);
+ background-color: white;
+}
+
+.field-holder {
+ clear: both;
+}
+
+/* Boxes (top / middle / bottom)
+----------------------------------------------- */
+.box-surround {
+/* margin-bottom: 1em;*/
+ background-color: #F7F7F7;
+ border: 1px solid #E2E3E4;
+ border-top-left-radius: 6px;
+ border-top-right-radius: 6px;
+ margin-bottom: 0;
+}
+
+.box-title-content {
+ color: #808080;
+ font-weight: bold;
+ font-size: 13px;
+ padding-left: 13px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ border-bottom: 1px solid #E2E3E4;
+}
+
+
+.box-content {
+ border-bottom: 1px solid #E2E3E4;
+ margin: 0;
+ padding: 8px 8px 8px 18px;
+}
+
+.box-content p {
+ margin: 0;
+}
+
+
+.box-middle {
+ margin: 0;
+ padding-left: 18px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ color: #808080;
+ font-weight: bold;
+}
+
+
+/* widgets */
+
+.widget {
+ margin-top: 5px;
+ background-color: #F7F7F7;
+ border: 1px solid #E2E3E4;
+ border-bottom: none;
+ border-top-left-radius: 6px;
+ border-top-right-radius: 6px;
+ margin-bottom: 10px;
+}
+
+.widget_titlebar {
+ color: #808080;
+ font-weight: bold;
+ font-size: 13px;
+ padding-left: 13px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ border-bottom: 1px solid #E2E3E4;
+ background: none;
+}
+
+.widget_titlebar_close img {
+ width: 12px;
+ height: 12px;
+}
+
+.widget_titlebar_minimize img {
+ width: 12px;
+ height: 12px;
+}
+
+.widget_titlebar_maximize img {
+ width: 12px;
+ height: 12px;
+}
+
+.widget_content {
+ border-bottom: 1px solid #E2E3E4;
+ margin: 0;
+ padding: 8px;
+}
+
+.widget_content table {
+ border-collapse: collapse;
+ border: 1px solid #D5D5D5;
+}
+.widget_content table td {
+ padding: 4px;
}
table.listing tbody tr:nth-child(even),
@@ -57,32 +531,156 @@ table.listing tbody tr:nth-child(even),
background-color: #FFF3B8;
}
+table.listing tbody tr:nth-child(odd),
+.bgcolor-white {
+ background-color: #FFFFFF;
+}
+
+/*
+ listTable
+*/
+
+.listTable table {
+ border-collapse: collapse;
+}
+
+.listTable table td {
+ padding: 5px;
+ border: 1px solid gray;
+}
+
+/*
+ submenu
+*/
+.submenu {
+ margin-top: 10px;
+ margin-bottom: 25px;
+ margin-left: 0;
+ /*border-collapse: collapse;*/
+ border-bottom: 1px solid #E2E3E4;
+ border-spacing: 6px 0;
+ padding-left: 0;
+}
+
.submenu li {
+ display: table-cell;
+ margin-left: 5px;
+ border: 1px solid #E2E3E4;
+ height: 16px;
+ padding: 5px;
+ border-bottom: none;
+ border-top-left-radius: 6px;
+ border-top-right-radius: 6px;
+ margin-right: 10px;
background: white;
}
+.submenu li:hover {
+ background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#f7f7f7),
to(white));
+}
+
+
+
+/* =ft (footer)
+----------------------------------------------- */
+#ft {
+ text-align:center;
+}
+
+/* error_msg, warning_msg or feedback function
+----------------------------------------------- */
.error {
background-color: #bc008d; /* red */
border: 0;
+ padding: 7px;
+ border-radius: 6px;
+ text-shadow: 1px 1px #ff7c73;
+ text-align: left;
+ font-size: small;
+ font-weight: normal;
+ color: black;
+ margin: 2px 3px 3px;
}
.warning_msg, .warning, .tips, .important {
background-color: #ff8940; /* orange */
border: 0;
+ padding: 7px;
+ border-radius: 6px;
+ text-shadow: 1px 1px #fff5CA;
+ text-align: left;
+ font-weight: normal;
+ font-size: small;
+ margin: 2px 3px 3px;
}
.feedback {
background-color: #b7f300; /* green */
border: 0;
+ padding: 7px;
+ border-radius: 6px;
+ text-shadow: 1px 1px #DFF59f;
+ text-align: left;
+ font-weight: normal;
+ font-size: small;
+ margin: 2px 3px 3px;
}
p.information {
background-color: #ffcd73;
border: 0;
+ padding: 7px;
+ border-radius: 6px;
+ text-shadow: 1px 1px #DFF59f;
+ text-align: left;
+ font-weight: normal;
+ font-size: small;
+ margin: 2px 3px 3px;
+}
+
+#ffErrors {
+ background-color: #ff4940; /* red */
+ border: 1px solid red;
+ padding: 7px;
+ border-radius: 6px;
+ text-shadow: 1px 1px #ff7c73;
+ color: black;
+ margin: 2px 3px 3px;
+}
+
+#ffErrors .error {
+ background-color: #ff4940; /* red */
+ border: 1px solid red;
+ padding: 7px;
+ border-radius: 6px;
+ text-shadow: 1px 1px #ff7c73;
+ color: black;
+ margin: 2px 3px 3px;
+}
+
+footer {
+ padding: 10px;
+ background: rgb(66, 69, 82) url("../images/header/header-bg.png");
+ border-top: 1px solid #f7f7f7;
+ margin-top: 20px;
+ border-bottom-left-radius: 6px;
+ border-bottom-right-radius: 6px;
+ text-align: center;
+ color: #dcdcdc;
+ text-shadow: 1px 1px white;
+}
+
+footer img {
+ float: right;
}
.info-box h2 {
+ font-size: 1.3em;
+ border-radius: 0.5em 0.5em 0 0;
+ color: white;
background: #A63F00;
+ padding: 3px 3px 3px 10px;
+ margin: 0 -4px 0 -4px;
}
.info-box:nth-child(4n) h2 {
@@ -98,38 +696,51 @@ p.information {
background: #BFA630;
}
-#activity_left {
- display: table;
- width: 100%;
+.priority1 { background-color: #f3f4db}
+.priority2 { background-color: #fcecc2}
+.priority3 { background-color: #fde4aa}
+.priority4 { background-color: #fcd986}
+.priority5 { background-color: #fac955}
+
+.table-header-rotated {
+ border-collapse: collapse;
}
-#activity_right {
- margin-top:5px;
+.table-header-rotated td {
+ width: 30px;
+ text-align: center;
+ padding: 10px 5px;
+ border: 1px solid #ccc;
}
-#activity_select {
- float: left;
+.table-header-rotated th.rotate {
+ height: 140px;
+ white-space: nowrap;
}
-#activity_startdate,
-#activity_enddate {
- float: left;
- margin-left: 5px;
+.table-header-rotated th.rotate>div {
+ transform: translate(25px, 51px) rotate(315deg);
+ width: 30px;
}
-#activity_submit {
- margin-top:10px;
+.table-header-rotated th.rotate>div>span {
+ border-bottom: 1px solid #ccc;
+ padding: 5px 10px;
}
-#activity_submit input {
- margin-top: 23px;
- margin-left: 5px;
+.table-header-rotated th.row-header {
+ padding: 0 10px;
+ border-bottom: 1px solid #ccc;
}
input, select {
vertical-align: middle;
}
-.artifact_closed, .artifact_closed:hover {
- text-decoration:line-through;
+/* Hide number input spinners */
+input[type='number'] {
+ -moz-appearance:textfield;
}
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button { -webkit-appearance: none; }
+/* end Hide number input spinners */
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=db0801d202f841dd75e6b451c5f0fa8796b4bdba
commit db0801d202f841dd75e6b451c5f0fa8796b4bdba
Author: Franck Villaume <[email protected]>
Date: Mon Dec 25 13:57:48 2017 +0100
funky theme: reorg css and clean-up
diff --git a/src/www/themes/funky/css/theme-pages.css
b/src/www/themes/funky/css/theme-pages.css
index b2475b5..2e5f631 100644
--- a/src/www/themes/funky/css/theme-pages.css
+++ b/src/www/themes/funky/css/theme-pages.css
@@ -286,3 +286,8 @@
#trackermodform input[type=submit] {
float: right;
}
+
+.artifact_closed,
+.artifact_closed:hover {
+ text-decoration:line-through;
+}
diff --git a/src/www/themes/funky/css/theme.css
b/src/www/themes/funky/css/theme.css
index 79be03d..5231861 100644
--- a/src/www/themes/funky/css/theme.css
+++ b/src/www/themes/funky/css/theme.css
@@ -122,7 +122,7 @@ hr {
}
#header-col1 {
- padding:10px;
+ padding:10px;
}
#header-col1 img {
@@ -136,19 +136,19 @@ hr {
}
#header-col2 {
- text-align: right;
- padding: 0 7px 0 0;
- font-size: 10px;
- color: #7D88CC;
- text-shadow: 1px 1px white;
- font-weight: bold;
+ text-align: right;
+ padding: 0 7px 0 0;
+ font-size: 10px;
+ color: #7D88CC;
+ text-shadow: 1px 1px white;
+ font-weight: bold;
}
#header-col2 a {
- font-size: 10px;
- color: #7D88CC;
- font-weight: 800;
- text-shadow: 1px 1px white;
+ font-size: 10px;
+ color: #7D88CC;
+ font-weight: 800;
+ text-shadow: 1px 1px white;
}
#header-col2 a:hover {
@@ -204,17 +204,17 @@ hr {
/* =searchBox */
#searchBox {
- display: inline;
+ display: inline;
}
#searchBox a {
- font-size: 10px;
- margin-right: 10px;
- text-decoration:none;
- font-weight: bold;
- color: #7D88CC;
- transition-property: background-color, color, height, shadow;
- transition-duration: 0.3s;
+ font-size: 10px;
+ margin-right: 10px;
+ text-decoration:none;
+ font-weight: bold;
+ color: #7D88CC;
+ transition-property: background-color, color, height, shadow;
+ transition-duration: 0.3s;
}
#searchBox a:hover {
@@ -745,10 +745,6 @@ input, select {
vertical-align: middle;
}
-.artifact_closed, .artifact_closed:hover {
- text-decoration:line-through;
-}
-
/* Hide number input spinners */
input[type='number'] {
-moz-appearance:textfield;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e233fb7b0abb3841bc77661fc0640a933f343531
commit e233fb7b0abb3841bc77661fc0640a933f343531
Author: Franck Villaume <[email protected]>
Date: Mon Dec 25 13:35:34 2017 +0100
funky-wOw: avoid multiple css inherited from funky theme
diff --git a/src/www/themes/funky-wOw/Theme.class.php
b/src/www/themes/funky-wOw/Theme.class.php
index 7f1b012..688ec1f 100644
--- a/src/www/themes/funky-wOw/Theme.class.php
+++ b/src/www/themes/funky-wOw/Theme.class.php
@@ -1,11 +1,11 @@
<?php
/**
- * FusionForge Funky Theme
+ * FusionForge Funky wOw Theme
*
* Copyright 2010, Antoine Mercadal - Capgemini
* Copyright 2010, Marc-Etienne Vargenau, Alcatel-Lucent
* Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2011-2016, Franck Villaume - TrivialDev
+ * Copyright 2011-2017, Franck Villaume - TrivialDev
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge. FusionForge is free software;
@@ -31,7 +31,12 @@ class Theme_Funky_Wow extends Theme_Funky {
parent::__construct();
$this->themeurl = util_make_uri('themes/funky-wOw/');
$this->imgbaseurl = $this->themeurl . 'images/';
+ $this->css = array();
+ $this->css_min = array();
+ $this->stylesheets = array();
+ $this->addStylesheet('/themes/css/fusionforge.css');
$this->addStylesheet('/themes/funky-wOw/css/theme.css');
+ $this->addStylesheet('/themes/funky-wOw/css/theme-pages.css');
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui-1.12.4.css');
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.structure-1.12.4.css');
$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.theme-1.12.4.css');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=fb4e65193923873ec7651757b5a4b5d70e108914
commit fb4e65193923873ec7651757b5a4b5d70e108914
Author: Franck Villaume <[email protected]>
Date: Mon Dec 25 13:29:17 2017 +0100
reorg css in funky
diff --git a/src/www/themes/funky/css/theme-pages.css
b/src/www/themes/funky/css/theme-pages.css
index 0da0f63..b2475b5 100644
--- a/src/www/themes/funky/css/theme-pages.css
+++ b/src/www/themes/funky/css/theme-pages.css
@@ -3,6 +3,7 @@
*
* Copyright 2009 Matthieu FAURE // Open-S: global clean-up
* Copyright 2010, Antoine Mercadal - Capgemini
+ * Copyright 2017, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -174,8 +175,45 @@
}
/*
+ * PAGE: Activity (eg: http://fusionforge/activity/?group_id=<id>)
+ * ========================================================
+ */
+#activity {
+ display: table;
+ width: 100%;
+}
+
+#activity_left {
+ float: left;
+}
+
+#activity_right {
+ overflow : hidden;
+ padding-left: 10px;
+ margin-top:5px;
+}
+
+#activity_select {
+}
+
+#activity_label,
+#activity_label_startdate,
+#activity_label_enddate {
+ font-weight:bold;
+ margin-top:10px;
+}
+
+#activity_startdate,
+#activity_enddate {
+}
+
+#activity_submit {
+ margin-top:10px;
+}
+
+/*
* PAGE: docman (eg: http://fusionforge/docman/?group_id=<id>)
- *
+ * ========================================================
*/
.docman_h3 {
margin-top: 0;
@@ -232,15 +270,19 @@
margin: 2px;
}
+.docman_editfile_title,
+#docman_search_query_label {
+ font-weight:bold;
+}
+
/*
- tracker
-*/
-#trackermodform table
-{
+ * PAGE: tracker (eg: http://fusionforge/tracker/?group_id=<id>)
+ * ========================================================
+ */
+#trackermodform table {
width: 100%;
}
-#trackermodform input[type=submit]
-{
+#trackermodform input[type=submit] {
float: right;
}
diff --git a/src/www/themes/funky/css/theme.css
b/src/www/themes/funky/css/theme.css
index a0a2cd8..79be03d 100644
--- a/src/www/themes/funky/css/theme.css
+++ b/src/www/themes/funky/css/theme.css
@@ -4,7 +4,7 @@
* Copyright 2010, Antoine Mercadal - Capgemini
* Copyright 2010, Franck Villaume - Capgemini
* Copyright 2011, Iñigo Martinez
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2017, Franck Villaume - TrivialDev
* Copyright 2014, Benoit Debaenst - TrivialDev
* http://fusionforge.org
*
@@ -125,12 +125,10 @@ hr {
padding:10px;
}
-#header-col1 img{
- padding:0;
- height: 30px;
-/* height: 50%;
- width: 50%;
-*/}
+#header-col1 img {
+ padding:0;
+ height: 30px;
+}
#header-col1 h1 {
padding: 0;
@@ -145,6 +143,7 @@ hr {
text-shadow: 1px 1px white;
font-weight: bold;
}
+
#header-col2 a {
font-size: 10px;
color: #7D88CC;
@@ -208,7 +207,7 @@ hr {
display: inline;
}
-#searchBox a{
+#searchBox a {
font-size: 10px;
margin-right: 10px;
text-decoration:none;
@@ -274,8 +273,8 @@ hr {
}
.tabGenerator .tg-middle {
- background-color: #41495C;
- vertical-align: bottom;
+ background-color: #41495C;
+ vertical-align: bottom;
}
.tabGenerator .tg-middle span {
@@ -342,8 +341,8 @@ hr {
}
.innertabs .tabGenerator .tg-middle {
- background-color: #F7F7F7;
- vertical-align: middle;
+ background-color: #F7F7F7;
+ vertical-align: middle;
}
.innertabs .tabGenerator .tg-middle span {
@@ -545,7 +544,7 @@ table.listing tbody tr:nth-child(odd),
border-collapse: collapse;
}
-.listTable table td{
+.listTable table td {
padding: 5px;
border: 1px solid gray;
}
@@ -585,7 +584,7 @@ table.listing tbody tr:nth-child(odd),
/* =ft (footer)
----------------------------------------------- */
#ft {
- text-align:center;
+ text-align:center;
}
/* error_msg, warning_msg or feedback function
@@ -711,45 +710,6 @@ footer img {
.priority4 { background-color: #fcd986}
.priority5 { background-color: #fac955}
-/* Activity Page */
-#activity {
- display: table;
- width: 100%;
-}
-
-#activity_left {
- float: left;
-}
-
-#activity_right {
- overflow : hidden;
- padding-left: 10px;
- margin-top:5px;
-}
-
-#activity_select {
-}
-
-#activity_label,
-#activity_label_startdate,
-#activity_label_enddate {
- font-weight:bold;
- margin-top:10px;
-}
-
-#activity_startdate,
-#activity_enddate {
-}
-
-#activity_submit {
- margin-top:10px;
-}
-
-.docman_editfile_title,
-#docman_search_query_label {
- font-weight:bold;
-}
-
.table-header-rotated {
border-collapse: collapse;
}
-----------------------------------------------------------------------
Summary of changes:
src/www/themes/funky-wOw/Theme.class.php | 15 +-
.../{funky => funky-wOw}/css/theme-pages.css | 56 +-
src/www/themes/funky-wOw/css/theme.css | 655 ++++++++++++++++++++-
src/www/themes/funky/css/theme-pages.css | 61 +-
src/www/themes/funky/css/theme.css | 108 +---
5 files changed, 778 insertions(+), 117 deletions(-)
copy src/www/themes/{funky => funky-wOw}/css/theme-pages.css (81%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
