From 495e291d4f6178a234c85826ec00a4a1a7e819cb Mon Sep 17 00:00:00 2001 From: Matthew Horan Date: Sun, 13 Jan 2013 16:08:30 -0500 Subject: [PATCH] Remove font override for first-letter and first-line --- spec/driver_spec.rb | 35 +++++------------------------------ src/WebPage.cpp | 2 +- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/spec/driver_spec.rb b/spec/driver_spec.rb index c0f5f18..482f586 100644 --- a/spec/driver_spec.rb +++ b/spec/driver_spec.rb @@ -1334,14 +1334,10 @@ describe Capybara::Webkit::Driver do p { font-family: "Verdana"; } p:before { font-family: "Verdana"; } p:after { font-family: "Verdana"; } - #first-line-div:first-line { font-family: "Verdana"; } - #first-letter-div:first-letter { font-family: "Verdana"; }

Hello

-

Hello first line.

-

Hello first letter.

HTML @@ -1349,43 +1345,22 @@ describe Capybara::Webkit::Driver do before { visit("/") } - it "ignores custom fonts" do - font_family = driver.evaluate_script(<<-SCRIPT) + let(:font_family) do + driver.evaluate_script(<<-SCRIPT) var element = document.getElementById("text"); element.ownerDocument.defaultView.getComputedStyle(element, null).getPropertyValue("font-family"); SCRIPT + end + + it "ignores custom fonts" do font_family.should == "Arial" end it "ignores custom fonts before an element" do - font_family = driver.evaluate_script(<<-SCRIPT) - var element = document.getElementById("text"); - element.ownerDocument.defaultView.getComputedStyle(element, 'before').getPropertyValue("font-family"); - SCRIPT font_family.should == "Arial" end it "ignores custom fonts after an element" do - font_family = driver.evaluate_script(<<-SCRIPT) - var element = document.getElementById("text"); - element.ownerDocument.defaultView.getComputedStyle(element, 'after').getPropertyValue("font-family"); - SCRIPT - font_family.should == "Arial" - end - - it "ignores custom fonts applied to the first-line pseudo element" do - font_family = driver.evaluate_script(<<-SCRIPT) - var element = document.getElementById("first-line-div"); - element.ownerDocument.defaultView.getComputedStyle(element, 'first-line').getPropertyValue("font-family"); - SCRIPT - font_family.should == "Arial" - end - - it "ignores custom fonts applied to the first-letter pseudo element" do - font_family = driver.evaluate_script(<<-SCRIPT) - var element = document.getElementById("first-letter-div"); - element.ownerDocument.defaultView.getComputedStyle(element, 'first-letter').getPropertyValue("font-family"); - SCRIPT font_family.should == "Arial" end end diff --git a/src/WebPage.cpp b/src/WebPage.cpp index ca6c6d7..cf6d47f 100644 --- a/src/WebPage.cpp +++ b/src/WebPage.cpp @@ -70,7 +70,7 @@ void WebPage::loadJavascript() { } void WebPage::setUserStylesheet() { - QString data = QString("*, :first-line, :first-letter, :before, :after { font-family: 'Arial' ! important; }").toUtf8().toBase64(); + QString data = QString("*, :before, :after { font-family: 'Arial' ! important; }").toUtf8().toBase64(); QUrl url = QUrl(QString("data:text/css;charset=utf-8;base64,") + data); settings()->setUserStyleSheetUrl(url); }