From 761b9d786b652020b2a798dcadfcd4b0e687e2b4 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 11 Sep 2014 17:50:42 +0200 Subject: [PATCH] Added font styles for 4 and 6pt for the labels --- .../reporting/visual_console_builder.editor.php | 9 ++++++++- .../reporting/visual_console_builder.elements.php | 9 ++++++++- pandora_console/include/styles/pandora.css | 8 +++++++- pandora_console/include/styles/pandora_legacy.css | 6 ++++++ pandora_console/mobile/include/style/main.css | 12 ++++++++++++ 5 files changed, 41 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php index 4d3ea50524..9c16f9108c 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -136,7 +136,14 @@ ui_require_javascript_file ('encode_decode_base64'); echo 'content_css: "' . ui_get_full_url('include/styles/pandora.css', false, false, false) . '",' . "\n"; } ?> - theme_advanced_font_sizes : "8pt=.visual_font_size_8pt, 14pt=.visual_font_size_14pt, 24pt=.visual_font_size_24pt, 36pt=.visual_font_size_36pt, 72pt=.visual_font_size_72pt", + theme_advanced_font_sizes : + "4pt=.visual_font_size_4pt, " + + "6pt=.visual_font_size_6pt, " + + "8pt=.visual_font_size_8pt, " + + "14pt=.visual_font_size_14pt, " + + "24pt=.visual_font_size_24pt, " + + "36pt=.visual_font_size_36pt, " + + "72pt=.visual_font_size_72pt", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_buttons1 : "bold,italic, |, justifyleft, justifycenter, justifyright, |,undo, redo, |, image, link, |, forecolor, fontsizeselect, |, code", diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php index dbe03256db..51e9d20567 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.elements.php +++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php @@ -374,7 +374,14 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/'); echo 'content_css: "' . ui_get_full_url('include/styles/pandora.css', false, false, false) . '",' . "\n"; } ?> - theme_advanced_font_sizes : "8pt=.visual_font_size_8pt, 14pt=.visual_font_size_14pt, 24pt=.visual_font_size_24pt, 36pt=.visual_font_size_36pt, 72pt=.visual_font_size_72pt", + theme_advanced_font_sizes : + "4pt=.visual_font_size_4pt, " + + "6pt=.visual_font_size_6pt, " + + "8pt=.visual_font_size_8pt, " + + "14pt=.visual_font_size_14pt, " + + "24pt=.visual_font_size_24pt, " + + "36pt=.visual_font_size_36pt, " + + "72pt=.visual_font_size_72pt", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_buttons1 : "bold,italic, |, image, link, |, forecolor, fontsizeselect", diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 5df7a5e43b..00baa4c3c6 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -2251,6 +2251,12 @@ span#plugin_description { #tinymce { text-align: left; } +.visual_font_size_4pt, .visual_font_size_4pt > em, .visual_font_size_4pt > strong { + font-size: 4pt; +} +.visual_font_size_6pt, .visual_font_size_6pt > em, .visual_font_size_6pt > strong { + font-size: 6pt; +} .visual_font_size_8pt, .visual_font_size_8pt > em, .visual_font_size_8pt > strong { font-size: 8pt; } @@ -2286,7 +2292,7 @@ span#plugin_description { .menu_sidebar { color:#111; background: #3f3f3f; - + margin-left: 10px; padding-left: 0px; padding-right: 0px; diff --git a/pandora_console/include/styles/pandora_legacy.css b/pandora_console/include/styles/pandora_legacy.css index 644556b0cc..e382a16eed 100644 --- a/pandora_console/include/styles/pandora_legacy.css +++ b/pandora_console/include/styles/pandora_legacy.css @@ -1507,6 +1507,12 @@ div.cellBig { #tinymce { text-align: left; } +.visual_font_size_4pt, .visual_font_size_4pt > em, .visual_font_size_4pt > strong { + font-size: 4pt; +} +.visual_font_size_6pt, .visual_font_size_6pt > em, .visual_font_size_6pt > strong { + font-size: 6pt; +} .visual_font_size_8pt, .visual_font_size_8pt > em, .visual_font_size_8pt > strong { font-size: 8pt; } diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css index c91baaedac..21d2ea5305 100644 --- a/pandora_console/mobile/include/style/main.css +++ b/pandora_console/mobile/include/style/main.css @@ -682,6 +682,12 @@ table.event_details td.cell_event_name { /* For mobiles */ @media screen and (max-width: 750px) { + .resize_visual_font_size_4pt * { + font-size: 2pt !important; + } + .resize_visual_font_size_6pt * { + font-size: 3pt !important; + } .resize_visual_font_size_8pt * { font-size: 4pt !important; } @@ -701,6 +707,12 @@ table.event_details td.cell_event_name { /* For tablets */ @media screen and (min-width: 750px) { + .resize_visual_font_size_4pt * { + font-size: 2pt !important; + } + .resize_visual_font_size_6pt * { + font-size: 3pt !important; + } .resize_visual_font_size_8pt * { font-size: 4pt !important; }