diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-23 23:05:34 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-23 23:05:34 +0000 |
| commit | ddeadd1c02880367ad786b113d352a519f45ec73 (patch) | |
| tree | 00b8b46ee1a3fc84e5492c2183dfaa8192d261f9 /framebuffer | |
| parent | b20949a35025b23da1bf0ac6003f4575eb94281d (diff) | |
| download | netsurf-ddeadd1c02880367ad786b113d352a519f45ec73.tar.gz netsurf-ddeadd1c02880367ad786b113d352a519f45ec73.tar.bz2 | |
Merge LibCSS port to trunk.
svn path=/trunk/netsurf/; revision=8752
Diffstat (limited to 'framebuffer')
| -rw-r--r-- | framebuffer/fbtk.c | 2 | ||||
| -rw-r--r-- | framebuffer/gui.c | 4 | ||||
| l--------- | framebuffer/res/quirks.css | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/framebuffer/fbtk.c b/framebuffer/fbtk.c index c564a9117..d212fb4d5 100644 --- a/framebuffer/fbtk.c +++ b/framebuffer/fbtk.c @@ -41,7 +41,7 @@ static plot_font_style_t root_style = { .family = PLOT_FONT_FAMILY_SANS_SERIF, - .size = 11, + .size = 11 * FONT_SIZE_SCALE, .weight = 400, .flags = FONTF_NONE, }; diff --git a/framebuffer/gui.c b/framebuffer/gui.c index 65080db8a..fbed5bd86 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -56,6 +56,7 @@ #include "content/fetch.h" char *default_stylesheet_url; +char *quirks_stylesheet_url; char *adblock_stylesheet_url; char *options_file_location; @@ -367,6 +368,9 @@ void gui_init(int argc, char** argv) default_stylesheet_url = path_to_url(buf); LOG(("Using '%s' as Default CSS URL", default_stylesheet_url)); + fb_find_resource(buf, "quirks.css", "./framebuffer/res/quirks.css"); + quirks_stylesheet_url = path_to_url(buf); + nsfb = framebuffer_initialise(argc, argv); if (nsfb == NULL) die("Unable to initialise framebuffer"); diff --git a/framebuffer/res/quirks.css b/framebuffer/res/quirks.css new file mode 120000 index 000000000..d9fb80334 --- /dev/null +++ b/framebuffer/res/quirks.css @@ -0,0 +1 @@ +../../!NetSurf/Resources/Quirks,f79
\ No newline at end of file |