Unverified Commit b2128b01 by Scott Committed by GitHub

Merge pull request #591 from pupi1985/patch-97

Many random tweaks
parents 558fead4 e7180843
......@@ -221,7 +221,7 @@ function qa_category_select(idprefix, startpath)
var addedoption = false;
if (lines.length > 2) {
var subelem = elem.parentNode.insertBefore(document.createElement('span'), elem.nextSibling);
subelem = elem.parentNode.insertBefore(document.createElement('span'), elem.nextSibling);
subelem.id = idprefix + '_' + l + '_sub';
subelem.innerHTML = ' ';
......
......@@ -92,7 +92,7 @@ function qa_vote_click(elem)
var mess = document.getElementById('errorbox');
if (!mess) {
var mess = document.createElement('div');
mess = document.createElement('div');
mess.id = 'errorbox';
mess.className = 'qa-error';
mess.innerHTML = lines[1];
......@@ -648,7 +648,7 @@ function qa_category_select(idprefix, startpath)
var addedoption = false;
if (lines.length > 2) {
var subelem = elem.parentNode.insertBefore(document.createElement('span'), elem.nextSibling);
subelem = elem.parentNode.insertBefore(document.createElement('span'), elem.nextSibling);
subelem.id = idprefix + '_' + l + '_sub';
subelem.innerHTML = ' ';
......
......@@ -92,7 +92,7 @@ function qa_vote_click(elem)
var mess = document.getElementById('errorbox');
if (!mess) {
var mess = document.createElement('div');
mess = document.createElement('div');
mess.id = 'errorbox';
mess.className = 'qa-error';
mess.innerHTML = lines[1];
......
......@@ -29,7 +29,7 @@ class Q2A_Storage_CacheFactory
/**
* Get the appropriate cache handler.
* @return Q2A_Storage_CacheInterface The cache handler.
* @return Q2A_Storage_CacheDriver The cache handler.
*/
public static function getCacheDriver()
{
......
......@@ -645,7 +645,7 @@ function qa_message_html_defaults()
/**
* Return $voteview parameter to pass to qa_post_html_fields() in /qa-include/app/format.php.
* @param $postorbasetype The post, or for compatibility just a basetype, i.e. 'Q', 'A' or 'C'
* @param array|string $postorbasetype The post, or for compatibility just a basetype, i.e. 'Q', 'A' or 'C'
* @param bool $full Whether full post is shown
* @param bool $enabledif Whether to do checks for voting buttons (i.e. will always disable voting if false)
* @return bool|string Possible values:
......
......@@ -388,7 +388,7 @@ function qa_post_userid_to_handle($userid)
* Return the textual rendition of $content in $format (used for indexing).
* @param $content
* @param $format
* @return
* @return string
*/
function qa_post_content_to_text($content, $format)
{
......
......@@ -44,8 +44,8 @@ function qa_db_increment_views($postid)
/**
* Recalculate the hotness in the database for one or more posts.
*
* @param $firstpostid First post to recalculate (or only post if $lastpostid is null).
* @param $lastpostid Last post in the range to recalculate.
* @param int $firstpostid First post to recalculate (or only post if $lastpostid is null).
* @param int $lastpostid Last post in the range to recalculate.
* @param bool $viewincrement Deprecated - view counter is now incremented separately. Previously, would increment the post's
* views and include that in the hotness calculation.
* @return void
......
......@@ -841,7 +841,6 @@ function qa_page_q_do_comment($question, $parent, $commentsfollows, $pagestart,
// The other option ('level') prevents the comment button being shown, in qa_page_q_post_rules(...)
$parentid = $parent['postid'];
$answer = ($question['postid'] == $parentid) ? null : $parent;
switch (qa_user_post_permit_error('permit_post_c', $parent, QA_LIMIT_COMMENTS)) {
case 'login':
......
......@@ -896,7 +896,7 @@ function qa_list_modules($type)
* Return an array containing information about the module of $type named $name
* @param $type
* @param $name
* @return
* @return array
*/
function qa_get_module_info($type, $name)
{
......
......@@ -451,6 +451,7 @@ function qa_db_list_tables_lc()
*
* @param bool $onlyTablesWithPrefix Determine if the result should only include tables with the
* QA_MYSQL_TABLE_PREFIX or if it should include all tables in the database.
* @return array
*/
function qa_db_list_tables($onlyTablesWithPrefix = false)
{
......
......@@ -24,7 +24,7 @@ if (qa_gpc_to_string(@$_GET['param']) == QA_URL_TEST_STRING) {
echo '<html><body style="margin:0; padding:0;">';
echo '<table width="100%" height="100%" cellspacing="0" cellpadding="0">';
echo '<tr valign="middle"><td align="center" style="border-style:solid; border-width:1px; background-color:#fff; ';
echo '<tr valign="middle"><td align="center" style="border: 1px solid; background-color:#fff; ';
echo qa_admin_url_test_html();
echo '/td></tr></table>';
echo '</body></html>';
......
......@@ -21,7 +21,7 @@ p {margin-top:0;}
.qa-notice {background:#ebc5e2 url(suggest-bg.png) repeat-x left bottom; border-bottom:1px solid #597700; color:#5c0045; font-size:14px; padding:12px 32px; font-weight:bold; position:relative;}
.qa-notice-close-button {font-family:"Arial Black"; color:#5c0045; font-size:18px; background:none; cursor:pointer; position:absolute; height:24px; border:none; top:4px; right:6px}
.qa-body-wrapper {background:#fff; border:1px solid #597700; width:980px; margin:0 auto; margin-top:-1px; text-align:left;}
.qa-body-wrapper {background:#fff; border:1px solid #597700; width:980px; margin:-1px auto 0; text-align:left;}
/* Ajax loading spinner */
......@@ -300,7 +300,7 @@ h2 {font-size:22px; color:#c659ab; padding-top:12px; clear:both;}
.qa-top-tags-count { display:inline-block; min-width:40px; text-align:right; padding-right:3px; }
.qa-top-tags-label { display:inline-block; }
.qa-browse-cat-list {list-style:none; padding:0; margin:0; margin-left:2em;}
.qa-browse-cat-list {list-style:none; padding:0; margin: 0 0 0 2em;}
.qa-browse-cat-list-1 {font-size:18px; margin-top:1em;}
.qa-browse-cat-list-2 {font-size:16px;}
.qa-browse-cat-list-3 {font-size:14px;}
......@@ -384,7 +384,7 @@ h2 {font-size:22px; color:#c659ab; padding-top:12px; clear:both;}
/* Comments */
.qa-c-list-item {border-bottom:1px solid #ccc; padding:8px; padding-right:0;}
.qa-c-list-item {border-bottom:1px solid #ccc; padding: 8px 0 8px 8px;}
.qa-c-item-hidden {}
.qa-c-item-hidden .qa-c-item-content {color:#bbb;}
.qa-c-item-hidden .qa-c-item-link {color:#aaf;}
......@@ -476,10 +476,10 @@ h2 {font-size:22px; color:#c659ab; padding-top:12px; clear:both;}
.qa-tag-link:hover {text-decoration:underline !important;}
.qa-avatar-image {border:0; vertical-align:middle;}
.qa-avatar-link,.qa-avatar-link:hover {text-decoration:none;}
.qa-favorite-image {background:url(favorite-heart.png) no-repeat; background-position: 0 0; border:0; height:49px; width:50px; vertical-align:middle; display:inline-block;}
.qa-favorite-image {background: url(favorite-heart.png) no-repeat 0 0; border:0; height:49px; width:50px; vertical-align:middle; display:inline-block;}
.qa-q-favorited .qa-q-item-title a, .qa-tag-favorited, .qa-cat-favorited, .qa-user-favorited, .qa-nav-cat-favorited, .qa-browse-cat-favorited {background-image:url(favorite-icon-16x16.png); background-repeat: no-repeat;}
.qa-cat-parent-favorited {background-image:url(favorite-light-icon-16x16.png); background-repeat: no-repeat;}
.qa-q-favorited .qa-q-item-title a, .qa-tag-favorited, .qa-cat-favorited, .qa-user-favorited, .qa-nav-cat-favorited, .qa-browse-cat-favorited {background: url(favorite-icon-16x16.png) no-repeat;}
.qa-cat-parent-favorited {background: url(favorite-light-icon-16x16.png) no-repeat;}
.qa-q-favorited .qa-q-item-title a, .qa-nav-cat-favorited, .qa-browse-cat-favorited {background-position: left center; padding-left:20px;}
.qa-nav-cat-favorited {margin-left:-20px;}
.qa-tag-favorited, .qa-cat-favorited, .qa-cat-parent-favorited, .qa-user-favorited {background-position: left center; padding-left:19px;}
......
......@@ -20,7 +20,7 @@ p {margin-top:0;}
.qa-notice {background:#fdd; border-bottom:2px solid #293d39; color:#b00; font-size:18px; padding:.5em 32px; font-weight:bold; position:relative;}
.qa-notice-close-button {font-family:"Arial Black"; color:#c00; font-size:20px; background:none; cursor:pointer; position:absolute; height:24px; border:none; top:4px; right:6px}
.qa-body-wrapper {background:#fff; border:1px solid #293d39; width:980px; margin:0 auto; margin-top:-1px; text-align:left;}
.qa-body-wrapper {background:#fff; border:1px solid #293d39; width:980px; margin: -1px auto 0; text-align:left;}
/* Ajax loading spinner */
......@@ -276,7 +276,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
.qa-top-tags-count { display:inline-block; min-width:40px; text-align:right; padding-right:3px; }
.qa-top-tags-label { display:inline-block; }
.qa-browse-cat-list {list-style:none; padding:0; margin:0; margin-left:2.5em;}
.qa-browse-cat-list {list-style:none; padding:0; margin: 0 0 0 2.5em;}
.qa-browse-cat-list-1 {font-size:16px;}
.qa-browse-cat-list-2 {font-size:14px;}
.qa-browse-cat-list-3 {font-size:12px;}
......@@ -361,7 +361,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
/* Comments */
.qa-c-list-item {border-bottom:1px dotted #666; padding:6px; padding-right:0;}
.qa-c-list-item {border-bottom:1px dotted #666; padding: 6px 0 6px 6px;}
.qa-c-list-item:target {-webkit-animation: highlight 2s ease-in-out; animation: highlight 2s ease-in-out;}
.qa-c-item-hidden {}
.qa-c-item-hidden .qa-c-item-content {color:#bbb;}
......@@ -448,12 +448,12 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
.qa-tag-link:hover {text-decoration:none; background-color:#235272;}
.qa-avatar-image {border:0; vertical-align:middle;}
.qa-avatar-link,.qa-avatar-link:hover {text-decoration:none;}
.qa-favorite-image {background:url(favorite-plus.gif) no-repeat; background-position: 0 -26px; border:0; margin:2px; height:26px; width:26px; vertical-align:middle; display:inline-block;}
.qa-favorite-image {background: url(favorite-plus.gif) no-repeat 0 -26px; border:0; margin:2px; height:26px; width:26px; vertical-align:middle; display:inline-block;}
/* Favorited items */
.qa-q-favorited .qa-q-item-title a, .qa-tag-favorited, .qa-cat-favorited, .qa-user-favorited, .qa-nav-cat-favorited, .qa-browse-cat-favorited {background-image:url(favorite-icon-14x14.gif); background-repeat: no-repeat;}
.qa-cat-parent-favorited {background-image:url(favorite-light-icon-14x14.gif); background-repeat: no-repeat;}
.qa-q-favorited .qa-q-item-title a, .qa-tag-favorited, .qa-cat-favorited, .qa-user-favorited, .qa-nav-cat-favorited, .qa-browse-cat-favorited {background: url(favorite-icon-14x14.gif) no-repeat;}
.qa-cat-parent-favorited {background: url(favorite-light-icon-14x14.gif) no-repeat;}
.qa-q-favorited .qa-q-item-title a, .qa-nav-cat-favorited, .qa-browse-cat-favorited {background-position: left center; padding-left:18px;}
.qa-tag-favorited {background-position: 3px center; padding-left:20px;}
.qa-cat-favorited, .qa-cat-parent-favorited, .qa-user-favorited {background-position: left center; padding-left:17px;}
......
......@@ -175,7 +175,6 @@ h1 {
margin: 0;
color: #444;
font-size: 20px;
font-weight: 700;
font-family: Arial,Helvetica,sans-serif;
font-weight: 700;
line-height: 1.1em;
......@@ -841,7 +840,6 @@ div.header-banner {
.qa-view-count {
float: left;
background: #fff;
float: left;
width: 60px;
height: 60px;
text-align: center;
......@@ -1056,7 +1054,6 @@ div.header-banner {
box-shadow: none;
font-size: 18px;
border: none;
box-shadow: none;
text-shadow: none;
}
......@@ -1198,7 +1195,7 @@ div.header-banner {
background-color: #666;
color: #ddd !important;
-moz-transition: background-color ease-in-out 0.15s;
-websit-transition: background-color ease-in-out 0.15s;
-webkit-transition: background-color ease-in-out 0.15s;
-o-transition: background-color ease-in-out 0.15s;
transition: background-color ease-in-out 0.15s;
}
......@@ -2451,8 +2448,7 @@ a.qa-browse-cat-link:visited {
}
.qa-favorite-image {
background: url(images/favorite-heart.png) no-repeat;
background-position: 0 -24px;
background: url(images/favorite-heart.png) no-repeat 0 -24px;
border: 0;
height: 24px;
width: 24px;
......@@ -2487,13 +2483,11 @@ a.qa-browse-cat-link:visited {
}
.qa-q-favorited .qa-q-item-title a, .qa-tag-favorited, .qa-tag-favorited:hover, .qa-cat-favorited, .qa-user-favorited, .qa-nav-cat-favorited, .qa-browse-cat-favorited {
background-image: url(images/favorite-icon-15x15.png);
background-repeat: no-repeat;
background: url(images/favorite-icon-15x15.png) no-repeat;
}
.qa-cat-parent-favorited {
background-image: url(images/favorite-light-icon-15x15.png);
background-repeat: no-repeat;
background: url(images/favorite-light-icon-15x15.png) no-repeat;
}
.qa-q-favorited .qa-q-item-title a, .qa-nav-cat-favorited, .qa-browse-cat-favorited {
......
......@@ -319,10 +319,7 @@ blockquote p {
width: 24px;
height: 24px;
display: block;
background-color: transparent;
background-image: url('images/icons/close-black.png');
background-repeat: no-repeat;
background-position: center;
background: transparent url('images/icons/close-black.png') no-repeat center;
text-indent: -9999px;
border: none;
outline: none;
......@@ -330,8 +327,7 @@ blockquote p {
transition: background-image 0.5s;
}
.qa-notice-close-button:hover, .qa-notice-close-button:focus {
background-color: transparent; /* override generic input styles */
background-image: url('images/icons/close-red.png');
background: transparent url('images/icons/close-red.png'); /* override generic input styles */
outline: none;
border: none;
}
......@@ -912,8 +908,7 @@ blockquote p {
}
.qa-favorite-button, .qa-unfavorite-button {
background-image: url('images/star.png');
background-repeat: no-repeat;
background: url('images/star.png') no-repeat;
width: 38px;
height: 38px;
margin: 0;
......@@ -922,18 +917,15 @@ blockquote p {
transition: background-position 0s;
}
.qa-favorite-button:hover, .qa-unfavorite-button:hover {
background-color: #f39c12;
background-position: center -38px;
background: #f39c12 center -38px;
}
.qa-favorite-button {
background-color: #ecf0f1;
background-position: center top;
background: #ecf0f1 center top;
}
.qa-unfavorite-button {
background-color: #f1c40f;
background-position: center bottom;
background: #f1c40f center bottom;
}
/*------[ q-list ]------*/
......@@ -1065,8 +1057,7 @@ blockquote p {
.qa-vote-up-button, .qa-vote-down-button, .qa-voted-up-button, .qa-voted-down-button, .qa-vote-up-disabled, .qa-vote-down-disabled {
text-indent: -9999px;
background: url('images/vote-buttons-2.png');
background-repeat: no-repeat;
background: url('images/vote-buttons-2.png') no-repeat;
width: 16px;
height: 10px;
border: none;
......@@ -1543,9 +1534,7 @@ blockquote p {
}
.qa-top-users-label .qa-user-link.qa-user-favorited {
background-image: url('images/icons/fev-star.png');
background-repeat: no-repeat;
background-position: 2px center;
background: url('images/icons/fev-star.png') no-repeat 2px center;
padding-left: 22px;
}
......@@ -1756,7 +1745,6 @@ blockquote p {
.qa-part-form-message .qam-pm-message {
padding: 10px;
margin-bottom: 5px;
background: #27ae60;
color: #fff;
margin-bottom: 0;
......@@ -2043,18 +2031,14 @@ input[type="submit"], button {
}
#level .qa-form-wide-static a:first-child {
background-color: #27ae60;
background-image: url('images/icons/mail-white.png');
background-repeat: no-repeat;
background-position: 5px center;
background: #27ae60 url('images/icons/mail-white.png') no-repeat 5px center;
padding: 2px 5px 2px 25px;
border: 1px solid #1e8449;
display: inline-block;
color: #fff;
}
#level .qa-form-wide-static a:hover:first-child, #level .qa-form-wide-static a:focus:first-child {
background-color: #2ecc71;
background-image: url('images/icons/mail-white.png');
background: #2ecc71 url('images/icons/mail-white.png');
border: 1px solid #25a25a;
color: #fff;
text-decoration: none;
......@@ -2130,8 +2114,7 @@ input[type="submit"], button {
width: 16px;
height: 16px;
display: inline-block;
background-color: #ecf0f1;
background-image: url('images/favorite-icon-15x15.png');
background: #ecf0f1 url('images/favorite-icon-15x15.png');
}
.qa-suggest-next {
......@@ -2183,8 +2166,7 @@ input[type="submit"], button {
background-image: url('images/icons/flag-white.png');
}
.qa-form-light-button-unflag {
background-color: #812b2b;
background-image: url('images/icons/flag-white.png');
background: #812b2b url('images/icons/flag-white.png');
}
.qa-form-light-button-clearflags {
background-image: url('images/icons/un-flag-white.png');
......@@ -2225,8 +2207,7 @@ input[type="submit"], button {
}
.qa-form-light-button-answer {
background-image: url('images/icons/answer-white.png');
background-color: #27ae60;
background: #27ae60 url('images/icons/answer-white.png');
float: left;
margin: 0 5px 0 0;
}
......@@ -2549,9 +2530,7 @@ input[type="submit"], button {
display: block;
margin: 0;
position: relative;
background-image: url('images/answer-select.png');
background-repeat: no-repeat;
background-position: center;
background: url('images/answer-select.png') no-repeat center;
-webkit-transition: all 0.5s;
transition: all 0.5s;
}
......@@ -2750,8 +2729,7 @@ input[type="submit"], button {
background-image: url('images/icons/flag.png');
}
.qa-c-list-item .qa-form-light-button-unflag {
background-color: #e4afaf;
background-image: url('images/icons/flag.png');
background: #e4afaf url('images/icons/flag.png');
}
.qa-c-list-item .qa-form-light-button-clearflags {
background-image: url('images/icons/un-flag.png');
......@@ -2830,7 +2808,6 @@ input[type="submit"], button {
.qa-widget-main h2:first-of-type {
padding: 10px;
margin-bottom: 5px;
background: #9b59b6;
color: #fff;
margin: 0 0 5px 0;
......@@ -3134,7 +3111,6 @@ input[type="submit"], button {
/*------[ footer ]------*/
.qam-footer-box {
padding: 0;
margin-bottom: 5px;
background: #34495e;
color: #fff;
overflow: hidden;
......@@ -3197,7 +3173,6 @@ input[type="submit"], button {
.qa-footer {
padding: 10px;
margin-bottom: 5px;
background: #2c3e50;
color: #fff;
margin-bottom: 0;
......@@ -3296,7 +3271,6 @@ input[type="submit"], button {
}
.qam-ask-mobile a {
padding: 20px;
margin-bottom: 5px;
background: #1abc9c;
color: #fff;
text-align: center;
......@@ -3345,10 +3319,7 @@ input[type="submit"], button {
}
.qam-search-mobile {
background-image: url('images/icons/search-mobile.png');
background-repeat: no-repeat;
background-position: center;
background-color: #1abc9c;
background: #1abc9c url('images/icons/search-mobile.png') no-repeat center;
width: 64px;
display: table-cell;
border-left: 1px solid #1dd2af;
......@@ -3411,9 +3382,7 @@ input[type="submit"], button {
background-color: #34495e;
}
.qam-search-mobile.active {
background-image: url('images/icons/search-mobile-collaps.png');
background-repeat: no-repeat;
background-position: center;
background: url('images/icons/search-mobile-collaps.png') no-repeat center;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment