artin/miniPaint
1
0
Fork 0
mirror of https://github.com/viliusle/miniPaint.git synced 2026-02-06 13:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

styles update, fixed preview on big canvas overflow

Browse Source
This commit is contained in:
ViliusL 2016-02-11 20:32:19 +02:00
parent c79ef2b0cf
commit a5f5c1aad7
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
index.html
View File

@ -9,12 +9,6 @@
<link rel="shortcut icon" href="img/favicon.png" />
</head>
<body>
<div id="drop_zone">
<div style="margin-top:70px;">
<span style="font-size: 40px;">DROP</span>
or <input type="file" onchange="upload_browse(this.files)" />
</div>
</div>
<div id="canvas_container">
<div id="menu_left">
<div id="menu_left_container">
@ -30,9 +24,9 @@
<input type="color" id="main_colour" value="" onchange="TOOLS.set_color(this);" />
<div style="display:none;" id="main_colour_alt" onclick="TOOLS.toggle_color_select();"></div>
</div>
<div style="margin-top:10px;padding:3px 0px 3px 3px;" class="block" id="all_colors"></div>
<div class="block" id="all_colors"></div>
<div class="block">
<input style="width:98%;border:1px solid #393939;" type="text" id="color_hex" value="#000000" onpaste="TOOLS.set_color_manual(this)" onKeyUp="TOOLS.set_color_manual(this)" /><br />
<input type="text" id="color_hex" value="#000000" onpaste="TOOLS.set_color_manual(this)" onKeyUp="TOOLS.set_color_manual(this)" /><br />
<div id="main_colour_rgb">
Red: <input id="rgb_r" onKeyUp="TOOLS.set_color_rgb(this, 'r')" type="text" value="255" /><br />
Green: <input id="rgb_g" onKeyUp="TOOLS.set_color_rgb(this, 'g')" type="text" value="255" /><br />
@ -67,7 +61,7 @@
<canvas id="Background"></canvas>
<div id="canvas_more"></div>
<canvas id="canvas_front"></canvas>
<canvas style="display:none;pointer-events:none;" id="canvas_grid"></canvas>
<canvas id="canvas_grid"></canvas>
</div>
<div id="resize-w"></div>
<div id="resize-h"></div>

7
js/controlls.js
View File

@ -484,7 +484,6 @@ function CONTROLLS_CLASS(){
}
if(n_valid == 0)
progress.style.display='none';
document.getElementById("drop_zone").style.display='none';
};
this.mouse_wheel_handler = function(e){ //return true;
var step = 100; e.preventDefault();
@ -514,10 +513,11 @@ function CONTROLLS_CLASS(){
this.scroll_window = function(){
var pad_left = 109;
var pad_top = 34;
var pad_right = 170;
var dim = HELPER.get_dimensions();
var page_w = dim[0];
var page_h = dim[1];
var total_w = (WIDTH * ZOOM/100) + pad_left;
var total_w = (WIDTH * ZOOM/100) + pad_left + pad_right;
var total_h = (HEIGHT * ZOOM/100) + pad_top;
var visible_w = page_w - 60;
var visible_h = page_h - 60;
@ -546,10 +546,11 @@ function CONTROLLS_CLASS(){
this.calc_preview_auto = function(){
var pad_left = 109;
var pad_top = 34;
var pad_right = 170;
var dim = HELPER.get_dimensions();
var page_w = dim[0];
var page_h = dim[1];
var total_w = (WIDTH * ZOOM/100) + pad_left;
var total_w = (WIDTH * ZOOM/100) + pad_left + pad_right;
var total_h = (HEIGHT * ZOOM/100) + pad_top;
var visible_w = page_w - 60;
var visible_h = page_h - 60;

29
styles/styles.css
View File

@ -73,17 +73,6 @@ input[type="button"]{
#canvas_back{
background-color:#ffffff;
}
#drop_zone{
border:5px dashed #CCCCCC;
text-align: center;
width:400px;
height:200px;
margin:10px;
margin-left:60px;
display:none;
position:absolute;
background-color:#ffffff;
}
#canvas_container{
margin:10px 5px 5px 5px;
}
@ -230,7 +219,24 @@ input[type="button"]{
height:5px;
margin-left:105px;
position:absolute;
top:35px;
}
#color_hex{
width:98%;
border:1px solid #393939;
}
#canvas_grid{
display:none;
pointer-events:none;
}
#all_colors{
margin-top:10px;
padding:3px 0px 3px 3px;
}
#canvas_front{
position:relative;
margin-right:170px;
}
/* ==== classes ============================================================= */
@ -461,7 +467,6 @@ input[type="button"]{
#menu_left,
#layers_container,
#canvas_back,
#drop_zone,
.ddsmoothmenu{
display: none;
height: 0;