Skip to content

Commit b332545

Browse files
committed
Merge branch 'master' into release-1.0.5
2 parents 9a5ad2a + 430cdf1 commit b332545

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

styles/prosilver/template/pages_blank.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
#
44
# local files relative to this template file (when stored inside phpBB's style directories):
55
# <!-- INCLUDEJS script.js -->
6-
# <!-- INCLUDECSS ../theme/style.css -->
6+
# <!-- INCLUDECSS style.css -->
77
#
88
# hosted on external sites:
99
# <!-- INCLUDEJS http://code.jquery.com/jquery-migrate-1.2.1.min.js -->
1010
# <!-- INCLUDECSS https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css -->
1111
#
1212
# local files stored inside the Pages extension:
1313
# <!-- INCLUDEJS @phpbb_pages/script.js -->
14-
# <!-- INCLUDECSS @phpbb_pages/../theme/style.css -->
14+
# <!-- INCLUDECSS @phpbb_pages/style.css -->
1515
#
1616
#}
17-
<!-- INCLUDECSS @phpbb_pages/../theme/pages_controller.css -->
17+
<!-- INCLUDECSS @phpbb_pages/pages_controller.css -->
1818
<!-- INCLUDE overall_header.html -->
1919

2020
<div class="content pages-content">

styles/prosilver/template/pages_default.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
#
44
# local files relative to this template file (when stored inside phpBB's style directories):
55
# <!-- INCLUDEJS script.js -->
6-
# <!-- INCLUDECSS ../theme/style.css -->
6+
# <!-- INCLUDECSS style.css -->
77
#
88
# hosted on external sites:
99
# <!-- INCLUDEJS http://code.jquery.com/jquery-migrate-1.2.1.min.js -->
1010
# <!-- INCLUDECSS https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css -->
1111
#
1212
# local files stored inside the Pages extension:
1313
# <!-- INCLUDEJS @phpbb_pages/script.js -->
14-
# <!-- INCLUDECSS @phpbb_pages/../theme/style.css -->
14+
# <!-- INCLUDECSS @phpbb_pages/style.css -->
1515
#
1616
#}
17-
<!-- INCLUDECSS @phpbb_pages/../theme/pages_controller.css -->
17+
<!-- INCLUDECSS @phpbb_pages/pages_controller.css -->
1818
<!-- INCLUDE overall_header.html -->
1919

2020
<div class="panel">

styles/subsilver2/template/pages_blank.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
#
44
# local files relative to this template file (when stored inside phpBB's style directories):
55
# <!-- INCLUDEJS script.js -->
6-
# <!-- INCLUDECSS ../theme/style.css -->
6+
# <!-- INCLUDECSS style.css -->
77
#
88
# hosted on external sites:
99
# <!-- INCLUDEJS http://code.jquery.com/jquery-migrate-1.2.1.min.js -->
1010
# <!-- INCLUDECSS https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css -->
1111
#
1212
# local files stored inside the Pages extension:
1313
# <!-- INCLUDEJS @phpbb_pages/script.js -->
14-
# <!-- INCLUDECSS @phpbb_pages/../theme/style.css -->
14+
# <!-- INCLUDECSS @phpbb_pages/style.css -->
1515
#
1616
#}
17-
<!-- INCLUDECSS @phpbb_pages/../theme/pages_controller.css -->
17+
<!-- INCLUDECSS @phpbb_pages/pages_controller.css -->
1818
<!-- INCLUDE overall_header.html -->
1919

2020
<div class="gen">

styles/subsilver2/template/pages_default.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
#
44
# local files relative to this template file (when stored inside phpBB's style directories):
55
# <!-- INCLUDEJS script.js -->
6-
# <!-- INCLUDECSS ../theme/style.css -->
6+
# <!-- INCLUDECSS style.css -->
77
#
88
# hosted on external sites:
99
# <!-- INCLUDEJS http://code.jquery.com/jquery-migrate-1.2.1.min.js -->
1010
# <!-- INCLUDECSS https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css -->
1111
#
1212
# local files stored inside the Pages extension:
1313
# <!-- INCLUDEJS @phpbb_pages/script.js -->
14-
# <!-- INCLUDECSS @phpbb_pages/../theme/style.css -->
14+
# <!-- INCLUDECSS @phpbb_pages/style.css -->
1515
#
1616
#}
17-
<!-- INCLUDECSS @phpbb_pages/../theme/pages_controller.css -->
17+
<!-- INCLUDECSS @phpbb_pages/pages_controller.css -->
1818
<!-- INCLUDE overall_header.html -->
1919

2020
<table class="tablebg" width="100%" cellspacing="1">

0 commit comments

Comments
 (0)