Skip to content

Commit

Permalink
RESOLVED #JJ201: Upgrade to webtrees 1.7.3 - Adapt Perso add-ons
Browse files Browse the repository at this point in the history
  • Loading branch information
jon48 committed Feb 8, 2016
1 parent fb70e42 commit dc9c576
Show file tree
Hide file tree
Showing 144 changed files with 96 additions and 27 deletions.
1 change: 0 additions & 1 deletion css-1.7.0/style-ltr.css

This file was deleted.

1 change: 0 additions & 1 deletion css-1.7.0/style-rtl.css

This file was deleted.

File renamed without changes
Binary file added css-1.7.3/favicon180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css-1.7.3/favicon192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
1 change: 1 addition & 0 deletions css-1.7.3/style-ltr.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions css-1.7.3/style-rtl.css

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions css-1.7.0/style_old.css → css-1.7.3/style_old.css
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ div.fact_SHARED_NOTE {clear: both;}
/*-- timeline chart specific styles --*/
#timeline_chart {position: relative;top: 0px;left: 0px;}

#field_table {width: 30%;min-width: 500px;}

.person0 {background-color: #d3c6b8;border: outset #62584D 1px;vertical-align: top;}
.person1 {background-color: #a5be79;border: outset #1b491a 1px;vertical-align: top;}
.person2 {background-color: #e9e2db;border: outset #62584D 1px;vertical-align: top;}
Expand Down Expand Up @@ -501,13 +503,13 @@ html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
#login-register-page .confirm {margin: 20px auto; text-align: justify; width: 500px;}
#login-register-page .confirm p {font-size:14px;font-weight:bold;}
#login-register-page .confirm p+p {font-size:12px;font-weight:normal;}
#login-text, #register-text, #user-verify {margin:20px auto; width: 610px; text-align: justify;}
#login-text, #register-text, #user-verify {margin:0 auto; width: 40%; text-align: justify; min-width: 450px;}
#login-box, #register-box { text-align:center; color: black;}
#login-box a, #register-box a {color : #62584D;}
#login-box a:hover, #register-box a:hover {color : #9F8C77;}
#login-form, #new_passwd_form, #register-form, #verify-form {background-color:#E9E2DB; border:1px outset #D3C6B8; display: inline-block; margin:10px auto 0; padding:5px;}
#login-form div, #login-form div a, #new_passwd_form div, #register-form div, #verify-form div {margin:auto; padding:5px; text-align: center;}
#login-form label, #new_passwd_form label, #verify-form label {display:block; text-align:right;}
#login-form label, #new_passwd_form label, #verify-form label {display:block;}
#login-form label input, #new_passwd_form label input, #verify-form input {width:140px; margin: 0 10px;}
#new_passwd_form h4, #register-form h4 {font-weight:normal; text-align:center;}
#register-form,#verify-form {width:440px}
Expand Down Expand Up @@ -662,9 +664,8 @@ html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
/* Individuals, Families */
#sb_content_individuals, #sb_content_families { padding-top: 5px; }
.sb_indi_surname_li, .sb_fam_surname_li {list-style-image:url(images/plus.png);}
.name_tree_div { display:none;}
.name_tree_div ul, .name_tree_div_visible ul {padding:0px;margin:0px;}
.name_tree_div li, .name_tree_div_visible li {list-style:none; margin:0px; padding:0px;}
.name_tree_div ul {padding:0px;margin:0px;}
.name_tree_div li {list-style:none; margin:0px; padding:0px;}

/* Clippings */
#sb_content_clippings {}
Expand Down
60 changes: 59 additions & 1 deletion less/_classes-wt.less
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ label {
list-style: none;
margin: 0;
padding: 0 10px;
font-size: smaller;
font-size: x-small;
}

li .NAME {
Expand Down Expand Up @@ -492,6 +492,28 @@ label {
text-align: center;
}

#childbox {
padding: 5px;
position: absolute;
display: none;
text-align: start;
white-space: nowrap;
top: 20px;
left: 0;
right: auto;
}

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

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

#pedigree-page {

table.list_table {
Expand Down Expand Up @@ -593,6 +615,42 @@ label {
}
}

/* -- Census editor -- */

.census-assistant-search {

.table > tbody > tr > td {
padding: 3px;
}
}

.census-assistant-input {

.table > tbody > tr {

& > td, & > th {
padding: 3px;
border: 0;
}

& > th {
text-align: right;
}
}

.table-census-inputs {

& > tbody > tr > td, & > thead > tr > th {
border:thin solid @brown;

input {
background-color: white;
}
}

}
}

/* -- Footer -- */

.powered-by-webtrees {
Expand Down
28 changes: 17 additions & 11 deletions less/_css-media.less
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,19 @@
/* Search */
#search-page-table {
width: auto;
}
#search-page-table .value {
margin: 0 0 0 30%;
white-space: normal;
}

#search-page-table div #query {
width: 150px;
}
#search-page-table > input {
width: 20px;

.value {
margin: 0 0 0 30%;
white-space: normal;
}

div #query {
width: 150px;
}

