makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 03:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcher

Browse source 
* upstream/develop:
  [ticket/10723] Stop Travis running all tests on sqlite
  [feature/prosilver-cleanup/css-reset-v2] CSS reset
This commit is contained in:
Igor Wiedler 2012-03-24 15:45:54 +01:00
commit ef85ef8ed6
3 changed files with 91 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
phpBB/styles/prosilver/theme/common.css
View file

@ -1,12 +1,51 @@
/* General Markup Styles /* CSS Reset http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126
---------------------------------------- */ ---------------------------------------- */
html, body, div, span, applet, object, iframe,
* { h1, h2, h3, h4, h5, h6, p, blockquote, pre,
/* Reset browsers default margin, padding and font sizes */ a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0; margin: 0;
padding: 0; padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
} }
/* General Markup Styles
---------------------------------------- */
html { html {
font-size: 100%; font-size: 100%;
/* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */ /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */
@ -20,6 +59,7 @@ body {
background-color: #FFFFFF; background-color: #FFFFFF;
/*font-size: 62.5%; This sets the default font size to be equivalent to 10px */ /*font-size: 62.5%; This sets the default font size to be equivalent to 10px */
font-size: 10px; font-size: 10px;
line-height: normal;
margin: 0; margin: 0;
padding: 12px 0; padding: 12px 0;
} }
@ -99,6 +139,39 @@ p.right {
text-align: right; text-align: right;
} }
b, strong {
font-weight: bold;
}
i, em {
font-style: italic;
}
u {
text-decoration: underline;
}
ul {
list-style-type: disc;
}
ol {
list-style-type: decimal;
}
li {
display: list-item;
}
ul ul, ol ul {
list-style-type: circle;
}
ol ol ul, ol ul ul, ul ol ul, ul ul ul {
list-style-type: square;
}
/* Main blocks /* Main blocks
---------------------------------------- */ ---------------------------------------- */
#wrap { #wrap {

14
travis/phpunit-mysql-travis.xml
View file

@ -23,12 +23,12 @@
</groups> </groups>
<php> <php>
<const name="dbms" value="mysqli"/> <server name="PHPBB_TEST_DBMS" value="mysqli" />
<const name="dbhost" value="0.0.0.0" /> <server name="PHPBB_TEST_DBHOST" value="0.0.0.0" />
<const name="dbport" value="3306" /> <server name="PHPBB_TEST_DBPORT" value="3306" />
<const name="dbname" value="phpbb_tests" /> <server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
<const name="dbuser" value="root" /> <server name="PHPBB_TEST_DBUSER" value="root" />
<const name="dbpasswd" value="" /> <server name="PHPBB_TEST_DBPASSWD" value="" />
<const name="table_prefix" value="phpbb_"/> <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
</php> </php>
</phpunit> </phpunit>

14
travis/phpunit-postgres-travis.xml
View file

@ -25,12 +25,12 @@
<php> <php>
<!-- "Real" test database --> <!-- "Real" test database -->
<!-- uncomment, otherwise sqlite memory runs --> <!-- uncomment, otherwise sqlite memory runs -->
<const name="dbms" value="postgres"/> <server name="PHPBB_TEST_DBMS" value="postgres"/>
<const name="dbhost" value="localhost" /> <server name="PHPBB_TEST_DBHOST" value="localhost" />
<const name="dbport" value="5432" /> <server name="PHPBB_TEST_DBPORT" value="5432" />
<const name="dbname" value="phpbb_tests" /> <server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
<const name="dbuser" value="postgres" /> <server name="PHPBB_TEST_DBUSER" value="postgres" />
<const name="dbpasswd" value="" /> <server name="PHPBB_TEST_DBPASSWD" value="" />
<const name="table_prefix" value="phpbb_"/> <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
</php> </php>
</phpunit> </phpunit>