mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixed regression for bug 40340 (checked in yesterday). Thanks to David Baron. r=karnaze, a=buster

This commit is contained in:
attinasi%netscape.com 2000-10-11 22:25:57 +00:00
Родитель 55b665530c
Коммит f678e50f8b
2 изменённых файлов: 34 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

23
layout/base/nsPresShell.cpp
Просмотреть файл

@ -1940,8 +1940,7 @@ nsresult PresShell::SetPrefLinkRules(void)
// this means the link colors need to be overridable,
// which they are if we put them in the backstop stylesheet,
// though if using an override sheet this will cause authors grief still
// In the backstop stylesheet, they are !important to keep the forced-color rules
// from coloring the links too
// In the backstop stylesheet, they are !important when we are ignoring document colors
//
// XXX: do active links and visited links get another color?
// They were red in the html.css rules
@ -1955,20 +1954,32 @@ nsresult PresShell::SetPrefLinkRules(void)
// insert a rule to make links the preferred color
PRUint32 index = 0;
nsAutoString strRule, strColor;
PRBool useDocColors = PR_TRUE;
// see if we need to create the rules first
mPresContext->GetCachedBoolPref(kPresContext_UseDocumentColors, useDocColors);
///////////////////////////////////////////////////////////////
// - links: '*:link, *:link:active {color: #RRGGBB !important;}'
// - links: '*:link, *:link:active {color: #RRGGBB [!important];}'
ColorToString(linkColor,strColor);
strRule.Append(NS_LITERAL_STRING("*:link, *:link:active {color:"));
strRule.Append(strColor);
strRule.Append(NS_LITERAL_STRING(" !important;} "));
if (!useDocColors) {
strRule.Append(NS_LITERAL_STRING(" !important;} "));
} else {
strRule.Append(NS_LITERAL_STRING(";} "));
}
///////////////////////////////////////////////////////////////
// - visited links '*:visited, *:visited:active {color: #RRGGBB !important;}'
// - visited links '*:visited, *:visited:active {color: #RRGGBB [!important];}'
ColorToString(visitedColor,strColor);
strRule.Append(NS_LITERAL_STRING("*:visited, *:visited:active {color:"));
strRule.Append(strColor);
strRule.Append(NS_LITERAL_STRING(" !important;} "));
if (!useDocColors) {
strRule.Append(NS_LITERAL_STRING(" !important;} "));
} else {
strRule.Append(NS_LITERAL_STRING(";} "));
}
// insert the rules
result = sheet->InsertRule(strRule,0,&index);

23
layout/html/base/src/nsPresShell.cpp
Просмотреть файл

@ -1940,8 +1940,7 @@ nsresult PresShell::SetPrefLinkRules(void)
// this means the link colors need to be overridable,
// which they are if we put them in the backstop stylesheet,
// though if using an override sheet this will cause authors grief still
// In the backstop stylesheet, they are !important to keep the forced-color rules
// from coloring the links too
// In the backstop stylesheet, they are !important when we are ignoring document colors
//
// XXX: do active links and visited links get another color?
// They were red in the html.css rules
@ -1955,20 +1954,32 @@ nsresult PresShell::SetPrefLinkRules(void)
// insert a rule to make links the preferred color
PRUint32 index = 0;
nsAutoString strRule, strColor;
PRBool useDocColors = PR_TRUE;
// see if we need to create the rules first
mPresContext->GetCachedBoolPref(kPresContext_UseDocumentColors, useDocColors);
///////////////////////////////////////////////////////////////
// - links: '*:link, *:link:active {color: #RRGGBB !important;}'
// - links: '*:link, *:link:active {color: #RRGGBB [!important];}'
ColorToString(linkColor,strColor);
strRule.Append(NS_LITERAL_STRING("*:link, *:link:active {color:"));
strRule.Append(strColor);
strRule.Append(NS_LITERAL_STRING(" !important;} "));
if (!useDocColors) {
strRule.Append(NS_LITERAL_STRING(" !important;} "));
} else {
strRule.Append(NS_LITERAL_STRING(";} "));
}
///////////////////////////////////////////////////////////////
// - visited links '*:visited, *:visited:active {color: #RRGGBB !important;}'
// - visited links '*:visited, *:visited:active {color: #RRGGBB [!important];}'
ColorToString(visitedColor,strColor);
strRule.Append(NS_LITERAL_STRING("*:visited, *:visited:active {color:"));
strRule.Append(strColor);
strRule.Append(NS_LITERAL_STRING(" !important;} "));
if (!useDocColors) {
strRule.Append(NS_LITERAL_STRING(" !important;} "));
} else {
strRule.Append(NS_LITERAL_STRING(";} "));
}
// insert the rules
result = sheet->InsertRule(strRule,0,&index);