Skip to content

Commit

Permalink
RESOLVED #JJ204: Upgrade to webtrees 1.7.4 - Adapt Perso add-ons
Browse files Browse the repository at this point in the history
  • Loading branch information
jon48 committed May 30, 2016
1 parent dc9c576 commit b979cab
Show file tree
Hide file tree
Showing 139 changed files with 60 additions and 24 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Diff not rendered.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Diff not rendered.
File renamed without changes
File renamed without changes
File renamed without changes
Diff not rendered.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Diff not rendered.
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion css-1.7.3/style-ltr.css → css-1.7.4/style-ltr.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css-1.7.3/style-rtl.css → css-1.7.4/style-rtl.css

Large diffs are not rendered by default.

9 changes: 1 addition & 8 deletions css-1.7.3/style_old.css → css-1.7.4/style_old.css
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,6 @@ dd .editlink, dd .deletelink {float:right;}
#indi_note .fact_NOTE,
#indi_note .fact_SOUR {clear: both;}

.markdown p {margin: 0 0 0.5em; white-space: pre-wrap;}
.markdown table {border-collapse: collapse;margin-bottom:5px;}
.markdown th {font-weight: bold;}
.markdown td,.markdown th {border: solid thin #000;padding: 3px;}

[dir=rtl] #indi_header h3 {padding: 0 30px 0 10px; text-align:right;}
[dir=rtl] #indi_header h3 .header_age {padding:5px 5px 5px 0; float:left;}
[dir=rtl] #main_name {float:right;}
Expand All @@ -434,6 +429,7 @@ dd .editlink, dd .deletelink {float:right;}
/* =========== Indi tabs ================== */
/* Facts & Events tab */
#personal_facts_content .fact_NOTE, #personal_facts_content .fact_SOUR, #family-table .fact_NOTE, #family-table .fact_SOUR {margin: 5px 3px 5px 0; clear: both;}
#notes_content .facts_table, #personal_facts_content .facts_table {table-layout: fixed;}
.facts_table .field em {margin-top: 0;padding-left: 5px;}
.facts_table .field img {vertical-align: middle;}
.facts_table .optionbox {white-space:normal}
Expand Down Expand Up @@ -940,9 +936,6 @@ a.icon-udarrow:hover{width:20px;height:20px;background-image:url(images/udarrow2
[dir=rtl] #cboxSlideshow {position:absolute;right:28px;left:auto}
[dir=rtl] #cboxCurrent {position:absolute;right:94px;left:auto}

/* Census assistant module */
table.table-census-assistant th {font-weight: bold; text-align: left;}

/* Stories module */
.story_title {padding-top: 12px;height:32px;font-size:13px;font-weight:700;}
.story_body {padding: 20px; white-space: normal;}
Expand Down
56 changes: 50 additions & 6 deletions less/_classes-wt.less
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,51 @@ label {
}


/* Markdown */

.markdown {
overflow-x: auto;

p {
margin: 0 0 0.5em;
white-space: pre-wrap;
}

table {
border-collapse: collapse;
margin-bottom:5px;

th {
font-weight: bold;
}

td, th {
border: solid thin #000;padding: 3px;
}
}
}

/* Cookies */

.cookie-warning {

border-style: solid;
border-width: 2px;
height: 3em;
line-height: 2.5em;
transition: height 0.5s;
width: 60%;
margin-top: 5px;
text-align: center;
margin-left: auto;
margin-right: auto;

&.hidden {
height: 0;
overflow: hidden;
}
}

/* styles for popup menus */

.itr {
Expand Down Expand Up @@ -501,19 +546,18 @@ label {
top: 20px;
left: 0;
right: auto;

a.name1 {
display: block;
margin-left: 5px;
}
}

.layout3 #childbox {
top: auto;
bottom: 20px;
}

#childbox a.name1 {
/* font-weight: normal;*/
display: block;
margin-left: 5px;
}

#pedigree-page {

table.list_table {
Expand Down
4 changes: 2 additions & 2 deletions less/compile.cmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
call lessc ./style.less ./../css-1.7.3/style-ltr.css --verbose --no-color --rtl="dir=LTR" --clean-css
call lessc ./style.less ./../css-1.7.4/style-ltr.css --verbose --no-color --rtl="dir=LTR" --clean-css

call lessc ./style.less ./../css-1.7.3/style-rtl.css --verbose --no-color --rtl="dir=RTL" --clean-css
call lessc ./style.less ./../css-1.7.4/style-rtl.css --verbose --no-color --rtl="dir=RTL" --clean-css
11 changes: 5 additions & 6 deletions theme.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* webtrees-MyArtJaub
* Copyright (C) 2015 Jonathan Jaubart
* Copyright (C) 2009-2016 Jonathan Jaubart
*
* Based on webtrees: online genealogy
* Copyright (C) 2015 webtrees development team
* Copyright (C) 2016 webtrees development team
*
* This file is part of webtrees-MyArtJaub
*
Expand Down Expand Up @@ -49,7 +49,7 @@ public function themeName() {

/** {@inheritdoc} */
public function assetUrl() {
return 'themes/rural/css-1.7.3/';
return 'themes/rural/css-1.7.4/';
}

/** {@inheritdoc} */
Expand Down Expand Up @@ -134,7 +134,7 @@ public function bodyHeader() {
'</header>' .
'<div class="content_box">' .
$this->primaryMenuContainer($this->primaryMenu()) .
'<main id="content" role="main">' .
'<main id="content">' .
$this->flashMessagesContainer(FlashMessages::getMessages());
}

Expand All @@ -145,7 +145,7 @@ public function bodyHeaderPopupWindow() {
'<div class="row">'.
'<div class="main-col-layout">'.
'<div class="content_box">' .
'<main id="content" role="main">' .
'<main id="content">' .
$this->flashMessagesContainer(FlashMessages::getMessages());
}

Expand Down Expand Up @@ -193,7 +193,6 @@ protected function headerContent() {
'</div></div>'.
'<div class="header-row"><div id="header-middle">'.
'<ul>' . implode(' | ', array_map(function (Menu $menu) { return $menu->getMenuAsList(); }, $login_menu)) . '</ul>'.
//$this->secondaryMenuContainer($login_menu).
$this->formatTreeTitle() .
'</div></div>'.
'<div class="header-row"><div id="header-bottom">'.
Expand Down

0 comments on commit b979cab

Please sign in to comment.