& > input {
width: 20px;
}
}

/* Front Page */
Expand Down Expand Up @@ -107,5 +109,9 @@
/* Reports */
#reportengine-page table {
width: 100%;
}
/* Advanced Search */
#field_table {
min-width: 100%;
}
}
2 changes: 1 addition & 1 deletion less/_elements.less
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ h1, h2 {
font-family: @font-tahoma-family;
}

h4 {
h3, h4 {
color: @brown-dark;
font-size: @font-size-large;
font-weight: bold;
Expand Down
12 changes: 8 additions & 4 deletions less/_nav.less
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@
.menu-clippings {background-position:center -640px;}
.menu-fam {background-position:center -880px;}
.menu-help {background-position:center -460px;}
.menu-indi {background-position:center -720px;}
.menu-indi,
.menu-record {background-position:center -720px;}
.menu-list {background-position:center -240px;}
.menu-mymenu {background-position:center -80px;}
.menu-note {background-position:center -1040px;}
Expand Down Expand Up @@ -186,10 +187,13 @@
.menu-help-show {background-position:left -300px; [dir=rtl] & {background-position:right -300px;}}
.menu-help-technical {background-position:left -120px; [dir=rtl] & {background-position:right -120px;}}
.menu-help-wiki {background-position:left -690px; [dir=rtl] & {background-position:right -690px;}}
.menu-indi-addfav {background-position:left -870px; [dir=rtl] & {background-position:right -870px;}}
.menu-indi-addfav,
.menu-record-addfav {background-position:left -870px; [dir=rtl] & {background-position:right -870px;}}
.menu-indi-addname {background-position:left -780px; [dir=rtl] & {background-position:right -780px;}}
.menu-indi-del {background-position:left -840px; [dir=rtl] & {background-position:right -840px;}}
.menu-indi-editraw {background-position:left -1240px; [dir=rtl] & {background-position:right -1240px;}}
.menu-indi-del,
.menu-record-del {background-position:left -840px; [dir=rtl] & {background-position:right -840px;}}
.menu-indi-editraw,
.menu-record-editraw {background-position:left -1240px; [dir=rtl] & {background-position:right -1240px;}}
.menu-indi-editsex {background-position:left -810px; [dir=rtl] & {background-position:right -810px;}}
.menu-list-fam {background-position:left -90px; [dir=rtl] & {background-position:right -90px;} }
.menu-list-indi {background-position:left -120px; [dir=rtl] & {background-position:right -120px;}}
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.0/style-ltr.css --verbose --no-color --rtl="dir=LTR" --clean-css
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.0/style-rtl.css --verbose --no-color --rtl="dir=RTL" --clean-css
call lessc ./style.less ./../css-1.7.3/style-rtl.css --verbose --no-color --rtl="dir=RTL" --clean-css
2 changes: 1 addition & 1 deletion theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function themeName() {

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

/** {@inheritdoc} */
Expand Down

0 comments on commit dc9c576

Please sign in to comment.