diff --git a/about.html b/about.html index 4bd0c2d..d9e3f7d 100644 --- a/about.html +++ b/about.html @@ -20,11 +20,15 @@ font-family: "Queensides"; src: url("font/Queensides-3z7Ey.ttf") format('truetype'); } + @font-face { + font-family: "Allura"; + src: url("font/Allura-Regular.ttf") format('truetype'); + } body { position: relative; background-color: #f2f1ef; color: #0d1117; - font-family: "Queensides"; + font-family: "Allura"; } @@ -61,7 +65,7 @@

Contact Me

-
+
diff --git a/buy.html b/buy.html index 3f64d85..5fc94d0 100644 --- a/buy.html +++ b/buy.html @@ -18,11 +18,15 @@ font-family: "Queensides"; src: url("font/Queensides-3z7Ey.ttf") format('truetype'); } + @font-face { + font-family: "Allura"; + src: url("font/Allura-Regular.ttf") format('truetype'); + } body { position: relative; background-color: #f2f1ef; color: #0d1117; - font-family: "Queensides"; + font-family: "Allura"; } diff --git a/css/general.css b/css/general.css index f23ffa0..a149eac 100644 --- a/css/general.css +++ b/css/general.css @@ -325,6 +325,7 @@ li .splide__pagination__page.is-active { padding-bottom: 20px; margin: 30px auto; + font-family: "Queensides"; } input:-webkit-autofill, @@ -363,7 +364,6 @@ input:-webkit-autofill:active { height: auto; width: 100%; resize: vertical; - font-family: "Glacial Indifference"; } .input-block label { position: absolute; @@ -399,14 +399,13 @@ option { background-color: #dddddd; color: #2c2c2c; font-size: 26px; - text-transform: uppercase; - font-weight: 500; text-align: center; border-radius: 3px; - transition: all 0.3s ease; - height: 50px; + transition: 0.3s ease; border: none; - width: 30%; + padding: 10px 30px; + font-weight: bold; + font-family: "Queensides"; } .square-button:hover, .square-button:focus { filter: brightness(0.9); diff --git a/font/Allura-Regular.ttf b/font/Allura-Regular.ttf new file mode 100644 index 0000000..cae4c62 Binary files /dev/null and b/font/Allura-Regular.ttf differ diff --git a/img/1.jpg b/img/1.jpg index 2e32dde..ca28428 100644 Binary files a/img/1.jpg and b/img/1.jpg differ diff --git a/img/10.jpg b/img/10.jpg index 2c41888..10a300e 100644 Binary files a/img/10.jpg and b/img/10.jpg differ diff --git a/img/11.jpg b/img/11.jpg index 250f20f..be4a969 100644 Binary files a/img/11.jpg and b/img/11.jpg differ diff --git a/img/12.jpg b/img/12.jpg index 6054854..a213bf5 100644 Binary files a/img/12.jpg and b/img/12.jpg differ diff --git a/img/13.jpg b/img/13.jpg index 8431085..48bade0 100644 Binary files a/img/13.jpg and b/img/13.jpg differ diff --git a/img/14.jpg b/img/14.jpg index acefc96..82e3f7e 100644 Binary files a/img/14.jpg and b/img/14.jpg differ diff --git a/img/15.jpg b/img/15.jpg index 449a360..adda053 100644 Binary files a/img/15.jpg and b/img/15.jpg differ diff --git a/img/16.jpg b/img/16.jpg index fca8be7..31a7002 100644 Binary files a/img/16.jpg and b/img/16.jpg differ diff --git a/img/17.jpg b/img/17.jpg index 13b263a..878a367 100644 Binary files a/img/17.jpg and b/img/17.jpg differ diff --git a/img/18.jpg b/img/18.jpg index 55194e7..950e6ea 100644 Binary files a/img/18.jpg and b/img/18.jpg differ diff --git a/img/19.jpg b/img/19.jpg index 281a4bf..c6e72fb 100644 Binary files a/img/19.jpg and b/img/19.jpg differ diff --git a/img/2.jpg b/img/2.jpg index 29a1c27..6d5a4a4 100644 Binary files a/img/2.jpg and b/img/2.jpg differ diff --git a/img/20.jpg b/img/20.jpg index 8a4f85c..f935008 100644 Binary files a/img/20.jpg and b/img/20.jpg differ diff --git a/img/21.jpg b/img/21.jpg index bed36b0..2a6b65a 100644 Binary files a/img/21.jpg and b/img/21.jpg differ diff --git a/img/22.jpg b/img/22.jpg index e408837..fb3222b 100644 Binary files a/img/22.jpg and b/img/22.jpg differ diff --git a/img/23.jpg b/img/23.jpg index 7c3f56e..e5a299c 100644 Binary files a/img/23.jpg and b/img/23.jpg differ diff --git a/img/24.jpg b/img/24.jpg index c1d46e8..067c2d5 100644 Binary files a/img/24.jpg and b/img/24.jpg differ diff --git a/img/25.jpg b/img/25.jpg index 718ba92..c5d47a5 100644 Binary files a/img/25.jpg and b/img/25.jpg differ diff --git a/img/26.jpg b/img/26.jpg index 66dbb7b..82e6ce3 100644 Binary files a/img/26.jpg and b/img/26.jpg differ diff --git a/img/27.jpg b/img/27.jpg index d0a5a7e..131be07 100644 Binary files a/img/27.jpg and b/img/27.jpg differ diff --git a/img/28.jpg b/img/28.jpg index 89665f5..b82f882 100644 Binary files a/img/28.jpg and b/img/28.jpg differ diff --git a/img/29.jpg b/img/29.jpg index c124ccf..6358670 100644 Binary files a/img/29.jpg and b/img/29.jpg differ diff --git a/img/3.jpg b/img/3.jpg index 241831b..edbb58d 100644 Binary files a/img/3.jpg and b/img/3.jpg differ diff --git a/img/30.jpg b/img/30.jpg index fd6b0c3..3d68f7a 100644 Binary files a/img/30.jpg and b/img/30.jpg differ diff --git a/img/31.jpg b/img/31.jpg index 8b057ee..cd39778 100644 Binary files a/img/31.jpg and b/img/31.jpg differ diff --git a/img/4.jpg b/img/4.jpg index 4f29fdb..5d3269d 100644 Binary files a/img/4.jpg and b/img/4.jpg differ diff --git a/img/5.jpg b/img/5.jpg index ca609d8..7c94efb 100644 Binary files a/img/5.jpg and b/img/5.jpg differ diff --git a/img/6.jpg b/img/6.jpg index c987f74..9480590 100644 Binary files a/img/6.jpg and b/img/6.jpg differ diff --git a/img/7.jpg b/img/7.jpg index c50be7e..19da436 100644 Binary files a/img/7.jpg and b/img/7.jpg differ diff --git a/img/8.jpg b/img/8.jpg index df9112e..2c1af87 100644 Binary files a/img/8.jpg and b/img/8.jpg differ diff --git a/img/9.jpg b/img/9.jpg index 9184997..9c27f34 100644 Binary files a/img/9.jpg and b/img/9.jpg differ diff --git a/img/watermark.png b/img/watermark.png new file mode 100644 index 0000000..9e8d7db Binary files /dev/null and b/img/watermark.png differ diff --git a/index.html b/index.html index a5fe2dc..faf9b17 100644 --- a/index.html +++ b/index.html @@ -21,16 +21,23 @@ + diff --git a/js/applywatermark.js b/js/applywatermark.js new file mode 100644 index 0000000..acbb422 --- /dev/null +++ b/js/applywatermark.js @@ -0,0 +1,7 @@ +$(function() { + $('.slide-img').watermark({ + path: 'img/watermark.png', + margin: 7, + opacity: 0.7, + }); +}); \ No newline at end of file diff --git a/js/jquery.watermark.min.js b/js/jquery.watermark.min.js new file mode 100644 index 0000000..c1d224b --- /dev/null +++ b/js/jquery.watermark.min.js @@ -0,0 +1,8 @@ +/* @preserve + * Project: jQuery plugin Watermark + * Description: Add watermark on images use HTML5 and Javascript. + * Author: Zzbaivong (devs.forumvi.com) + * Version: 1.0.2 + * License: MIT + */ +!function($,window,document,undefined){"use strict";var pluginName="watermark",defaults={path:"watermark.png",dataPath:!1,text:"",textWidth:130,textSize:13,textColor:"white",textBg:"rgba(0, 0, 0, 0.4)",gravity:"se",opacity:.7,margin:0,fullOverlay:!1,outputWidth:"auto",outputHeight:"auto",outputType:"jpeg",done:function(imgURL){this.src=imgURL},fail:function(){},always:function(){}};function Plugin(element,options){this.element=element,this.settings=$.extend({},defaults,options),this._defaults=defaults,this._name=pluginName,this.init()}$.extend(Plugin.prototype,{init:function(){var _this=this,ele=_this.element,set=_this.settings,actualPath=set.dataPath?$(ele).data(set.dataPath):set.path,wmData={imgurl:actualPath,type:"png",cross:!0},imageData={imgurl:ele.src,cross:!0,type:set.outputType,width:set.outputWidth,height:set.outputHeight};0===actualPath.search(/data:image\/(png|jpg|jpeg|gif);base64,/)&&(wmData.cross=!1),0===ele.src.search(/data:image\/(png|jpg|jpeg|gif);base64,/)&&(imageData.cross=!1);var defer=$.Deferred();$.when(defer).done((function(imgObj){imageData.wmObj=imgObj,_this.imgurltodata(imageData,(function(dataURL){set.done.call(ele,dataURL),set.always.call(ele,dataURL)}))})),""!==set.text&&(wmData.imgurl=_this.textwatermark(),wmData.cross=!1),_this.imgurltodata(wmData,(function(imgObj){defer.resolve(imgObj)}))},textwatermark:function(){var _this=this,set=this.settings,canvas=document.createElement("CANVAS"),ctx=canvas.getContext("2d"),w=set.textWidth,h=set.textSize+8;return canvas.width=w,canvas.height=h,ctx.fillStyle=set.textBg,ctx.fillRect(0,0,w,h),ctx.fillStyle=set.textColor,ctx.textAlign="center",ctx.font="500 "+set.textSize+"px Sans-serif",ctx.fillText(set.text,w/2,set.textSize+2),canvas.toDataURL()},imgurltodata:function(data,callback){var _this=this,set=this.settings,ele=this.element,img=new Image;data.cross&&(img.crossOrigin="Anonymous"),img.onload=function(){var canvas=document.createElement("CANVAS"),ctx=canvas.getContext("2d"),w=this.width,h=this.height,ctxH;if(data.wmObj&&("auto"!==data.width&&"auto"===data.height&&data.width0&&op<1&&(ctx.globalAlpha=set.opacity);var wmW=set.fullOverlay?w:data.wmObj.width,wmH=set.fullOverlay?h:data.wmObj.height,pos=set.margin,gLeft,gTop;switch(set.gravity){case"nw":gLeft=pos,gTop=pos;break;case"n":gLeft=w/2-wmW/2,gTop=pos;break;case"ne":gLeft=w-wmW-pos,gTop=pos;break;case"w":gLeft=pos,gTop=h/2-wmH/2;break;case"e":gLeft=w-wmW-pos,gTop=h/2-wmH/2;break;case"sw":gLeft=pos,gTop=h-wmH-pos;break;case"s":gLeft=w/2-wmW/2,gTop=h-wmH-pos;break;case"c":gLeft=w/2-wmW/2,gTop=(h-wmH)/2;break;default:gLeft=w-wmW-pos,gTop=h-wmH-pos}ctx.drawImage(data.wmObj,gLeft,gTop,wmW,wmH)}var dataURL=canvas.toDataURL("image/"+data.type);if("function"==typeof callback)if(data.wmObj)callback(dataURL);else{var wmNew=new Image;wmNew.src=dataURL,callback(wmNew)}canvas=null},img.onerror=function(){return set.fail.call(this,this.src),set.always.call(ele,this.src),!1},img.src=data.imgurl}}),$.fn.watermark=function(options){return this.each((function(){$.data(this,"plugin_watermark")||$.data(this,"plugin_watermark",new Plugin(this,options))}))}}(jQuery,window,document); \ No newline at end of file