Skip to content

Commit

Permalink
RESOLVED #JJ208: Upgrade to webtrees 1.7.6 - Adapt Perso add-ons
Browse files Browse the repository at this point in the history
  • Loading branch information
jon48 committed Jun 25, 2016
1 parent b979cab commit 83d9720
Show file tree
Hide file tree
Showing 142 changed files with 17 additions and 12 deletions.
1 change: 0 additions & 1 deletion css-1.7.4/style-ltr.css

This file was deleted.

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

This file was deleted.

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
1 change: 1 addition & 0 deletions css-1.7.5/style-ltr.css

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions css-1.7.4/style_old.css → css-1.7.5/style_old.css
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ div.fact_SHARED_NOTE {clear: both;}

.fan_chart_menu {position: absolute;display:none;z-index:100;}
#fan_chart ul {list-style-type: none;margin: 0;}
#fan_chart ul.children li:before {content: "< ";font-weight: bold;}
#fan_chart_img {text-align: center;}

.listlog {line-height: 20pt;color: #555555;font-family: tahoma, arial, helvetica, sans-serif;}
Expand Down Expand Up @@ -360,7 +359,6 @@ table.faq { background-color: #F3EFEF; margin: 5px 0 50px 5px; width: 98%;}
table.faq tr.odd td{ background-color: #E9E2DB;}
div.faq_title{background-color: #E9E2DB;padding: .25em;font-weight: bold;}
div.faq_body{background-color: #F3EFEF;clear: both;padding:0 1em;}
.faq_italic{font-style: italic;font-weight: bold;font-size: 95%;padding: 0 10px;}

table.faq, table.faq a, table.faq tr.odd td, table.faq tr.odd td a,
div.faq_title, div.faq_title a, div.faq_body, div.faq_body a,
Expand All @@ -370,9 +368,7 @@ table.faq a:hover, table.faq tr.odd td a:hover,
div.faq_title a:hover, div.faq_body a:hover, .faq_italic a:hover { color: #9F8C77;}

.faq_top {float:right;}
.faq_edit {float:right;}
[dir=rtl] .faq_top {float:left;}
[dir=rtl] .faq_edit {float:left;}

/* Old Submenus (used in Album) */

Expand Down Expand Up @@ -429,7 +425,8 @@ 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;}
#family-table .subheaders:first-child {width: 285px;}
#note-edit .facts_table,, #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 @@ -507,6 +504,7 @@ html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
#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;}
#login-form label input, #new_passwd_form label input, #verify-form input {width:140px; margin: 0 10px;}
#login-form div label {text-align: right;}
#new_passwd_form h4, #register-form h4 {font-weight:normal; text-align:center;}
#register-form,#verify-form {width:440px}
#register-form p,#verify-form p {text-align:left}
Expand All @@ -516,7 +514,7 @@ html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
#register-form textarea {vertical-align: top;}
#register-form div#registration-submit {text-align:center;}
.login_block_block #login-form, .login_block_block #new_passwd_form{border:0; background:none;}
[dir=rtl] #login-form label, [dir=rtl] #new_passwd_form label, [dir=rtl] #register-form label, [dir=rtl] #verify-form label {text-align:left;}
[dir=rtl] #login-form label, [dir=rtl] #new_passwd_form label, [dir=rtl] #register-form label, [dir=rtl] #verify-form label, [dir=rtl] #login-form div label {text-align:left;}
[dir=rtl] #register-form div, [dir=rtl] #verify-form div {text-align:left;}

/* ============== reportengine.php ======================= */
Expand Down Expand Up @@ -561,6 +559,7 @@ html[dir="rtl"] .person_box_template i[class^="icon-silhouette"]{float:right;}
.ui-widget-header button { font-size: 1em; font-family: arial,helvetica,sans-serif;}

.ui-state-highlight { padding: 3px; text-align: center;}
.ui-state-highlight a { font-weight: bold; }

/* jQuery.datatable styling general over-rides */
.odd {background-color:#E9E2DB;}
Expand Down
1 change: 1 addition & 0 deletions less/_css-media.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
form,
#sidebar,
#separator,
.editfacts,
.noprint {
display: none;
}
Expand Down
7 changes: 6 additions & 1 deletion less/_nav.less
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,15 @@
background-color: transparent;
}
}

>.dropdown-menu {
margin-top:-2px;
}

ul {
background-color: @brown-light;
border:solid @brown thin;

li {
background-image:url(images/small_menu_sprite.png);
background-repeat:no-repeat;
Expand Down Expand Up @@ -189,6 +193,7 @@
.menu-help-wiki {background-position:left -690px; [dir=rtl] & {background-position:right -690px;}}
.menu-indi-addfav,
.menu-record-addfav {background-position:left -870px; [dir=rtl] & {background-position:right -870px;}}
.menu-indi-editname {background-position: left -120px; [dir=rtl] & {background-position:right -120px;}}
.menu-indi-addname {background-position:left -780px; [dir=rtl] & {background-position:right -780px;}}
.menu-indi-del,
.menu-record-del {background-position:left -840px; [dir=rtl] & {background-position:right -840px;}}
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.4/style-ltr.css --verbose --no-color --rtl="dir=LTR" --clean-css
call lessc ./style.less ./../css-1.7.5/style-ltr.css --verbose --no-color --rtl="dir=LTR" --clean-css

call lessc ./style.less ./../css-1.7.4/style-rtl.css --verbose --no-color --rtl="dir=RTL" --clean-css
call lessc ./style.less ./../css-1.7.5/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.4/';
return 'themes/rural/css-1.7.5/';
}

/** {@inheritdoc} */
Expand Down

0 comments on commit 83d9720

Please sign in to comment.