cambio de fuentes css
This commit is contained in:
parent
1650da0f75
commit
9e13604f49
|
@ -180,13 +180,7 @@ $table->colspan['staticgraph_modulegraph'][1] = '3';
|
|||
$table->data['staticgraph_modulegraph'][1] = __('Width').': '.html_print_input_text('width', 0, '', 5, 5, true);
|
||||
$table->data['staticgraph_modulegraph'][1] .= ' '.__('Height').': '.html_print_input_text('height', 0, '', 5, 5, true);
|
||||
|
||||
$fontf = [
|
||||
'Roboto' => 'Roboto',
|
||||
'lato' => 'Lato',
|
||||
'opensans' => 'Open Sans',
|
||||
'nunito' => 'Nunito',
|
||||
'leaguegothic' => 'League Gothic',
|
||||
];
|
||||
$fontf = ['lato' => 'Lato'];
|
||||
|
||||
$fonts = [
|
||||
'4pt' => '4pt',
|
||||
|
|
|
@ -2243,7 +2243,7 @@ function config_process_config()
|
|||
if (!isset($config['fontpath'])) {
|
||||
config_update_value(
|
||||
'fontpath',
|
||||
'opensans.ttf'
|
||||
'lato.ttf'
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -3108,7 +3108,7 @@ function config_process_config()
|
|||
}
|
||||
|
||||
if (!isset($config['custom_report_front_font'])) {
|
||||
config_update_value('custom_report_front_font', 'opensans.ttf');
|
||||
config_update_value('custom_report_front_font', 'lato.ttf');
|
||||
}
|
||||
|
||||
if (!isset($config['custom_report_front_logo'])) {
|
||||
|
|
|
@ -827,7 +827,7 @@ function grafico_modulo_sparse($params)
|
|||
|
||||
$params['grid_color'] = '#C1C1C1';
|
||||
$params['legend_color'] = '#636363';
|
||||
$params['font'] = $config['fontpath'];
|
||||
$params['font'] = 'lato';
|
||||
$params['font_size'] = $config['font_size'];
|
||||
$params['short_data'] = $config['short_module_graph_data'];
|
||||
|
||||
|
@ -1330,7 +1330,7 @@ function graphic_combined_module(
|
|||
$params['grid_color'] = '#C1C1C1';
|
||||
$params['legend_color'] = '#636363';
|
||||
|
||||
$params['font'] = $config['fontpath'];
|
||||
$params['font'] = 'lato';
|
||||
$params['font_size'] = $config['font_size'];
|
||||
|
||||
$params['short_data'] = $config['short_module_graph_data'];
|
||||
|
|
|
@ -18,7 +18,7 @@ every element of the plot to be rendered directly to canvas.
|
|||
The plugin supports these options:
|
||||
|
||||
{
|
||||
canvas: boolean
|
||||
canvas: boolean
|
||||
}
|
||||
|
||||
The "canvas" option controls whether full canvas drawing is enabled, making it
|
||||
|
@ -27,7 +27,7 @@ browser, but needs to redraw with canvas text when exporting as an image.
|
|||
|
||||
*/
|
||||
|
||||
(function($) {
|
||||
(function ($) {
|
||||
|
||||
var options = {
|
||||
canvas: true
|
||||
|
@ -49,13 +49,13 @@ browser, but needs to redraw with canvas text when exporting as an image.
|
|||
|
||||
if (render == null) {
|
||||
getTextInfo = Canvas.prototype.getTextInfo,
|
||||
addText = Canvas.prototype.addText,
|
||||
render = Canvas.prototype.render;
|
||||
addText = Canvas.prototype.addText,
|
||||
render = Canvas.prototype.render;
|
||||
}
|
||||
|
||||
// Finishes rendering the canvas, including overlaid text
|
||||
|
||||
Canvas.prototype.render = function() {
|
||||
Canvas.prototype.render = function () {
|
||||
|
||||
if (!plot.getOptions().canvas) {
|
||||
return render.call(this);
|
||||
|
@ -144,7 +144,7 @@ browser, but needs to redraw with canvas text when exporting as an image.
|
|||
// y: Y coordinate at which to draw the text.
|
||||
// }
|
||||
|
||||
Canvas.prototype.getTextInfo = function(layer, text, font, angle, width) {
|
||||
Canvas.prototype.getTextInfo = function (layer, text, font, angle, width) {
|
||||
|
||||
if (!plot.getOptions().canvas) {
|
||||
return getTextInfo.call(this, layer, text, font, angle, width);
|
||||
|
@ -263,7 +263,7 @@ browser, but needs to redraw with canvas text when exporting as an image.
|
|||
|
||||
// Adds a text string to the canvas text overlay.
|
||||
|
||||
Canvas.prototype.addText = function(layer, x, y, text, font, angle, width, halign, valign) {
|
||||
Canvas.prototype.addText = function (layer, x, y, text, font, angle, width, halign, valign) {
|
||||
|
||||
if (!plot.getOptions().canvas) {
|
||||
return addText.call(this, layer, x, y, text, font, angle, width, halign, valign);
|
||||
|
|
|
@ -4,4 +4,4 @@ Copyright (c) 2007-2014 IOLA and Ole Laursen.
|
|||
Licensed under the MIT license.
|
||||
|
||||
*/
|
||||
(function($){var options={canvas:true};var render,getTextInfo,addText;var hasOwnProperty=Object.prototype.hasOwnProperty;function init(plot,classes){var Canvas=classes.Canvas;if(render==null){getTextInfo=Canvas.prototype.getTextInfo,addText=Canvas.prototype.addText,render=Canvas.prototype.render}Canvas.prototype.render=function(){if(!plot.getOptions().canvas){return render.call(this)}var context=this.context,cache=this._textCache;context.save();context.textBaseline="middle";for(var layerKey in cache){if(hasOwnProperty.call(cache,layerKey)){var layerCache=cache[layerKey];for(var styleKey in layerCache){if(hasOwnProperty.call(layerCache,styleKey)){var styleCache=layerCache[styleKey],updateStyles=true;for(var key in styleCache){if(hasOwnProperty.call(styleCache,key)){var info=styleCache[key],positions=info.positions,lines=info.lines;if(updateStyles){context.fillStyle=info.font.color;context.font=info.font.definition;updateStyles=false}for(var i=0,position;position=positions[i];i++){if(position.active){for(var j=0,line;line=position.lines[j];j++){context.fillText(lines[j].text,line[0],line[1])}}else{positions.splice(i--,1)}}if(positions.length==0){delete styleCache[key]}}}}}}}context.restore()};Canvas.prototype.getTextInfo=function(layer,text,font,angle,width){if(!plot.getOptions().canvas){return getTextInfo.call(this,layer,text,font,angle,width)}var textStyle,layerCache,styleCache,info;text=""+text;if(typeof font==="object"){textStyle=font.style+" "+font.variant+" "+font.weight+" "+font.size+"px "+font.family}else{textStyle=font}layerCache=this._textCache[layer];if(layerCache==null){layerCache=this._textCache[layer]={}}styleCache=layerCache[textStyle];if(styleCache==null){styleCache=layerCache[textStyle]={}}info=styleCache[text];if(info==null){var context=this.context;if(typeof font!=="object"){var element=$("<div> </div>").css("position","absolute").addClass(typeof font==="string"?font:null).appendTo(this.getTextLayer(layer));font={lineHeight:element.height(),style:element.css("font-style"),variant:element.css("font-variant"),weight:element.css("font-weight"),family:element.css("font-family"),color:element.css("color")};font.size=element.css("line-height",1).height();element.remove()}textStyle=font.style+" "+font.variant+" "+font.weight+" "+font.size+"px "+font.family;info=styleCache[text]={width:0,height:0,positions:[],lines:[],font:{definition:textStyle,color:font.color}};context.save();context.font=textStyle;var lines=(text+"").replace(/<br ?\/?>|\r\n|\r/g,"\n").split("\n");for(var i=0;i<lines.length;++i){var lineText=lines[i],measured=context.measureText(lineText);info.width=Math.max(measured.width,info.width);info.height+=font.lineHeight;info.lines.push({text:lineText,width:measured.width,height:font.lineHeight})}context.restore()}return info};Canvas.prototype.addText=function(layer,x,y,text,font,angle,width,halign,valign){if(!plot.getOptions().canvas){return addText.call(this,layer,x,y,text,font,angle,width,halign,valign)}var info=this.getTextInfo(layer,text,font,angle,width),positions=info.positions,lines=info.lines;y+=info.height/lines.length/2;if(valign=="middle"){y=Math.round(y-info.height/2)}else if(valign=="bottom"){y=Math.round(y-info.height)}else{y=Math.round(y)}if(!!(window.opera&&window.opera.version().split(".")[0]<12)){y-=2}for(var i=0,position;position=positions[i];i++){if(position.x==x&&position.y==y){position.active=true;return}}position={active:true,lines:[],x:x,y:y};positions.push(position);for(var i=0,line;line=lines[i];i++){if(halign=="center"){position.lines.push([Math.round(x-line.width/2),y])}else if(halign=="right"){position.lines.push([Math.round(x-line.width),y])}else{position.lines.push([Math.round(x),y])}y+=line.height}}}$.plot.plugins.push({init:init,options:options,name:"canvas",version:"1.0"})})(jQuery);
|
||||
(function ($) { var options = { canvas: true }; var render, getTextInfo, addText; var hasOwnProperty = Object.prototype.hasOwnProperty; function init(plot, classes) { var Canvas = classes.Canvas; if (render == null) { getTextInfo = Canvas.prototype.getTextInfo, addText = Canvas.prototype.addText, render = Canvas.prototype.render } Canvas.prototype.render = function () { if (!plot.getOptions().canvas) { return render.call(this) } var context = this.context, cache = this._textCache; context.save(); context.textBaseline = "middle"; for (var layerKey in cache) { if (hasOwnProperty.call(cache, layerKey)) { var layerCache = cache[layerKey]; for (var styleKey in layerCache) { if (hasOwnProperty.call(layerCache, styleKey)) { var styleCache = layerCache[styleKey], updateStyles = true; for (var key in styleCache) { if (hasOwnProperty.call(styleCache, key)) { var info = styleCache[key], positions = info.positions, lines = info.lines; if (updateStyles) { context.fillStyle = info.font.color; context.font = info.font.definition; updateStyles = false } for (var i = 0, position; position = positions[i]; i++) { if (position.active) { for (var j = 0, line; line = position.lines[j]; j++) { context.fillText(lines[j].text, line[0], line[1]) } } else { positions.splice(i--, 1) } } if (positions.length == 0) { delete styleCache[key] } } } } } } } context.restore() }; Canvas.prototype.getTextInfo = function (layer, text, font, angle, width) { if (!plot.getOptions().canvas) { return getTextInfo.call(this, layer, text, font, angle, width) } var textStyle, layerCache, styleCache, info; text = "" + text; if (typeof font === "object") { textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px " + font.family } else { textStyle = font } layerCache = this._textCache[layer]; if (layerCache == null) { layerCache = this._textCache[layer] = {} } styleCache = layerCache[textStyle]; if (styleCache == null) { styleCache = layerCache[textStyle] = {} } info = styleCache[text]; if (info == null) { var context = this.context; if (typeof font !== "object") { var element = $("<div> </div>").css("position", "absolute").addClass(typeof font === "string" ? font : null).appendTo(this.getTextLayer(layer)); font = { lineHeight: element.height(), style: element.css("font-style"), variant: element.css("font-variant"), weight: element.css("font-weight"), family: element.css("font-family"), color: element.css("color") }; font.size = element.css("line-height", 1).height(); element.remove() } textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px " + font.family; info = styleCache[text] = { width: 0, height: 0, positions: [], lines: [], font: { definition: textStyle, color: font.color } }; context.save(); context.font = textStyle; var lines = (text + "").replace(/<br ?\/?>|\r\n|\r/g, "\n").split("\n"); for (var i = 0; i < lines.length; ++i) { var lineText = lines[i], measured = context.measureText(lineText); info.width = Math.max(measured.width, info.width); info.height += font.lineHeight; info.lines.push({ text: lineText, width: measured.width, height: font.lineHeight }) } context.restore() } return info }; Canvas.prototype.addText = function (layer, x, y, text, font, angle, width, halign, valign) { if (!plot.getOptions().canvas) { return addText.call(this, layer, x, y, text, font, angle, width, halign, valign) } var info = this.getTextInfo(layer, text, font, angle, width), positions = info.positions, lines = info.lines; y += info.height / lines.length / 2; if (valign == "middle") { y = Math.round(y - info.height / 2) } else if (valign == "bottom") { y = Math.round(y - info.height) } else { y = Math.round(y) } if (!!(window.opera && window.opera.version().split(".")[0] < 12)) { y -= 2 } for (var i = 0, position; position = positions[i]; i++) { if (position.x == x && position.y == y) { position.active = true; return } } position = { active: true, lines: [], x: x, y: y }; positions.push(position); for (var i = 0, line; line = lines[i]; i++) { if (halign == "center") { position.lines.push([Math.round(x - line.width / 2), y]) } else if (halign == "right") { position.lines.push([Math.round(x - line.width), y]) } else { position.lines.push([Math.round(x), y]) } y += line.height } } } $.plot.plugins.push({ init: init, options: options, name: "canvas", version: "1.0" }) })(jQuery);
|
|
@ -531,7 +531,7 @@ Licensed under the MIT license.
|
|||
show: null, // null = auto-detect, true = always, false = never
|
||||
position: "bottom", // or "top"
|
||||
mode: null, // null or "time"
|
||||
font: null, // null (derived from CSS in placeholder) or object like { size: 11, lineHeight: 13, style: "italic", weight: "bold", family: "sans-serif", variant: "small-caps" }
|
||||
font: null, // null (derived from CSS in placeholder) or object like { size: 11, lineHeight: 13, style: "italic", weight: "bold", family: "lato", variant: "small-caps" }
|
||||
color: null, // base color, labels, ticks
|
||||
tickColor: null, // possibly different color of ticks, e.g. "rgba(0,0,0,0.15)"
|
||||
transform: null, // null or f: number -> number to transform axis
|
||||
|
|
|
@ -385,14 +385,14 @@ function pandoraFlotHBars(
|
|||
color: tick_color,
|
||||
axisLabelUseCanvas: true,
|
||||
axisLabelFontSizePixels: font_size,
|
||||
axisLabelFontFamily: font + "Font",
|
||||
axisLabelFontFamily: "lato",
|
||||
tickFormatter: xFormatter
|
||||
},
|
||||
yaxis: {
|
||||
font: {
|
||||
size: font_size + 2,
|
||||
color: ycolor,
|
||||
family: font + "Font"
|
||||
family: "lato"
|
||||
},
|
||||
ticks: yFormatter
|
||||
},
|
||||
|
@ -627,7 +627,7 @@ function pandoraFlotVBars(settings) {
|
|||
return ticksformatter[Math.round(v)];
|
||||
};
|
||||
}
|
||||
|
||||
font.family = "lato";
|
||||
var options = {
|
||||
series: {
|
||||
bars: {
|
||||
|
@ -807,7 +807,7 @@ function pandoraFlotSlicebar(
|
|||
tickLength: 0,
|
||||
font: {
|
||||
size: font_size + 2,
|
||||
family: font + "Font"
|
||||
family: font
|
||||
}
|
||||
}
|
||||
],
|
||||
|
@ -2020,7 +2020,7 @@ function pandoraFlotArea(
|
|||
font: {
|
||||
size: font_size + 2,
|
||||
color: legend_color,
|
||||
family: font + "Font"
|
||||
family: "lato"
|
||||
}
|
||||
},
|
||||
xaxes: [
|
||||
|
@ -2035,7 +2035,7 @@ function pandoraFlotArea(
|
|||
font: {
|
||||
size: font_size + 2,
|
||||
color: legend_color,
|
||||
family: font + "Font",
|
||||
family: "lato",
|
||||
variant: "small-caps"
|
||||
}
|
||||
},
|
||||
|
@ -2109,7 +2109,7 @@ function pandoraFlotArea(
|
|||
font: {
|
||||
size: font_size + 2,
|
||||
color: legend_color,
|
||||
family: font + "Font"
|
||||
family: "lato"
|
||||
}
|
||||
},
|
||||
xaxes: [
|
||||
|
@ -2124,7 +2124,7 @@ function pandoraFlotArea(
|
|||
font: {
|
||||
size: font_size + 2,
|
||||
color: legend_color,
|
||||
family: font + "Font"
|
||||
family: "lato"
|
||||
}
|
||||
},
|
||||
yaxes: [
|
||||
|
@ -2208,7 +2208,7 @@ function pandoraFlotArea(
|
|||
font: {
|
||||
size: font_size + 2,
|
||||
color: legend_color,
|
||||
family: font + "Font"
|
||||
family: "lato"
|
||||
}
|
||||
},
|
||||
xaxes: [
|
||||
|
@ -2225,7 +2225,7 @@ function pandoraFlotArea(
|
|||
font: {
|
||||
size: font_size + 2,
|
||||
color: legend_color,
|
||||
family: font + "Font"
|
||||
family: "lato"
|
||||
}
|
||||
},
|
||||
yaxes: [
|
||||
|
@ -2255,7 +2255,7 @@ function pandoraFlotArea(
|
|||
font: {
|
||||
size: font_size + 2,
|
||||
color: legend_color,
|
||||
family: font + "Font"
|
||||
family: "lato"
|
||||
}
|
||||
},
|
||||
xaxes: [
|
||||
|
@ -2272,7 +2272,7 @@ function pandoraFlotArea(
|
|||
font: {
|
||||
size: font_size + 2,
|
||||
color: legend_color,
|
||||
family: font + "Font"
|
||||
family: "lato"
|
||||
}
|
||||
},
|
||||
yaxes: [
|
||||
|
@ -2379,7 +2379,7 @@ function pandoraFlotArea(
|
|||
|
||||
$("#timestamp_" + graph_id).css("color", "#000");
|
||||
$("#timestamp_" + graph_id).css("font-size", font_size + 2 + "px");
|
||||
$("#timestamp_" + graph_id).css("font-family", font + "Font");
|
||||
$("#timestamp_" + graph_id).css("font-family", font);
|
||||
|
||||
if (timesize + timenewpos > canvaslimit) {
|
||||
$("#timestamp_" + graph_id).css("left", timenewpos - timesize);
|
||||
|
@ -2462,7 +2462,7 @@ function pandoraFlotArea(
|
|||
.css("font-size", font_size + 2 + "px");
|
||||
$("#legend_" + graph_id + " .legendLabel")
|
||||
.eq(i)
|
||||
.css("font-family", font + "Font");
|
||||
.css("font-family", font);
|
||||
|
||||
i++;
|
||||
}
|
||||
|
@ -2637,10 +2637,7 @@ function pandoraFlotArea(
|
|||
"font-size",
|
||||
font_size + 2 + "px"
|
||||
);
|
||||
$("#legend_" + graph_id + " .legendLabel").css(
|
||||
"font-family",
|
||||
font + "Font"
|
||||
);
|
||||
$("#legend_" + graph_id + " .legendLabel").css("font-family", font);
|
||||
|
||||
plot.clearCrosshair();
|
||||
overview.clearCrosshair();
|
||||
|
@ -2669,12 +2666,12 @@ function pandoraFlotArea(
|
|||
var style =
|
||||
"color:" +
|
||||
legend_color +
|
||||
"; font-family:" +
|
||||
font +
|
||||
"; font-family: " +
|
||||
"lato" +
|
||||
"Font; font-size:" +
|
||||
(parseInt(font_size) + 2) +
|
||||
"px;";
|
||||
return '<span style="' + style + '">' + legend[v] + "</span>";
|
||||
return '<span style="' + style + '" class="lato">' + legend[v] + "</span>";
|
||||
}
|
||||
|
||||
$("#overview_" + graph_id).css("display", "none");
|
||||
|
|
|
@ -215,7 +215,7 @@ function d3_bullet_chart(
|
|||
width: 100%;
|
||||
}
|
||||
|
||||
.bullet { font: 7px sans-serif; }
|
||||
.bullet { font: 7px lato; }
|
||||
.bullet .marker.s0 { stroke: #e63c52; stroke-width: 2px; }
|
||||
.bullet .marker.s1 { stroke: #f3b200; stroke-width: 2px; }
|
||||
.bullet .marker.s2 { stroke: steelblue; stroke-width: 2px; }
|
||||
|
|
|
@ -1,13 +1,7 @@
|
|||
tinyMCEPopup.requireLangPack();
|
||||
|
||||
var defaultFonts = "" +
|
||||
"Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" +
|
||||
"Times New Roman, Times, serif=Times New Roman, Times, serif;" +
|
||||
"Courier New, Courier, mono=Courier New, Courier, mono;" +
|
||||
"Times New Roman, Times, serif=Times New Roman, Times, serif;" +
|
||||
"Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" +
|
||||
"Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" +
|
||||
"Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";
|
||||
var defaultFonts = "" +
|
||||
"lato";
|
||||
|
||||
var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";
|
||||
var defaultMeasurement = "+pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";
|
||||
|
@ -30,7 +24,7 @@ var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-
|
|||
function aggregateStyles(allStyles) {
|
||||
var mergedStyles = {};
|
||||
|
||||
tinymce.each(allStyles, function(style) {
|
||||
tinymce.each(allStyles, function (style) {
|
||||
if (style !== '') {
|
||||
var parsedStyles = tinyMCEPopup.editor.dom.parseStyle(style);
|
||||
for (var name in parsedStyles) {
|
||||
|
@ -40,7 +34,7 @@ function aggregateStyles(allStyles) {
|
|||
}
|
||||
else if (name === 'text-decoration') {
|
||||
if (mergedStyles[name].indexOf(parsedStyles[name]) === -1) {
|
||||
mergedStyles[name] = mergedStyles[name] +' '+ parsedStyles[name];
|
||||
mergedStyles[name] = mergedStyles[name] + ' ' + parsedStyles[name];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -48,7 +42,7 @@ function aggregateStyles(allStyles) {
|
|||
}
|
||||
});
|
||||
|
||||
return mergedStyles;
|
||||
return mergedStyles;
|
||||
}
|
||||
|
||||
var applyActionIsInsert;
|
||||
|
@ -63,15 +57,15 @@ function init(ed) {
|
|||
applyActionIsInsert = ed.getParam("edit_css_style_insert_span", false);
|
||||
document.getElementById('toggle_insert_span').checked = applyActionIsInsert;
|
||||
|
||||
h = getBrowserHTML('background_image_browser','background_image','image','advimage');
|
||||
h = getBrowserHTML('background_image_browser', 'background_image', 'image', 'advimage');
|
||||
document.getElementById("background_image_browser").innerHTML = h;
|
||||
|
||||
document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color');
|
||||
document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color');
|
||||
document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top');
|
||||
document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right');
|
||||
document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom');
|
||||
document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left');
|
||||
document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick', 'text_color');
|
||||
document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick', 'background_color');
|
||||
document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick', 'border_color_top');
|
||||
document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick', 'border_color_right');
|
||||
document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick', 'border_color_bottom');
|
||||
document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick', 'border_color_left');
|
||||
|
||||
fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true);
|
||||
fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true);
|
||||
|
@ -272,7 +266,7 @@ function setupFormData() {
|
|||
f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value;
|
||||
}
|
||||
|
||||
// setupBox(f, ce, '', 'border', 'Color');
|
||||
// setupBox(f, ce, '', 'border', 'Color');
|
||||
}
|
||||
|
||||
function getMeasurement(s) {
|
||||
|
@ -307,7 +301,7 @@ function setValue(f, n, v) {
|
|||
}
|
||||
|
||||
function setupBox(f, ce, fp, pr, sf, b) {
|
||||
if (typeof(b) == "undefined")
|
||||
if (typeof (b) == "undefined")
|
||||
b = ['Top', 'Right', 'Bottom', 'Left'];
|
||||
|
||||
if (isSame(ce, pr, sf, b)) {
|
||||
|
@ -359,10 +353,10 @@ function setupBox(f, ce, fp, pr, sf, b) {
|
|||
function isSame(e, pr, sf, b) {
|
||||
var a = [], i, x;
|
||||
|
||||
if (typeof(b) == "undefined")
|
||||
if (typeof (b) == "undefined")
|
||||
b = ['Top', 'Right', 'Bottom', 'Left'];
|
||||
|
||||
if (typeof(sf) == "undefined" || sf == null)
|
||||
if (typeof (sf) == "undefined" || sf == null)
|
||||
sf = "";
|
||||
|
||||
a[0] = e.style[pr + b[0] + sf];
|
||||
|
@ -370,11 +364,11 @@ function isSame(e, pr, sf, b) {
|
|||
a[2] = e.style[pr + b[2] + sf];
|
||||
a[3] = e.style[pr + b[3] + sf];
|
||||
|
||||
for (i=0; i<a.length; i++) {
|
||||
for (i = 0; i < a.length; i++) {
|
||||
if (a[i] == null)
|
||||
return false;
|
||||
|
||||
for (x=0; x<a.length; x++) {
|
||||
for (x = 0; x < a.length; x++) {
|
||||
if (a[x] != a[i])
|
||||
return false;
|
||||
}
|
||||
|
@ -386,11 +380,11 @@ function isSame(e, pr, sf, b) {
|
|||
function hasEqualValues(a) {
|
||||
var i, x;
|
||||
|
||||
for (i=0; i<a.length; i++) {
|
||||
for (i = 0; i < a.length; i++) {
|
||||
if (a[i] == null)
|
||||
return false;
|
||||
|
||||
for (x=0; x<a.length; x++) {
|
||||
for (x = 0; x < a.length; x++) {
|
||||
if (a[x] != a[i])
|
||||
return false;
|
||||
}
|
||||
|
@ -400,7 +394,7 @@ function hasEqualValues(a) {
|
|||
}
|
||||
|
||||
function toggleApplyAction() {
|
||||
applyActionIsInsert = ! applyActionIsInsert;
|
||||
applyActionIsInsert = !applyActionIsInsert;
|
||||
}
|
||||
|
||||
function applyAction() {
|
||||
|
@ -507,7 +501,7 @@ function generateCSS() {
|
|||
ce.style.paddingBottom = f.box_padding_bottom.value + (isNum(f.box_padding_bottom.value) ? f.box_padding_bottom_measurement.value : "");
|
||||
ce.style.paddingLeft = f.box_padding_left.value + (isNum(f.box_padding_left.value) ? f.box_padding_left_measurement.value : "");
|
||||
} else
|
||||
ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");
|
||||
ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");
|
||||
|
||||
if (!f.box_margin_same.checked) {
|
||||
ce.style.marginTop = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");
|
||||
|
@ -515,7 +509,7 @@ function generateCSS() {
|
|||
ce.style.marginBottom = f.box_margin_bottom.value + (isNum(f.box_margin_bottom.value) ? f.box_margin_bottom_measurement.value : "");
|
||||
ce.style.marginLeft = f.box_margin_left.value + (isNum(f.box_margin_left.value) ? f.box_margin_left_measurement.value : "");
|
||||
} else
|
||||
ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");
|
||||
ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");
|
||||
|
||||
// Build border styles
|
||||
|
||||
|
@ -608,8 +602,8 @@ function isNum(s) {
|
|||
function showDisabledControls() {
|
||||
var f = document.forms, i, a;
|
||||
|
||||
for (i=0; i<f.length; i++) {
|
||||
for (a=0; a<f[i].elements.length; a++) {
|
||||
for (i = 0; i < f.length; i++) {
|
||||
for (a = 0; a < f[i].elements.length; a++) {
|
||||
if (f[i].elements[a].disabled)
|
||||
tinyMCEPopup.editor.dom.addClass(f[i].elements[a], "disabled");
|
||||
else
|
||||
|
@ -622,13 +616,13 @@ function fillSelect(f, s, param, dval, sep, em) {
|
|||
var i, ar, p, se;
|
||||
|
||||
f = document.forms[f];
|
||||
sep = typeof(sep) == "undefined" ? ";" : sep;
|
||||
sep = typeof (sep) == "undefined" ? ";" : sep;
|
||||
|
||||
if (em)
|
||||
addSelectValue(f, s, "", "");
|
||||
|
||||
ar = tinyMCEPopup.getParam(param, dval).split(sep);
|
||||
for (i=0; i<ar.length; i++) {
|
||||
for (i = 0; i < ar.length; i++) {
|
||||
se = false;
|
||||
|
||||
if (ar[i].charAt(0) == '+') {
|
||||
|
@ -693,12 +687,12 @@ function synch(fr, to) {
|
|||
selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
|
||||
}
|
||||
|
||||
function updateTextDecorations(){
|
||||
function updateTextDecorations() {
|
||||
var el = document.forms[0].elements;
|
||||
|
||||
var textDecorations = ["text_underline", "text_overline", "text_linethrough", "text_blink"];
|
||||
var noneChecked = el["text_none"].checked;
|
||||
tinymce.each(textDecorations, function(id) {
|
||||
tinymce.each(textDecorations, function (id) {
|
||||
el[id].disabled = noneChecked;
|
||||
if (noneChecked) {
|
||||
el[id].checked = false;
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
|
@ -407,6 +407,7 @@ table.widget_agent_module tbody tr td {
|
|||
|
||||
.container-center .widget-histogram-chart .flot-text .flot-x-axis div {
|
||||
white-space: nowrap;
|
||||
font-family: inherit !important;
|
||||
}
|
||||
|
||||
li#search_input_widget {
|
||||
|
|
|
@ -41,7 +41,8 @@
|
|||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
position: relative;
|
||||
font-size: 10pt;
|
||||
font-size: 11pt;
|
||||
top: 5px;
|
||||
}
|
||||
.ui-dialog .ui-dialog-titlebar-close {
|
||||
position: absolute;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
.green_title {
|
||||
background-color: #82b92e;
|
||||
font-weight: 600;
|
||||
width: 100%;
|
||||
width: auto;
|
||||
text-align: center;
|
||||
display: block;
|
||||
padding: 1em;
|
||||
|
|
|
@ -4460,6 +4460,7 @@ div#dialog_messages table th:last-child {
|
|||
/* jQuery dialog */
|
||||
.no-close .ui-dialog-titlebar-close {
|
||||
display: none;
|
||||
font-size: 9pt;
|
||||
}
|
||||
/* jQuery dialog */
|
||||
|
||||
|
@ -5913,6 +5914,7 @@ table.table_modal_alternate tr td:first-child {
|
|||
|
||||
.flot-text {
|
||||
width: 100%;
|
||||
font-family: inherit !important;
|
||||
}
|
||||
|
||||
/*Font header feedback*/
|
||||
|
@ -8285,3 +8287,9 @@ div.stat-win-spinner img {
|
|||
width: 100px !important;
|
||||
margin-left: 20px;
|
||||
}
|
||||
.legendLabel {
|
||||
font-family: inherit !important;
|
||||
}
|
||||
.lato {
|
||||
font-family: "lato" !important;
|
||||
}
|
||||
|
|
|
@ -57,7 +57,7 @@ input.sub,
|
|||
button.sub,
|
||||
.bg_general {
|
||||
background-color: #222 !important;
|
||||
color: #fff;
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
input[readonly] {
|
||||
|
@ -244,10 +244,12 @@ div#foot {
|
|||
/* events.css */
|
||||
table.table_modal_alternate tr:nth-child(odd) td {
|
||||
background-color: #222 !important;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
table.table_modal_alternate tr:nth-child(even) td {
|
||||
background-color: #111 !important;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
/* events.css */
|
||||
|
@ -1025,3 +1027,7 @@ li.ui-tabs-tab.ui-corner-top.ui-state-default.ui-tab {
|
|||
color: #a0a0a0;
|
||||
font-weight: 300;
|
||||
}
|
||||
.new_task p,
|
||||
.new_task div {
|
||||
font-weight: initial;
|
||||
}
|
||||
|
|
|
@ -93,13 +93,13 @@ Exclude css from visual styles
|
|||
|
||||
* {
|
||||
font-size: 8.5pt;
|
||||
color: #303030;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
line-height: 16pt;
|
||||
}
|
||||
|
||||
body {
|
||||
text-align: center;
|
||||
color: #303030;
|
||||
}
|
||||
|
||||
h1 {
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
.visual-console-item * {
|
||||
overflow: visible;
|
||||
font-family: inherit !important;
|
||||
}
|
||||
|
||||
.visual-console-item.is-editing {
|
||||
|
|
Loading…
Reference in New Issue