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

bug 148787 patch by hixie r=dbaron sr=roc+moz 

Clicked links don't go red (prefs style sheet is overriding UA style sheet)
This commit is contained in:
cbiesinger%web.de 2002-06-04 19:44:53 +00:00
Родитель 43f47a78a9
Коммит 0f9097a9a6
2 изменённых файлов: 40 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -2401,8 +2401,8 @@ nsresult PresShell::SetPrefLinkRules(void)
// though if using an override sheet this will cause authors grief still
// In the agent 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
// XXX: Do active links and visited links get another color?
// They are red in the html.css rules, but there is no pref for their color.
nscolor linkColor, visitedColor;
result = mPresContext->GetDefaultLinkColor(&linkColor);
@ -2419,25 +2419,35 @@ nsresult PresShell::SetPrefLinkRules(void)
mPresContext->GetCachedBoolPref(kPresContext_UseDocumentColors, useDocColors);
///////////////////////////////////////////////////////////////
// - links: '*:link, *:link:active {color: #RRGGBB [!important];}'
// - links: '*:link {color: #RRGGBB [!important];}'
ColorToString(linkColor,strColor);
NS_NAMED_LITERAL_STRING(notImportantStr, ";} ");
NS_NAMED_LITERAL_STRING(importantStr, " !important;} ");
NS_NAMED_LITERAL_STRING(notImportantStr, "}");
NS_NAMED_LITERAL_STRING(importantStr, "!important}");
const nsAString& ruleClose = useDocColors ? notImportantStr : importantStr;
result = sheet->InsertRule(NS_LITERAL_STRING("*:link, *:link:active {color:") +
result = sheet->InsertRule(NS_LITERAL_STRING("*:link{color:") +
strColor +
ruleClose,
0,&index);
NS_ENSURE_SUCCESS(result, result);
///////////////////////////////////////////////////////////////
// - visited links '*:visited, *:visited:active {color: #RRGGBB [!important];}'
// - visited links '*:visited {color: #RRGGBB [!important];}'
ColorToString(visitedColor,strColor);
// insert the rule
result = sheet->InsertRule(NS_LITERAL_STRING("*:visited, *:visited:active {color:") +
result = sheet->InsertRule(NS_LITERAL_STRING("*:visited{color:") +
strColor +
ruleClose,
0,&index);
///////////////////////////////////////////////////////////////
// - active links '*:-moz-any-link {color: red [!important];}'
// This has to be here (i.e. we can't just rely on the rule in the UA stylesheet)
// because this entire stylesheet is at the user level (not UA level) and so
// the two rules above override the rule in the UA stylesheet regardless of the
// weights of the respective rules.
result = sheet->InsertRule(NS_LITERAL_STRING("*:-moz-any-link:active{color:red") +
ruleClose,
0,&index);
}
if (NS_SUCCEEDED(result)) {
@ -2457,13 +2467,13 @@ nsresult PresShell::SetPrefLinkRules(void)
printf (" - Creating rules for enabling link underlines\n");
#endif
// make a rule to make text-decoration: underline happen for links
strRule.Append(NS_LITERAL_STRING(":link, :visited {text-decoration:underline;}"));
strRule.Append(NS_LITERAL_STRING("*:-moz-any-link{text-decoration:underline}"));
} else {
#ifdef DEBUG_attinasi
printf (" - Creating rules for disabling link underlines\n");
#endif
// make a rule to make text-decoration: none happen for links
strRule.Append(NS_LITERAL_STRING(":link, :visited {text-decoration:none;}"));
strRule.Append(NS_LITERAL_STRING("*:-moz-any-link{text-decoration:none}"));
}
// ...now insert the rule

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

@ -2401,8 +2401,8 @@ nsresult PresShell::SetPrefLinkRules(void)
// though if using an override sheet this will cause authors grief still
// In the agent 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
// XXX: Do active links and visited links get another color?
// They are red in the html.css rules, but there is no pref for their color.
nscolor linkColor, visitedColor;
result = mPresContext->GetDefaultLinkColor(&linkColor);
@ -2419,25 +2419,35 @@ nsresult PresShell::SetPrefLinkRules(void)
mPresContext->GetCachedBoolPref(kPresContext_UseDocumentColors, useDocColors);
///////////////////////////////////////////////////////////////
// - links: '*:link, *:link:active {color: #RRGGBB [!important];}'
// - links: '*:link {color: #RRGGBB [!important];}'
ColorToString(linkColor,strColor);
NS_NAMED_LITERAL_STRING(notImportantStr, ";} ");
NS_NAMED_LITERAL_STRING(importantStr, " !important;} ");
NS_NAMED_LITERAL_STRING(notImportantStr, "}");
NS_NAMED_LITERAL_STRING(importantStr, "!important}");
const nsAString& ruleClose = useDocColors ? notImportantStr : importantStr;
result = sheet->InsertRule(NS_LITERAL_STRING("*:link, *:link:active {color:") +
result = sheet->InsertRule(NS_LITERAL_STRING("*:link{color:") +
strColor +
ruleClose,
0,&index);
NS_ENSURE_SUCCESS(result, result);
///////////////////////////////////////////////////////////////
// - visited links '*:visited, *:visited:active {color: #RRGGBB [!important];}'
// - visited links '*:visited {color: #RRGGBB [!important];}'
ColorToString(visitedColor,strColor);
// insert the rule
result = sheet->InsertRule(NS_LITERAL_STRING("*:visited, *:visited:active {color:") +
result = sheet->InsertRule(NS_LITERAL_STRING("*:visited{color:") +
strColor +
ruleClose,
0,&index);
///////////////////////////////////////////////////////////////
// - active links '*:-moz-any-link {color: red [!important];}'
// This has to be here (i.e. we can't just rely on the rule in the UA stylesheet)
// because this entire stylesheet is at the user level (not UA level) and so
// the two rules above override the rule in the UA stylesheet regardless of the
// weights of the respective rules.
result = sheet->InsertRule(NS_LITERAL_STRING("*:-moz-any-link:active{color:red") +
ruleClose,
0,&index);
}
if (NS_SUCCEEDED(result)) {
@ -2457,13 +2467,13 @@ nsresult PresShell::SetPrefLinkRules(void)
printf (" - Creating rules for enabling link underlines\n");
#endif
// make a rule to make text-decoration: underline happen for links
strRule.Append(NS_LITERAL_STRING(":link, :visited {text-decoration:underline;}"));
strRule.Append(NS_LITERAL_STRING("*:-moz-any-link{text-decoration:underline}"));
} else {
#ifdef DEBUG_attinasi
printf (" - Creating rules for disabling link underlines\n");
#endif
// make a rule to make text-decoration: none happen for links
strRule.Append(NS_LITERAL_STRING(":link, :visited {text-decoration:none;}"));
strRule.Append(NS_LITERAL_STRING("*:-moz-any-link{text-decoration:none}"));
}
// ...now insert the rule