diff --git a/assets/Industry-Medium.woff b/assets/Industry-Medium.woff deleted file mode 100644 index 7ab5e87..0000000 Binary files a/assets/Industry-Medium.woff and /dev/null differ diff --git a/assets/fonts/Industry W00 Medium.ttf b/assets/fonts/Industry W00 Medium.ttf deleted file mode 100644 index c68220a..0000000 Binary files a/assets/fonts/Industry W00 Medium.ttf and /dev/null differ diff --git a/assets/fonts/Industry W00 Medium.woff b/assets/fonts/Industry W00 Medium.woff deleted file mode 100644 index b66f59f..0000000 Binary files a/assets/fonts/Industry W00 Medium.woff and /dev/null differ diff --git a/assets/fonts/Industry-Medium.woff b/assets/fonts/Industry-Medium.woff deleted file mode 100644 index 7ab5e87..0000000 Binary files a/assets/fonts/Industry-Medium.woff and /dev/null differ diff --git a/assets/images/titlecap.png b/assets/images/titlecap.png deleted file mode 100644 index c100414..0000000 Binary files a/assets/images/titlecap.png and /dev/null differ diff --git a/assets/images/titlecap.svg b/assets/images/titlecap.svg deleted file mode 100644 index d4d8e47..0000000 --- a/assets/images/titlecap.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - diff --git a/assets/images/故宮剪影-01.svg b/assets/images/故宮剪影-01.svg deleted file mode 100644 index 75989b5..0000000 --- a/assets/images/故宮剪影-01.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - diff --git a/assets/images/故宮剪影.svg b/assets/images/故宮剪影.svg deleted file mode 100644 index 84f6f0e..0000000 --- a/assets/images/故宮剪影.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - diff --git a/assets/images/花紋1.svg b/assets/images/花紋1.svg deleted file mode 100644 index e991586..0000000 --- a/assets/images/花紋1.svg +++ /dev/null @@ -1,2686 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/images/花紋2.svg b/assets/images/花紋2.svg deleted file mode 100644 index f6fcbac..0000000 --- a/assets/images/花紋2.svg +++ /dev/null @@ -1,2665 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 5981c40..60d5656 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -438,7 +438,7 @@ },500 )} else { resizeTimer = setTimeout(function(){ if( $('.mobile-menu .modules-menu').length > 0 ) { - $('.layout-header .outdropdowns .dropdowns').append($('.modules-menu')); + $('.layout-header .outdropdowns .container').append($('.modules-menu')); $('.dropdowns').append($('.header-buttom')); } orbit.removeDropdown(); diff --git a/assets/javascripts/plugin/picturefill.min.js b/assets/javascripts/plugin/picturefill.min.js index 6a1993e..9df7198 100644 --- a/assets/javascripts/plugin/picturefill.min.js +++ b/assets/javascripts/plugin/picturefill.min.js @@ -1,5 +1,5 @@ -/*! Picturefill - v3.0.1 - 2015-09-30 - * http://scottjehl.github.io/picturefill - * Copyright (c) 2015 https://github.com/scottjehl/picturefill/blob/master/Authors.txt; Licensed MIT +/*! picturefill - v3.0.2 - 2016-02-12 + * https://scottjehl.github.io/picturefill/ + * Copyright (c) 2016 https://github.com/scottjehl/picturefill/blob/master/Authors.txt; Licensed MIT */ -!function(a){var b=navigator.userAgent;a.HTMLPictureElement&&/ecko/.test(b)&&b.match(/rv\:(\d+)/)&&RegExp.$1<41&&addEventListener("resize",function(){var b,c=document.createElement("source"),d=function(a){var b,d,e=a.parentNode;"PICTURE"===e.nodeName.toUpperCase()?(b=c.cloneNode(),e.insertBefore(b,e.firstElementChild),setTimeout(function(){e.removeChild(b)})):(!a._pfLastSize||a.offsetWidth>a._pfLastSize)&&(a._pfLastSize=a.offsetWidth,d=a.sizes,a.sizes+=",100vw",setTimeout(function(){a.sizes=d}))},e=function(){var a,b=document.querySelectorAll("picture > img, img[srcset][sizes]");for(a=0;a2.7?h=c+1:(f=b-c,e=Math.pow(a-.6,1.5),g=f*e,d&&(g+=.1*e),h=a+g):h=c>1?Math.sqrt(a*b):a,h>c}function h(a){var b,c=s.getSet(a),d=!1;"pending"!==c&&(d=r,c&&(b=s.setRes(c),s.applySetCandidate(b,a))),a[s.ns].evaled=d}function i(a,b){return a.res-b.res}function j(a,b,c){var d;return!c&&b&&(c=a[s.ns].sets,c=c&&c[c.length-1]),d=k(b,c),d&&(b=s.makeUrl(b),a[s.ns].curSrc=b,a[s.ns].curCan=d,d.res||_(d,d.set.sizes)),d}function k(a,b){var c,d,e;if(a&&b)for(e=s.parseSet(b),a=s.makeUrl(a),c=0;cc;c++)e=g[c],e[s.ns]=!0,f=e.getAttribute("srcset"),f&&b.push({srcset:f,media:e.getAttribute("media"),type:e.getAttribute("type"),sizes:e.getAttribute("sizes")})}function m(a,b){function c(b){var c,d=b.exec(a.substring(m));return d?(c=d[0],m+=c.length,c):void 0}function e(){var a,c,d,e,f,i,j,k,l,m=!1,o={};for(e=0;el?m=!0:c=l):W.test(j)&&"h"===i?((d||c)&&(m=!0),0===k?m=!0:d=k):m=!0;m||(o.url=g,a&&(o.w=a),c&&(o.d=c),d&&(o.h=d),d||c||a||(o.d=1),1===o.d&&(b.has1x=!0),o.set=b,n.push(o))}function f(){for(c(S),i="",j="in descriptor";;){if(k=a.charAt(m),"in descriptor"===j)if(d(k))i&&(h.push(i),i="",j="after descriptor");else{if(","===k)return m+=1,i&&h.push(i),void e();if("("===k)i+=k,j="in parens";else{if(""===k)return i&&h.push(i),void e();i+=k}}else if("in parens"===j)if(")"===k)i+=k,j="in descriptor";else{if(""===k)return h.push(i),void e();i+=k}else if("after descriptor"===j)if(d(k));else{if(""===k)return void e();j="in descriptor",m-=1}m+=1}}for(var g,h,i,j,k,l=a.length,m=0,n=[];;){if(c(T),m>=l)return n;g=c(U),h=[],","===g.slice(-1)?(g=g.replace(V,""),e()):f()}}function n(a){function b(a){function b(){f&&(g.push(f),f="")}function c(){g[0]&&(h.push(g),g=[])}for(var e,f="",g=[],h=[],i=0,j=0,k=!1;;){if(e=a.charAt(j),""===e)return b(),c(),h;if(k){if("*"===e&&"/"===a[j+1]){k=!1,j+=2,b();continue}j+=1}else{if(d(e)){if(a.charAt(j-1)&&d(a.charAt(j-1))||!f){j+=1;continue}if(0===i){b(),j+=1;continue}e=" "}else if("("===e)i+=1;else if(")"===e)i-=1;else{if(","===e){b(),c(),j+=1;continue}if("/"===e&&"*"===a.charAt(j+1)){k=!0,j+=2;continue}}f+=e,j+=1}}}function c(a){return k.test(a)&&parseFloat(a)>=0?!0:l.test(a)?!0:"0"===a||"-0"===a||"+0"===a?!0:!1}var e,f,g,h,i,j,k=/^(?:[+-]?[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?[0-9]+)?(?:ch|cm|em|ex|in|mm|pc|pt|px|rem|vh|vmin|vmax|vw)$/i,l=/^calc\((?:[0-9a-z \.\+\-\*\/\(\)]+)\)$/i;for(f=b(a),g=f.length,e=0;g>e;e++)if(h=f[e],i=h[h.length-1],c(i)){if(j=i,h.pop(),0===h.length)return j;if(h=h.join(" "),s.matchesMedia(h))return j}return"100vw"}b.createElement("picture");var o,p,q,r,s={},t=function(){},u=b.createElement("img"),v=u.getAttribute,w=u.setAttribute,x=u.removeAttribute,y=b.documentElement,z={},A={algorithm:""},B="data-pfsrc",C=B+"set",D=navigator.userAgent,E=/rident/.test(D)||/ecko/.test(D)&&D.match(/rv\:(\d+)/)&&RegExp.$1>35,F="currentSrc",G=/\s+\+?\d+(e\d+)?w/,H=/(\([^)]+\))?\s*(.+)/,I=a.picturefillCFG,J="position:absolute;left:0;visibility:hidden;display:block;padding:0;border:none;font-size:1em;width:1em;overflow:hidden;clip:rect(0px, 0px, 0px, 0px)",K="font-size:100%!important;",L=!0,M={},N={},O=a.devicePixelRatio,P={px:1,"in":96},Q=b.createElement("a"),R=!1,S=/^[ \t\n\r\u000c]+/,T=/^[, \t\n\r\u000c]+/,U=/^[^ \t\n\r\u000c]+/,V=/[,]+$/,W=/^\d+$/,X=/^-?(?:[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/,Y=function(a,b,c,d){a.addEventListener?a.addEventListener(b,c,d||!1):a.attachEvent&&a.attachEvent("on"+b,c)},Z=function(a){var b={};return function(c){return c in b||(b[c]=a(c)),b[c]}},$=function(){var a=/^([\d\.]+)(em|vw|px)$/,b=function(){for(var a=arguments,b=0,c=a[0];++b in a;)c=c.replace(a[b],a[++b]);return c},c=Z(function(a){return"return "+b((a||"").toLowerCase(),/\band\b/g,"&&",/,/g,"||",/min-([a-z-\s]+):/g,"e.$1>=",/max-([a-z-\s]+):/g,"e.$1<=",/calc([^)]+)/g,"($1)",/(\d+[\.]*[\d]*)([a-z]+)/g,"($1 * e.$2)",/^(?!(e.[a-z]|[0-9\.&=|><\+\-\*\(\)\/])).*/gi,"")+";"});return function(b,d){var e;if(!(b in M))if(M[b]=!1,d&&(e=b.match(a)))M[b]=e[1]*P[e[2]];else try{M[b]=new Function("e",c(b))(P)}catch(f){}return M[b]}}(),_=function(a,b){return a.w?(a.cWidth=s.calcListLength(b||"100vw"),a.res=a.w/a.cWidth):a.res=a.d,a},aa=function(a){var c,d,e,f=a||{};if(f.elements&&1===f.elements.nodeType&&("IMG"===f.elements.nodeName.toUpperCase()?f.elements=[f.elements]:(f.context=f.elements,f.elements=null)),c=f.elements||s.qsa(f.context||b,f.reevaluate||f.reselect?s.sel:s.selShort),e=c.length){for(s.setupRun(f),R=!0,d=0;e>d;d++)s.fillImg(c[d],f);s.teardownRun(f)}};o=a.console&&console.warn?function(a){console.warn(a)}:t,F in u||(F="src"),z["image/jpeg"]=!0,z["image/gif"]=!0,z["image/png"]=!0,z["image/svg+xml"]=b.implementation.hasFeature("http://wwwindow.w3.org/TR/SVG11/feature#Image","1.1"),s.ns=("pf"+(new Date).getTime()).substr(0,9),s.supSrcset="srcset"in u,s.supSizes="sizes"in u,s.supPicture=!!a.HTMLPictureElement,s.supSrcset&&s.supPicture&&!s.supSizes&&!function(a){u.srcset="data:,a",a.src="data:,a",s.supSrcset=u.complete===a.complete,s.supPicture=s.supSrcset&&s.supPicture}(b.createElement("img")),s.selShort="picture>img,img[srcset]",s.sel=s.selShort,s.cfg=A,s.supSrcset&&(s.sel+=",img["+C+"]"),s.DPR=O||1,s.u=P,s.types=z,q=s.supSrcset&&!s.supSizes,s.setSize=t,s.makeUrl=Z(function(a){return Q.href=a,Q.href}),s.qsa=function(a,b){return a.querySelectorAll(b)},s.matchesMedia=function(){return a.matchMedia&&(matchMedia("(min-width: 0.1em)")||{}).matches?s.matchesMedia=function(a){return!a||matchMedia(a).matches}:s.matchesMedia=s.mMQ,s.matchesMedia.apply(this,arguments)},s.mMQ=function(a){return a?$(a):!0},s.calcLength=function(a){var b=$(a,!0)||!1;return 0>b&&(b=!1),b},s.supportsType=function(a){return a?z[a]:!0},s.parseSize=Z(function(a){var b=(a||"").match(H);return{media:b&&b[1],length:b&&b[2]}}),s.parseSet=function(a){return a.cands||(a.cands=m(a.srcset,a)),a.cands},s.getEmValue=function(){var a;if(!p&&(a=b.body)){var c=b.createElement("div"),d=y.style.cssText,e=a.style.cssText;c.style.cssText=J,y.style.cssText=K,a.style.cssText=K,a.appendChild(c),p=c.offsetWidth,a.removeChild(c),p=parseFloat(p,10),y.style.cssText=d,a.style.cssText=e}return p||16},s.calcListLength=function(a){if(!(a in N)||A.uT){var b=s.calcLength(n(a));N[a]=b?b:P.width}return N[a]},s.setRes=function(a){var b;if(a){b=s.parseSet(a);for(var c=0,d=b.length;d>c;c++)_(b[c],a.sizes)}return b},s.setRes.res=_,s.applySetCandidate=function(a,b){if(a.length){var c,d,e,f,h,k,l,m,n,o=b[s.ns],p=s.DPR;if(k=o.curSrc||b[F],l=o.curCan||j(b,k,a[0].set),l&&l.set===a[0].set&&(n=E&&!b.complete&&l.res-.1>p,n||(l.cached=!0,l.res>=p&&(h=l))),!h)for(a.sort(i),f=a.length,h=a[f-1],d=0;f>d;d++)if(c=a[d],c.res>=p){e=d-1,h=a[e]&&(n||k!==s.makeUrl(c.url))&&g(a[e].res,c.res,p,a[e].cached)?a[e]:c;break}h&&(m=s.makeUrl(h.url),o.curSrc=m,o.curCan=h,m!==k&&s.setSrc(b,h),s.setSize(b))}},s.setSrc=function(a,b){var c;a.src=b.url,"image/svg+xml"===b.set.type&&(c=a.style.width,a.style.width=(a.offsetWidth+1)/16+"em",a.offsetWidth+1&&(a.style.width=c))},s.getSet=function(a){var b,c,d,e=!1,f=a[s.ns].sets;for(b=0;bf?c=setTimeout(e,b-f):(c=null,a())};return function(){d=new Date,c||(c=setTimeout(e,b))}},h=y.clientHeight,i=function(){L=Math.max(a.innerWidth||0,y.clientWidth)!==P.width||y.clientHeight!==h,h=y.clientHeight,L&&s.fillImgs()};Y(a,"resize",g(i,99)),Y(b,"readystatechange",e)}(),s.picturefill=aa,s.fillImgs=aa,s.teardownRun=t,aa._=s,a.picturefillCFG={pf:s,push:function(a){var b=a.shift();"function"==typeof s[b]?s[b].apply(s,a):(A[b]=a[0],R&&s.fillImgs({reselect:!0}))}};for(;I&&I.length;)a.picturefillCFG.push(I.shift());a.picturefill=aa,"object"==typeof module&&"object"==typeof module.exports?module.exports=aa:"function"==typeof define&&define.amd&&define("picturefill",function(){return aa}),s.supPicture||(z["image/webp"]=e("image/webp","data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA=="))}(window,document); \ No newline at end of file +!function(a){var b=navigator.userAgent;a.HTMLPictureElement&&/ecko/.test(b)&&b.match(/rv\:(\d+)/)&&RegExp.$1<45&&addEventListener("resize",function(){var b,c=document.createElement("source"),d=function(a){var b,d,e=a.parentNode;"PICTURE"===e.nodeName.toUpperCase()?(b=c.cloneNode(),e.insertBefore(b,e.firstElementChild),setTimeout(function(){e.removeChild(b)})):(!a._pfLastSize||a.offsetWidth>a._pfLastSize)&&(a._pfLastSize=a.offsetWidth,d=a.sizes,a.sizes+=",100vw",setTimeout(function(){a.sizes=d}))},e=function(){var a,b=document.querySelectorAll("picture > img, img[srcset][sizes]");for(a=0;a2.7?h=c+1:(f=b-c,e=Math.pow(a-.6,1.5),g=f*e,d&&(g+=.1*e),h=a+g):h=c>1?Math.sqrt(a*b):a,h>c}function h(a){var b,c=s.getSet(a),d=!1;"pending"!==c&&(d=r,c&&(b=s.setRes(c),s.applySetCandidate(b,a))),a[s.ns].evaled=d}function i(a,b){return a.res-b.res}function j(a,b,c){var d;return!c&&b&&(c=a[s.ns].sets,c=c&&c[c.length-1]),d=k(b,c),d&&(b=s.makeUrl(b),a[s.ns].curSrc=b,a[s.ns].curCan=d,d.res||aa(d,d.set.sizes)),d}function k(a,b){var c,d,e;if(a&&b)for(e=s.parseSet(b),a=s.makeUrl(a),c=0;cc;c++)e=g[c],e[s.ns]=!0,f=e.getAttribute("srcset"),f&&b.push({srcset:f,media:e.getAttribute("media"),type:e.getAttribute("type"),sizes:e.getAttribute("sizes")})}function m(a,b){function c(b){var c,d=b.exec(a.substring(m));return d?(c=d[0],m+=c.length,c):void 0}function e(){var a,c,d,e,f,i,j,k,l,m=!1,o={};for(e=0;el?m=!0:c=l):X.test(j)&&"h"===i?((d||c)&&(m=!0),0===k?m=!0:d=k):m=!0;m||(o.url=g,a&&(o.w=a),c&&(o.d=c),d&&(o.h=d),d||c||a||(o.d=1),1===o.d&&(b.has1x=!0),o.set=b,n.push(o))}function f(){for(c(T),i="",j="in descriptor";;){if(k=a.charAt(m),"in descriptor"===j)if(d(k))i&&(h.push(i),i="",j="after descriptor");else{if(","===k)return m+=1,i&&h.push(i),void e();if("("===k)i+=k,j="in parens";else{if(""===k)return i&&h.push(i),void e();i+=k}}else if("in parens"===j)if(")"===k)i+=k,j="in descriptor";else{if(""===k)return h.push(i),void e();i+=k}else if("after descriptor"===j)if(d(k));else{if(""===k)return void e();j="in descriptor",m-=1}m+=1}}for(var g,h,i,j,k,l=a.length,m=0,n=[];;){if(c(U),m>=l)return n;g=c(V),h=[],","===g.slice(-1)?(g=g.replace(W,""),e()):f()}}function n(a){function b(a){function b(){f&&(g.push(f),f="")}function c(){g[0]&&(h.push(g),g=[])}for(var e,f="",g=[],h=[],i=0,j=0,k=!1;;){if(e=a.charAt(j),""===e)return b(),c(),h;if(k){if("*"===e&&"/"===a[j+1]){k=!1,j+=2,b();continue}j+=1}else{if(d(e)){if(a.charAt(j-1)&&d(a.charAt(j-1))||!f){j+=1;continue}if(0===i){b(),j+=1;continue}e=" "}else if("("===e)i+=1;else if(")"===e)i-=1;else{if(","===e){b(),c(),j+=1;continue}if("/"===e&&"*"===a.charAt(j+1)){k=!0,j+=2;continue}}f+=e,j+=1}}}function c(a){return k.test(a)&&parseFloat(a)>=0?!0:l.test(a)?!0:"0"===a||"-0"===a||"+0"===a?!0:!1}var e,f,g,h,i,j,k=/^(?:[+-]?[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?[0-9]+)?(?:ch|cm|em|ex|in|mm|pc|pt|px|rem|vh|vmin|vmax|vw)$/i,l=/^calc\((?:[0-9a-z \.\+\-\*\/\(\)]+)\)$/i;for(f=b(a),g=f.length,e=0;g>e;e++)if(h=f[e],i=h[h.length-1],c(i)){if(j=i,h.pop(),0===h.length)return j;if(h=h.join(" "),s.matchesMedia(h))return j}return"100vw"}b.createElement("picture");var o,p,q,r,s={},t=!1,u=function(){},v=b.createElement("img"),w=v.getAttribute,x=v.setAttribute,y=v.removeAttribute,z=b.documentElement,A={},B={algorithm:""},C="data-pfsrc",D=C+"set",E=navigator.userAgent,F=/rident/.test(E)||/ecko/.test(E)&&E.match(/rv\:(\d+)/)&&RegExp.$1>35,G="currentSrc",H=/\s+\+?\d+(e\d+)?w/,I=/(\([^)]+\))?\s*(.+)/,J=a.picturefillCFG,K="position:absolute;left:0;visibility:hidden;display:block;padding:0;border:none;font-size:1em;width:1em;overflow:hidden;clip:rect(0px, 0px, 0px, 0px)",L="font-size:100%!important;",M=!0,N={},O={},P=a.devicePixelRatio,Q={px:1,"in":96},R=b.createElement("a"),S=!1,T=/^[ \t\n\r\u000c]+/,U=/^[, \t\n\r\u000c]+/,V=/^[^ \t\n\r\u000c]+/,W=/[,]+$/,X=/^\d+$/,Y=/^-?(?:[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/,Z=function(a,b,c,d){a.addEventListener?a.addEventListener(b,c,d||!1):a.attachEvent&&a.attachEvent("on"+b,c)},$=function(a){var b={};return function(c){return c in b||(b[c]=a(c)),b[c]}},_=function(){var a=/^([\d\.]+)(em|vw|px)$/,b=function(){for(var a=arguments,b=0,c=a[0];++b in a;)c=c.replace(a[b],a[++b]);return c},c=$(function(a){return"return "+b((a||"").toLowerCase(),/\band\b/g,"&&",/,/g,"||",/min-([a-z-\s]+):/g,"e.$1>=",/max-([a-z-\s]+):/g,"e.$1<=",/calc([^)]+)/g,"($1)",/(\d+[\.]*[\d]*)([a-z]+)/g,"($1 * e.$2)",/^(?!(e.[a-z]|[0-9\.&=|><\+\-\*\(\)\/])).*/gi,"")+";"});return function(b,d){var e;if(!(b in N))if(N[b]=!1,d&&(e=b.match(a)))N[b]=e[1]*Q[e[2]];else try{N[b]=new Function("e",c(b))(Q)}catch(f){}return N[b]}}(),aa=function(a,b){return a.w?(a.cWidth=s.calcListLength(b||"100vw"),a.res=a.w/a.cWidth):a.res=a.d,a},ba=function(a){if(t){var c,d,e,f=a||{};if(f.elements&&1===f.elements.nodeType&&("IMG"===f.elements.nodeName.toUpperCase()?f.elements=[f.elements]:(f.context=f.elements,f.elements=null)),c=f.elements||s.qsa(f.context||b,f.reevaluate||f.reselect?s.sel:s.selShort),e=c.length){for(s.setupRun(f),S=!0,d=0;e>d;d++)s.fillImg(c[d],f);s.teardownRun(f)}}};o=a.console&&console.warn?function(a){console.warn(a)}:u,G in v||(G="src"),A["image/jpeg"]=!0,A["image/gif"]=!0,A["image/png"]=!0,A["image/svg+xml"]=b.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1"),s.ns=("pf"+(new Date).getTime()).substr(0,9),s.supSrcset="srcset"in v,s.supSizes="sizes"in v,s.supPicture=!!a.HTMLPictureElement,s.supSrcset&&s.supPicture&&!s.supSizes&&!function(a){v.srcset="data:,a",a.src="data:,a",s.supSrcset=v.complete===a.complete,s.supPicture=s.supSrcset&&s.supPicture}(b.createElement("img")),s.supSrcset&&!s.supSizes?!function(){var a="data:image/gif;base64,R0lGODlhAgABAPAAAP///wAAACH5BAAAAAAALAAAAAACAAEAAAICBAoAOw==",c="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",d=b.createElement("img"),e=function(){var a=d.width;2===a&&(s.supSizes=!0),q=s.supSrcset&&!s.supSizes,t=!0,setTimeout(ba)};d.onload=e,d.onerror=e,d.setAttribute("sizes","9px"),d.srcset=c+" 1w,"+a+" 9w",d.src=c}():t=!0,s.selShort="picture>img,img[srcset]",s.sel=s.selShort,s.cfg=B,s.DPR=P||1,s.u=Q,s.types=A,s.setSize=u,s.makeUrl=$(function(a){return R.href=a,R.href}),s.qsa=function(a,b){return"querySelector"in a?a.querySelectorAll(b):[]},s.matchesMedia=function(){return a.matchMedia&&(matchMedia("(min-width: 0.1em)")||{}).matches?s.matchesMedia=function(a){return!a||matchMedia(a).matches}:s.matchesMedia=s.mMQ,s.matchesMedia.apply(this,arguments)},s.mMQ=function(a){return a?_(a):!0},s.calcLength=function(a){var b=_(a,!0)||!1;return 0>b&&(b=!1),b},s.supportsType=function(a){return a?A[a]:!0},s.parseSize=$(function(a){var b=(a||"").match(I);return{media:b&&b[1],length:b&&b[2]}}),s.parseSet=function(a){return a.cands||(a.cands=m(a.srcset,a)),a.cands},s.getEmValue=function(){var a;if(!p&&(a=b.body)){var c=b.createElement("div"),d=z.style.cssText,e=a.style.cssText;c.style.cssText=K,z.style.cssText=L,a.style.cssText=L,a.appendChild(c),p=c.offsetWidth,a.removeChild(c),p=parseFloat(p,10),z.style.cssText=d,a.style.cssText=e}return p||16},s.calcListLength=function(a){if(!(a in O)||B.uT){var b=s.calcLength(n(a));O[a]=b?b:Q.width}return O[a]},s.setRes=function(a){var b;if(a){b=s.parseSet(a);for(var c=0,d=b.length;d>c;c++)aa(b[c],a.sizes)}return b},s.setRes.res=aa,s.applySetCandidate=function(a,b){if(a.length){var c,d,e,f,h,k,l,m,n,o=b[s.ns],p=s.DPR;if(k=o.curSrc||b[G],l=o.curCan||j(b,k,a[0].set),l&&l.set===a[0].set&&(n=F&&!b.complete&&l.res-.1>p,n||(l.cached=!0,l.res>=p&&(h=l))),!h)for(a.sort(i),f=a.length,h=a[f-1],d=0;f>d;d++)if(c=a[d],c.res>=p){e=d-1,h=a[e]&&(n||k!==s.makeUrl(c.url))&&g(a[e].res,c.res,p,a[e].cached)?a[e]:c;break}h&&(m=s.makeUrl(h.url),o.curSrc=m,o.curCan=h,m!==k&&s.setSrc(b,h),s.setSize(b))}},s.setSrc=function(a,b){var c;a.src=b.url,"image/svg+xml"===b.set.type&&(c=a.style.width,a.style.width=a.offsetWidth+1+"px",a.offsetWidth+1&&(a.style.width=c))},s.getSet=function(a){var b,c,d,e=!1,f=a[s.ns].sets;for(b=0;bf?c=setTimeout(e,b-f):(c=null,a())};return function(){d=new Date,c||(c=setTimeout(e,b))}},h=z.clientHeight,i=function(){M=Math.max(a.innerWidth||0,z.clientWidth)!==Q.width||z.clientHeight!==h,h=z.clientHeight,M&&s.fillImgs()};Z(a,"resize",g(i,99)),Z(b,"readystatechange",e)}(),s.picturefill=ba,s.fillImgs=ba,s.teardownRun=u,ba._=s,a.picturefillCFG={pf:s,push:function(a){var b=a.shift();"function"==typeof s[b]?s[b].apply(s,a):(B[b]=a[0],S&&s.fillImgs({reselect:!0}))}};for(;J&&J.length;)a.picturefillCFG.push(J.shift());a.picturefill=ba,"object"==typeof module&&"object"==typeof module.exports?module.exports=ba:"function"==typeof define&&define.amd&&define("picturefill",function(){return ba}),s.supPicture||(A["image/webp"]=e("image/webp","data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA=="))}(window,document); \ No newline at end of file diff --git a/assets/stylesheets/template/RWD.scss b/assets/stylesheets/template/RWD.scss index 2c4f443..bcdffee 100644 --- a/assets/stylesheets/template/RWD.scss +++ b/assets/stylesheets/template/RWD.scss @@ -24,3 +24,23 @@ } } } +@media(max-width:480px){ + .rwdimgs{ + display:block; + + } + .rwdimgl{ + display:none; + } + + } +@media(min-width:480px){ + .rwdimgs{ + display:none; + + } + .rwdimgl{ + display:block; + } + +} diff --git a/assets/stylesheets/template/base/_ckeditor-reset.scss b/assets/stylesheets/template/base/_ckeditor-reset.scss index 31e4344..7254379 100644 --- a/assets/stylesheets/template/base/_ckeditor-reset.scss +++ b/assets/stylesheets/template/base/_ckeditor-reset.scss @@ -13,7 +13,7 @@ body[data-module="page_content"] { } h3 { - font-size: $font-h1; + font-size: $font-h3; } h4 { @@ -38,4 +38,4 @@ body[data-module="page_content"] { margin: 0 0 0.625em; } } -} \ No newline at end of file +} diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index 2bacb21..9b6477f 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -55,7 +55,25 @@ td { .borderless > thead > tr > th { border: none !important; } - +// .widget-link__more{ +// background-color: none; +// margin-bottom: 1em; +// font-size: 0.8125rem; +// -webkit-transition: all 200ms cubic-bezier(0.39, 0.5, 0.15, 1.36); +// -moz-transition: all 200ms cubic-bezier(0.39, 0.5, 0.15, 1.36); +// -ms-transition: all 200ms cubic-bezier(0.39, 0.5, 0.15, 1.36); +// -o-transition: all 200ms cubic-bezier(0.39, 0.5, 0.15, 1.36); +// transition: all 200ms cubic-bezier(0.39, 0.5, 0.15, 1.36); +// background: none; +// border: none; +// color: $theme-color-main!important; +// box-shadow: $theme-color-main 0 0px 0px 2px inset; +// +// &:hover { +// color: #fff!important; +// box-shadow:$theme-color-main 0 0px 0px 40px inset; +// } +// } a.btn-primary { margin-bottom: 1em; font-size: 0.8125rem; @@ -104,9 +122,9 @@ a.btn-primary { } // Take care of exceeding content -body[data-module="page_content"], -body[data-module="announcement"] { - .layout-content { - overflow-x: auto; - } -} +// body[data-module="page_content"], +// body[data-module="announcement"] { +// .layout-content { +// overflow-x: auto; +// } +// } diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index 179aba0..e8a3389 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -7,7 +7,7 @@ margin: 0.5em 0; line-height: 1.5; font-family: $main-font; - font-size: $font-h1; + font-size: $font-h3; font-weight: bold; color: $theme-color-main; display: -webkit-box; @@ -26,11 +26,15 @@ .i-title{ font-size: 1.2rem; line-height: 1.3; + font-weight: normal; } .i-subtitle{ font-size: 1.1rem; + font-weight: normal; +} +.metadata-date{ + list-style: none; } - //transition .transition { cursor: pointer; @@ -60,3 +64,6 @@ color: $theme-white; } } +ol, ul{ + padding-left: 1.6em; +} diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss index 7db4d0f..bcf1345 100644 --- a/assets/stylesheets/template/base/_variables.scss +++ b/assets/stylesheets/template/base/_variables.scss @@ -22,10 +22,10 @@ $theme-color-green: #32D9C3; $theme-color-hover:#1e71c1; // Font stacks -// $main-font: "IndustryW00-Medium","Barlow", "Roboto", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; -// $sub-font: "Barlow","Roboto", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; -$main-font: "arial", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; -$sub-font: "arial", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; +$main-font: "Noto Sans TC", sans-serif; +$sub-font: "Noto Sans TC", sans-serif; +// $main-font: "arial", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; +// $sub-font: "arial", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; @font-face {font-family: "IndustryW00-Medium"; src: url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.eot"); src: url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.eot?#iefix") format("embedded-opentype"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.woff2") format("woff2"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.woff") format("woff"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.ttf") format("truetype"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.svg#IndustryW00-Medium") format("svg"); } @@ -33,12 +33,36 @@ $sub-font: "arial", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif; $font-15: 0.9375rem; $font-13: 0.8125rem; -$font-h1: 1.5rem; -$font-h2: 1.35rem; -$font-h3: 1.2rem; -$font-h4: 1.1rem; -$font-h5: 1rem; -$font-h6: 0.9rem; +$font-h1: 2.5rem; +$font-h2: 2rem; +$font-h3: 1.8rem; +$font-h4: 1.5rem; +$font-h5: 1.2rem; +$font-h6: 1rem; +h1{ + font-size:2.5rem; +} +h2{ +font-size: 2rem; +} +h3{ + font-size:1.8rem; +} +h4{ + font-size: 1.5rem; +} +h5{ + font-size: 1.2rem; +} +h6{ + font-size: 1rem; +} +// $font-h1: 1.8rem; +// $font-h2: 1.5rem; +// $font-h3: 1.2rem; +// $font-h4: 1.1rem; +// $font-h5: 1rem; +// $font-h6: 0.9rem; // // Modules diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 759175f..b593a43 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -1,15 +1,22 @@ @charset "utf-8"; @import "../initial"; +.col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-sm-1, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-xs-1, .col-xs-10, .col-xs-11, .col-xs-12, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9{ + @media(max-width: $screen-xs){ + padding: 0; + } +} .verticalhome{ position: relative; width: 100%; - background-color: #fff; + background-color: #F8F9FA; + z-index: 1 !important; + overflow: hidden; } .internal-page{ .layout-content{ background: #F8F9FA; - padding-top: 1em; + padding-bottom: 4em; } } .big-banner{ @@ -31,11 +38,11 @@ max-width: 850px; } .homebanner{ - -webkit-transition: .3s ease-out; - -moz-transition: .3s ease-out; - -ms-transition: .3s ease-out; - -o-transition: .3s ease-out; - transition: .3s ease-out; + -webkit-transition: .3s ease-out; + -moz-transition: .3s ease-out; + -ms-transition: .3s ease-out; + -o-transition: .3s ease-out; + transition: .3s ease-out; } .fa, .fas{ font-family: "FontAwesome"; @@ -52,91 +59,11 @@ transition: all .3s; } } - - a{ - color: #fff; - } .layout-content-box{ padding: 0; } padding: 0 1em; } -.image-carousel{ - padding: 15px 0px 25px 0px; -} -.hide0{ - opacity: 0; - -webkit-transform: translateY(15%) translateZ(0); - -moz-transform: translateY(15%) translateZ(0); - -o-transform: translateY(15%) translateZ(0); - -ms-transform: translateY(15%) translateZ(0); - transform: translateY(15%) translateZ(0); - -webkit-transition: transform 0.8s ease-out, opacity 0.4s ease; - -moz-transition: transform 0.8s ease-out, opacity 0.4s ease; - -o-transition: transform 0.8s ease-out, opacity 0.4s ease; - -ms-transition: transform 0.8s ease-out, opacity 0.4s ease; - transition: transform 0.8s ease-out, opacity 0.4s cubic-bezier(0.63, 0.01, 0, 1.02); -} -.animationvisible{ - opacity: 1; - -webkit-transform: translateY(0) translateZ(0); - -moz-transform: translateY(0) translateZ(0); - -o-transform: translateY(0) translateZ(0); - -ms-transform: translateY(0) translateZ(0); - transform: translateY(0) translateZ(0); -} -.swiper-banner{ - .ba-banner-widget-1 { - .ad-overlay{ - background-image: none!important; - } - ul.button-mid .next-button{ - color: #E4002B!important; - background: none!important; - } - ul.button-mid .prev-button{ - color: #E4002B!important; - background: none!important; - } - } -} -.information{ - .informationicon{ - display: flex; - flex-wrap: wrap; - justify-content: center; - align-items: center; - text-align: center; - cursor: pointer; - @media(max-width: $screen-xs){ - width: 50%; - padding: 1em; - - } - &:hover{ - color: $theme-color-second; - -webkit-transition: all .3s ease; - -moz-transition: all .3s ease; - -ms-transition: all .3s ease; - -o-transition: all .3s ease; - transition: all .3s ease; - -webkit-transform: translateY(-6px); - -ms-transform: translateY(-6px); - transform: translateY(-6px); - } - i{ - font-size: 2.5em; - padding-bottom:10px; - } - strong{ - width: 100%; - } - span{ - width: 100%; - } - } -} -//內頁 .contentwrap{ overflow: hidden; position: relative; @@ -153,39 +80,62 @@ position: relative; width: 100%; // background-image: linear-gradient(280deg, #e6e6e6 56%, #fff 0); - margin-top: 4em; - margin-bottom: 4em; + padding-top: 4em; + padding-bottom: 4em; } .contentwrap2{ overflow: hidden; position: relative; width: 100%; - margin-top: 4em; - margin-bottom: 4em; + padding-top: 4em; + padding-bottom: 4em; +} +.contentwrap3{ + overflow: hidden; + position: relative; + width: 100%; + padding-top: 4em; + padding-bottom: 4em; + background:#F8F9FA; } .iconwrap{ - padding: 4em 0 0; -} -.kenopacity{ - .box{ - &:hover{ - opacity: .8; - transition: all .3s; - } - } -} -.kenopacity{ - padding-bottom: 1em; + padding: 4em 0 0; } .zero{ - transition: opacity 0.25s linear; padding: 0; - &:hover{ - opacity: .8; - cursor: pointer; - } - a{ - color: #fff; - font-weight: bold; +} +.i-video_data{ + li{ + list-style: none; } } +.ask-question .form-horizontal .control-label{ + width: 100% !important; + max-width: 100% !important; + text-align: justify !important; +} +.ask-question .single-col.form-horizontal .control-group .controls{ + justify-content: flex-start; + max-width: 100%; + width: 100%; +} +.ask-question-form{ + padding: 2em; + border-radius: 10px; + border: 1px solid #E4E6EA; + padding-bottom: 3em!important; + @media(max-width: 820px){ + padding: 1.5em; + } +} +.index-publications-3 .i-annc__img-wrap{ + height: 20em; + overflow: hidden; + margin: 0 0 1em 0; +} +.index-publications-3 .i-annc__content-wrap{ + height: 6em; +} +.image-carousel{ + padding: 15px 0px 25px 0px; +} diff --git a/assets/stylesheets/template/layout/footer.scss b/assets/stylesheets/template/layout/footer.scss index a370d40..e33b245 100644 --- a/assets/stylesheets/template/layout/footer.scss +++ b/assets/stylesheets/template/layout/footer.scss @@ -3,13 +3,18 @@ @import "../initial"; .layout-footer { - margin-top: 2em; clear: both; background:#1a1b20; position: relative; padding: 2em 0; color: $theme-color-main; font-size: 0.8125em; + ul{ + padding: 0; + } + li{ + list-style: none; + } .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6{ } @@ -52,13 +57,6 @@ } .fatfooter{ display: none; - #ucFatFooter_aMenu1{ - color: #fff; - font-weight: bold; - a{ - color: #e9408c; - } - } ul{ padding: 0; } diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 6fa34cd..61c2d71 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -1,6 +1,21 @@ @charset "utf-8"; @import "../initial"; +.header-nav { + ul{ + padding: 0; + } + @media(max-width: 769px){ + ul{ + display: flex!important; + flex-wrap: wrap; + padding: 0; + li{ + padding: 0.5em!important; + } + } + } +} .accessibility_mode a:focus{ outline: 0.1em solid !important; outline: 0.3125em auto -webkit-focus-ring-color !important; @@ -10,24 +25,30 @@ margin-bottom: 0; border: none; border-radius: 0; - z-index: 102; + z-index:1000; background-color: #fff; -webkit-box-shadow: 0 1px 5px 1px rgba(26, 26, 26, .3); box-shadow: 0 1px 5px 1px rgba(26, 26, 26, .3); + li{ + list-style: none; + } + a[accesskey] { + position: relative!important; + } .container { @extend .response-container; } .header-banner { overflow: hidden; } .header-nav { - padding: 1.3em 0 0 0; - font-weight: bold; + padding:1em 0 0 0; color: $theme-color-main; font-family: $main-font; text-transform:uppercase; display: flex; align-items: center; - @media(max-width: 768px){ + justify-content: flex-end; + @media(max-width: 820px){ justify-content: space-between; padding:0; } @@ -42,7 +63,6 @@ padding: 0; margin-top: 0; margin-bottom: 0; - font-size: 0.8em; color: $theme-color-main; } @@ -52,10 +72,10 @@ padding: 15px; } - @media (min-width: $screen-sm) { - float: right; + @media (min-width:1025px) { + margin-bottom: -4em; + z-index: 105; position: relative; - margin-right: 4em; } } .navbar-header h1.default_site_h1, .navbar-header h2.default_site_h1{ @@ -95,7 +115,7 @@ font-weight: bold; } } - @media (max-width: 768px) { + @media (max-width: 820px) { padding: 0; h1{ margin-top: 1em; @@ -128,18 +148,14 @@ @media(max-width: $screen-xs){ height: 50px !important; } - @media(max-width: 768px)and(min-width:$screen-xs ){ + @media(max-width: 820px)and(min-width:$screen-xs ){ height: 60px!important; } } } } } -.mobile-menu{ - .icon-bar { - background-color:#fff!important; - } -} + .navbar-toggle { padding: 0.875em 0.625em; margin-top: 1em; @@ -192,7 +208,7 @@ } } -@media (width: 768px) { +@media (width: 769px) { .navbar-toggle{ display: block!important; } @@ -217,16 +233,6 @@ } } -.nav{ - font-family: "Industry_Demi", Sans-serif; - font-weight: 600; - text-transform: uppercase; - padding: 1em 0; - &:hover{ - background-color: #e4002b; - color: #fff; - } -} .navone ::before{ content: ''; position: absolute; @@ -319,7 +325,7 @@ height: 25px; transition: all .25s ease-in .25s; border-radius: 25px; - @media(max-width:768px){ + @media(max-width:820px){ right: 2px; } } diff --git a/assets/stylesheets/template/layout/slide.scss b/assets/stylesheets/template/layout/slide.scss index c3f70ab..86a102d 100644 --- a/assets/stylesheets/template/layout/slide.scss +++ b/assets/stylesheets/template/layout/slide.scss @@ -4,7 +4,7 @@ .layout-slide { position: relative; - + overflow: hidden; .w-ad-banner { margin: auto; } diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 28eab13..1ddd7ba 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -2369,10 +2369,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl } .s-annc__flie-title { - max-width: 9.375rem; - overflow: hidden; white-space: nowrap; - text-overflow: ellipsis; } .s-annc__social > * { diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index aa720d0..ff096d1 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -2,74 +2,6 @@ @import "../initial"; -// // 選單樣式2 -// .modules-menu{ -// @media (min-width: $screen-sm){ -// li{ -// padding-left: 0!important; -// } -// .modules-menu-level-1 > li > a{ -// color: $theme-color-second!important; -// } -// } -// .modules-menu-level-0 > li{ -// @media (min-width: $screen-sm){ -// position: static!important; -// } -// } -// -// .modules-menu-level-1{ -// -// @media (min-width: $screen-sm){ -// min-width:unset; -// flex-wrap: wrap; -// justify-content: flex-start; -// left:0!important; -// display: flex!important; -// visibility: hidden; -// opacity: 0; -// width: 100vw!important; -// box-shadow: 2px 2px 5px #00000033; -// margin:0; -// padding:1em 13% 3em!important; -// transition-duration: 0.5s; -// background: #f0f0f0; -// } -// } -// .modules-menu-level-0 > li:hover .modules-menu-level-1, .modules-menu .modules-menu-level-0 > li.hover-class .modules-menu-level-1{ -// visibility: visible!important; -// opacity: 1!important; -// } -// -// .modules-menu-level-2 { -// right:auto!important; -// display: block; -// top: auto!important; -// left: auto!important; -// background-color: transparent!important; -// position: relative!important; -// } -// .modules-menu-level-1{ -// @media (min-width: $screen-sm) { -// & > li { -// width: 25%; -// & > a { -// padding-left: 1em; -// padding: 5px 0; -// } -// -// &:hover { -// .modules-menu-level-2 { -// display: block; -// } -// } -// } -// .modules-menu-level-2{ -// display: block; -// } -// } -// } -// } //固定選單 .navFixed { @@ -97,69 +29,6 @@ transition: all .3s ease; } -// //直式選單更改css -// .navbar-brand{ -// h1{ -// @media(min-width: 769px){ -// margin-top:0.5em; -// } -// } -// } -// #layout-navigation{ -// @media(min-width: 769px){ -// position: absolute; -// width: 20%!important; -// left: 0; -// background-color: #fff; -// margin-top: 5em; -// padding-right: 0; -// #main-nav{ -// padding: 0; -// } -// .modules-menu-level-0{ -// width: 100%!important; -// } -// .modules-menu-level-0 > li{ -// width: 100%; -// } -// .modules-menu-level-1{ -// min-width: 100%; -// left: 100%; -// top: 0; -// } -// } -// } -// .verticalhome{ -// .layout-content{ -// @media(min-width: 769px){ -// float: right!important; -// width: 80%!important; -// } -// } -// } -// .homebanner{ -// @media(min-width: 769px){ -// float: right!important; -// width: 80%!important; -// .ba-banner-widget-0 img{ -// transform: none!important; -// } -// } -// } -// .container{ -// @media(min-width: 1200px){ -// width: 95%!important; -// max-width: unset!important; -// } -// } -// .layout-header .navbar-header .navbar-brand{ -// @media(min-width: 1200px){ -// padding-left: 0; -// } -// } - - - @@ -178,8 +47,11 @@ z-index: 1020; li { - padding: 1em; + white-space: nowrap; list-style: none; + @media(max-width: 768px){ + padding: 1em; + } } .menu-drop.opened { transform: rotateX(180deg); @@ -188,21 +60,18 @@ .modules-menu-level-0 { width: 100%; padding: 0; - @media (min-width:769px)and(max-width: 1025px){ - display: flex; - flex-wrap: wrap; - justify-content: space-between; - padding: 0; - width: 100%; - } - @media (min-width: 1025px) { - margin: 0; - padding: 2em 0 0; + @media (min-width:769px) { + margin: 0 0 0.8em 0; + -webkit-flex-flow: row wrap; list-style: none; + float: left !important; + padding-top: 10px; display: flex; - flex-wrap: wrap; - justify-content: space-between; - width: 70%; + width: 100%; + justify-content: start; + padding-left: 0; + padding-left: 6em; + padding-right: 3em; } .has-dropdown.level-1.active { .modules-menu-level-1 { @@ -240,7 +109,7 @@ text-align: center; border-radius: 0.13em; top: 2em; - @media(max-width: 769px){ + @media(max-width: 768px){ top: 1em; font-size: 1em; } @@ -260,12 +129,21 @@ margin: 0; padding: 0.5em; border-bottom: 0.0625em solid lighten($theme-gray, 5%); - + i{ + color: #fff; + @media(max-width: 768px){ + color: $theme-color-main; + } + } & > a { display: block; - padding: 1em 0.1em; + padding: 1.125em 0; font-family: $main-font; font-size: 1.1em; + color: #fff; + @media(max-width: 768px){ + color: $theme-color-main; + } &:after{ content:''; position:absolute; @@ -283,7 +161,7 @@ bottom:0; } &.active { - color: $theme-color-second; + text-decoration: revert; background: none; &:after{ width:100%; @@ -294,7 +172,7 @@ &:hover { & > a { - color: $theme-color-second; + text-decoration: revert; background: transparent; box-shadow:none; &:after{ @@ -305,7 +183,7 @@ } @media (min-width: $screen-sm) { - // background-color: $theme-color-second; + // background-text-decoration: revert; // border-radius: 0.5em; } } @@ -314,6 +192,7 @@ margin: 0; padding: 0; border-bottom: none; + width: 30%; &:first-child { margin-left: 0; @@ -331,8 +210,6 @@ } & > li { - padding-right: 1em; - padding-left: 1em; & > a { padding-left: 0; @@ -347,10 +224,12 @@ } & > a { - font-size:1.1em; - color:#686868; - font-weight: bold; + font-size:1.2em; + color:#fff; + font-weight: 900; position: relative; + border-bottom: 2px solid #f8f9fa; + margin-right: 1em; } &:hover { @@ -365,18 +244,15 @@ } .modules-menu-level-1 { - display: none; list-style: none; z-index: 1; padding:0; left: auto; @media(min-width:769px){ - min-width: 180px; - width:fit-content; - box-shadow: 2px 2px 5px #00000033; + display: block !important; margin:0; transition-duration: 0.5s; - background: #f0f0f0; + padding-right: 1em; & > a { padding: 1em 1.5em; } @@ -384,7 +260,9 @@ & > li { position: relative; - padding: 1em; + padding-top: 1em; + padding-left: 0; + list-style: none; // & + li { // border-top: 0.0625em solid lighten($theme-gray, 5%); // } @@ -393,25 +271,22 @@ display: block; font-family: $main-font; font-weight: 600; - color: #686868; + color: #fff; font-size: 1.1em; + @media(max-width: 768px){ + color: $theme-color-main; + } } &:hover { - background-color: $theme-color-second; - @media(max-width: 769px){ - a,i { - color: #fff; - } - } - &>a { - color: #fff; + // background-text-decoration: revert; + & > a { + text-decoration: revert; } } } @media (min-width: $screen-sm) { - position: absolute; & > li { & > a { @@ -420,8 +295,7 @@ &:hover { .modules-menu-level-2 { - display: block; - position: absolute; + } } } @@ -432,35 +306,34 @@ margin: 0; padding: 0; list-style: none; - display: none; & > li { & + li { + list-style: none; // border-top: 0.0625em solid lighten($theme-gray, 5%); } & > a { display: block; - font-family: $main-font; - color:#686868; + color:#fff; font-weight: 500; font-weight: bold; + padding-top: 1em; + @media(max-width: 768px){ + color: $theme-color-main; + } } &:hover { a{ transition: all 0.3s ease-in-out; - color: $theme-color-second; + text-decoration: revert; margin-left: 0.5rem; } } } @media (min-width: $screen-sm) { - top: 0; - left: 100%; - background-color: #dbdbdb; - position: absolute; - min-width: 150px; + } } } @@ -486,7 +359,14 @@ padding: 0; } } - +.navbar-toggle{ + @media(min-width: 769px){ + margin-top: 1em; + right:6%; + position: absolute; + display: block; + } +} //mobile .mobile-menu { z-index: 1051; @@ -502,30 +382,57 @@ } .modules-menu { - width: 80%; + width: 100%; position: absolute; right: 0; - background: #ffffff; + background: #222222a6; height: 100%; - top: 0; - padding-top: 40px; + top: 40px; + padding-top: 0; + @media(max-width: 768px){ + width: 80%; + position: absolute; + right: 0; + background: #ffffff; + height: 100%; + top: 0; + padding-top: 40px; + } } .modules-menu .modules-menu-level-0 > li > a, .modules-menu .modules-menu-level-0 ,.modules-menu .modules-menu-level-0 > li { font-weight:bold; } .menu-drop{ - + font-size: 10px ; } .navbar-toggle { - position: absolute; - left: 0; - background: transparent; - top: 40px; - z-index: 1; - height: 100vh; - margin: 0; - width: 20%; - border: 0; + + @media(max-width: 768px){ + display: block!important; + position: absolute; + left: 0; + background: transparent; + top: 40px; + z-index: 1; + height: 100vh; + margin: 0; + width: 20%; + border: 0; + } + @media(min-width: 769px){ + position: absolute; + right: 3%; + background: transparent; + top: 3.5em; + z-index: 11111; + height: 40px; + margin: 0; + border: 0; + -webkit-transition: -webkit-transform 0.3s; + transition: -webkit-transform 0.3s; + transition: transform 0.3s; + transition: transform 0.3s, -webkit-transform 0.3s; + } } .cover { position: fixed; @@ -555,20 +462,19 @@ } .mobile-menu .modules-menu.collapse.in { transform: translateX(100%); - -webkit-transition-timing-function:ease; - -o-transition-timing-function:ease; - transition-timing-function:ease; - -webkit-transition-duration:.35s; - -o-transition-duration:.35s; - transition-duration:.35s; - -webkit-transition-property:transform; - -o-transition-property:transform; - transition-property:transform; + -webkit-transition-timing-function: ease; + -o-transition-timing-function: ease; + transition-timing-function: ease; + -webkit-transition-duration: .35s; + -o-transition-duration: .35s; + transition-duration: .35s; + -webkit-transition-property: transform; + -o-transition-property: transform; + transition-property: transform; } .mobile-menu .collapse.navbar-collapse.modules-menu { - overflow-y: scroll; - transform: translateX(0%); + transform: translateX(0%); } .display-on{ display:block!important; @@ -585,7 +491,7 @@ align-self: center; margin-left: 10px; z-index: 999; - @media(max-width: 769px){ + @media(max-width: 768px){ position: absolute; right: 0.3em; width: 2.5em; @@ -601,6 +507,7 @@ .fa-chevron-right{ align-self: center; margin-left: 10px; + font-size: 3px; font-weight: 100!important; } .show{ @@ -608,11 +515,26 @@ display: block!important; visibility: visible!important; } -.mobile-menu2{ - &>a{ - padding-right: 1em; - } - .menu-drop{ - top: 0.6em!important; +.mobile-menu .collapse.navbar-collapse.modules-menu{ + @media(min-width: 769px){ + // overflow-y: scroll !important; + height: 100% !important; + padding: 0; + } +} +.mobile-menu1{ + @media(min-width: 769px){ + &>.menu-drop{ + display: none; + } + } +} +.navbar-toggle0{ + @media(min-width: 769px){ + position: absolute; + right: 0; + .navbar-toggle{ + transform: translateX(-100%); + } } } diff --git a/assets/stylesheets/template/modules/universal-table.scss b/assets/stylesheets/template/modules/universal-table.scss index 6e91e51..bd3198f 100644 --- a/assets/stylesheets/template/modules/universal-table.scss +++ b/assets/stylesheets/template/modules/universal-table.scss @@ -74,10 +74,11 @@ cursor: pointer; padding: 0; position: absolute; - right: 1em; + right:1em; z-index: 99; @media(max-width: $screen-xs){ margin-top: 0.5em; + right:0; } .searchbtn2, .universal-btn { line-height: 2em; @@ -203,3 +204,60 @@ -o-transition: .3s all ease; transition: .3s all ease; } +.universal-table-index.table td{ + padding: 15px 10px!important; +} +.universal-table-index1{ + .col-ken{ + @media(min-width: $screen-xs){ + width: auto!important; + } + + } + @media(min-width: $screen-xs){ + .universal-th-icon{ + padding:5px!important; + } + .universal-dropdown{ + .btn{ + padding: 0.3125em!important; + } + } + .universal-th-text{ + display: block!important; + clear: both; + } + } +} +.universal-table-index3{ + .col-ken{ + @media(min-width: $screen-xs){ + width: auto!important; + } + + } + @media(min-width: $screen-xs){ + .universal-th-icon{ + padding:5px!important; + } + .universal-dropdown{ + .btn{ + padding: 0.3125em!important; + } + } + .universal-th-text{ + display: block!important; + clear: both; + } + } +} +.universal-table-index4{ + .universal-th-text{ + margin: 0; + } + .col-ken{ + @media(min-width: $screen-xs){ + width: auto!important; + } + } +} diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index df0afe7..410e586 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -25,32 +25,37 @@ .dropdown-toggle:focus { - // outline: 2px solid #43B5FC; - outline: transparent; + // outline: 2px solid #43B5FC; + outline: transparent; } .container{ margin: auto; } +.layout-content{ + .response-container{ + @media (min-width: 769px)and(max-width: 820px) { + width: 768px!important; + } + } +} // container setting .response-container { position: relative; margin:auto!important; - @media (min-width: $screen-xs) { + @media (max-width: $screen-xs) { width: 100%; } - @media (min-width: $screen-sm) { width: 100%; - padding: 0; - } + } @media (min-width: $screen-md) { - width: 95%; + width: 100%; } @media (min-width: $screen-lg) { - width: 85%; - max-width: 1440px; + max-width:1200px; + padding: 0; } } .dropdowns{ @@ -82,6 +87,7 @@ ul.tab_nav { font-family: $main-font; li { + list-style: none; position: relative; padding: 0.5em 1em; margin: 0.2em; @@ -166,3 +172,338 @@ ul.tab_nav { } } } +.video_data{ + width: 100%; +} +.black-screen-social-window.reactable.right .content-social .social_wrap > div{ + background-color: #ffffffc2; +} +.black-screen-social-window.reactable .content-social .social_wrap span{ + padding: 0.5em; +} +.black-screen-social-window .content-social .social_wrap i{ + font-size: 2em; +} +.black-screen-social-window.reactable .content-social .social_wrap > div{ + width: 3.3em; + line-height: unset; +} +.black-screen-social-window.reactable .content-social .social_wrap > div:hover, .black-screen-social-window.reactable .content-social .social_wrap > div.hover-class{ + border-radius: 30px 0 0 30px; + background: #fff; +} +.hide_sharer_button{ + width: 1.65em; +} +.black-screen-social-window.reactable .content-social .social_wrap i, .black-screen-social-window.reactable .content-social .social_wrap img{ + margin-right: 0.5em; + padding-bottom:0; +} +.black-screen-social-window{ + min-width: fit-content; +} +.table-bordered{ + border: 0; +} +.internal-page{ + table{ + tr{ + @media(max-width:$screen-xs){ + display: flex; + flex-wrap: wrap; + width: 100%; + } + + } + td,th{ + @media(max-width: $screen-xs){ + width:100%; + } + } + } +} +//td有rwd +#tdstyle1{ + tr{ + &:nth-child(even){ + background-color:#e0e5eb; + } + } + tr{ + @media(max-width: $screen-xs){ + display: flex; + flex-wrap: wrap; + width: 100%!important; + } + + } + td,th{ + @media(max-width: $screen-xs){ + width:100%!important; + } + } +} +//td無rwd +#tdstyle2{ + table td{ + border: 1px solid #ddd!important; + @media (max-width: 480px) { + width: auto; + } + } + td,th{ + @media(max-width: $screen-xs){ + width: auto ; + } + } + tr{ + display: table-row; + } +} +//td有rwd灰底色 +#tdstyle3{ + tr{ + background: #efefef !important; + margin-bottom: 10px; + border: 1px solid #ccc; + } + td{ + border-bottom: #cacaca 1px solid !important; + } +} +//td無rwd跳色 +#tdstyle4{ + table td{ + border: 1px solid #ddd!important; + @media (max-width: 480px) { + width: auto; + } + } + td,th{ + @media(max-width: $screen-xs){ + width: auto ; + } + } + tr{ + display: table-row; + } + + tr{ + &:nth-child(even){ + background-color:#e0e5eb; + } + } +} +// //取消內頁tdrwd可加在內頁編輯 +// .internal-page table td{ +// border: 1px solid #ddd!important; +// @media (max-width: 480px) { +// width: auto !important; +// } +// } +// tr{ +// display: table-row!important; +// } +table.dataTable>tbody>tr.child{ + padding:0; +} +#orbit_calendar{ + width: 100% !important; +} +//預約系統 +.fc-direction-ltr .fc-daygrid-event .fc-event-time{ + white-space: nowrap; +} +.fc-daygrid-dot-event .fc-event-title{ + white-space: nowrap; +} +.fc .fc-daygrid-event{ + margin-top: 4px; +} +.modal-content{ + box-shadow: 0 24px 38px 3px #00000024, 0 9px 46px 8px #0000001f, 0 11px 15px -7px #00000033; + border-radius: 8px; + border: 0; +} +.fc .fc-daygrid-day.fc-day-today{ + background-color:transparent!important; + .fc-daygrid-day-number{ + color: #fff; + background-color: #858585; + border-radius: 0.65em; + } +} +.calendar-modal .event_summary{ + font-size: 1.2em; + letter-spacing: 1px; +} +.calendar-modal > .modal-content h3{ + font-weight: bold; +} +.fc .fc-daygrid-event-harness{ + font-weight: bold; +} +.fc .fc-daygrid-day-number{ + margin-top: 0.3em; +} +.table-striped{ + a.btn-primary{ + margin: 0; + } +} +.form-horizontal .form-group{ + margin-right: 0; + margin-left: 0; +} +#calendar{ + td{ + border: 1px solid #dee2e6; + } + @media(max-width: $screen-xs){ + tr{ + display: table-row!important; + } + } +} +.w-calendar{ + @media(max-width: $screen-xs){ + tr{ + display: table-row!important; + } + } +} +//動畫往上 +.hide0{ + opacity: 0; + -webkit-transform: translateY(15%) translateZ(0); + -moz-transform: translateY(15%) translateZ(0); + -o-transform: translateY(15%) translateZ(0); + -ms-transform: translateY(15%) translateZ(0); + transform: translateY(15%) translateZ(0); + -webkit-transition: transform 0.8s ease-out, opacity 0.4s ease; + -moz-transition: transform 0.8s ease-out, opacity 0.4s ease; + -o-transition: transform 0.8s ease-out, opacity 0.4s ease; + -ms-transition: transform 0.8s ease-out, opacity 0.4s ease; + transition: transform 0.8s ease-out, opacity 0.4s cubic-bezier(0.63, 0.01, 0, 1.02); +} +.animationvisible{ + opacity: 1; + -webkit-transform: translateY(0) translateZ(0); + -moz-transform: translateY(0) translateZ(0); + -o-transform: translateY(0) translateZ(0); + -ms-transform: translateY(0) translateZ(0); + transform: translateY(0) translateZ(0); +} +//動畫往右 +.hide1{ + opacity: 0; + transform: translate3d(-120px, 0, 0); + -webkit-transition: transform 0.8s ease-out, opacity 0.4s ease; + -moz-transition: transform 0.8s ease-out, opacity 0.4s ease; + -o-transition: transform 0.8s ease-out, opacity 0.4s ease; + -ms-transition: transform 0.8s ease-out, opacity 0.4s ease; + transition: transform 0.8s ease-out, opacity 0.4s cubic-bezier(0.63, 0.01, 0, 1.02); +} +.animationvisible1{ + opacity: 1; + transform: translateZ(0); +} +// 動畫往左 +.hide2{ + opacity: 0; + transform: translate3d(120px, 0, 0); + -webkit-transition: transform 0.8s ease-out, opacity 0.4s ease; + -moz-transition: transform 0.8s ease-out, opacity 0.4s ease; + -o-transition: transform 0.8s ease-out, opacity 0.4s ease; + -ms-transition: transform 0.8s ease-out, opacity 0.4s ease; + transition: transform 0.8s ease-out, opacity 0.4s cubic-bezier(0.63, 0.01, 0, 1.02); +} +.animationvisible2{ + opacity: 1; + transform: translatez(0); +} +// 動畫往下 +.hide3{ + opacity: 0; + transform: translate3d(0, -100px, 0); + -webkit-transition: transform 0.8s ease-out, opacity 0.4s ease; + -moz-transition: transform 0.8s ease-out, opacity 0.4s ease; + -o-transition: transform 0.8s ease-out, opacity 0.4s ease; + -ms-transition: transform 0.8s ease-out, opacity 0.4s ease; + transition: transform 0.8s ease-out, opacity 0.4s cubic-bezier(0.63, 0.01, 0, 1.02); +} +.animationvisible3{ + opacity: 1; + transform: translatez(0); +} +//動畫選轉 +.rotate0{ + transform: perspective(2500px) rotateY(-100deg); + overflow: hidden; + position: relative; +} +.animationrotate0{ + transform: perspective(2500px) rotateY(0); + transition-timing-function: ease; + transition-duration: 1s; +} +// 放大 +.zoomin{ + opacity: 0; + transform: scale(.6); + -webkit-transition: transform 0.8s ease-out, opacity 0.4s ease; + -moz-transition: transform 0.8s ease-out, opacity 0.4s ease; + -o-transition: transform 0.8s ease-out, opacity 0.4s ease; + -ms-transition: transform 0.8s ease-out, opacity 0.4s ease; + transition: transform 0.8s ease-out, opacity 0.4s cubic-bezier(0.63, 0.01, 0, 1.02); +} +.animationvisible5{ + opacity: 1; + transform: translatez(0) scale(1); +} +//研討會 +.seminar-index,.survey-index,.application_form-index{ + th{ + white-space: nowrap; + @media(max-width: $screen-xs){ + width: 100%; + } + } +} +input.search_box{ + background: #fff!important; + border: 1px solid #bbb!important; + border-radius: 0!important; + color: #333!important; +} +::placeholder { + color: #333!important; +} +#category_select_box{ + background: #fff!important; + color: #333!important; + border-radius: 0!important; + margin-right: 0.5em!important; +} +#category_select_box>option{ + background: #fff!important; + color: #333!important; +} +.search_widget{ + padding-top: 1em; +} +.flexwrap{ + display: flex; + flex-wrap: wrap; +} +.flexreverse{ + @media(max-width: 768px){ + display: flex; + flex-wrap: wrap-reverse!important; + } +} +.displayflex{ + @media(min-width: $screen-xs){ + display: flex; + } +} diff --git a/assets/stylesheets/template/widget/breadcrumb.scss b/assets/stylesheets/template/widget/breadcrumb.scss index 171e167..df648a3 100644 --- a/assets/stylesheets/template/widget/breadcrumb.scss +++ b/assets/stylesheets/template/widget/breadcrumb.scss @@ -1,7 +1,18 @@ @charset "utf-8"; @import "../initial"; +.breadcrumb-wrap{ + @media(min-width: 820px){ + // padding-right: 0.9375em!important; + // padding-left: 0.9375em!important; + } +} .breadcrumb { + @media(max-width: 768px){ + padding: 0; + } + margin-left: 0; + margin-bottom: 0; background-color:transparent; a:link, a:visited { color: $theme-color-main; } } @@ -12,7 +23,7 @@ &.widget1 { li { a { - font-size: 0.8125rem; + font-size: 1rem; } &:last-child { diff --git a/assets/stylesheets/template/widget/sitemenu.scss b/assets/stylesheets/template/widget/sitemenu.scss index a40a1b4..ed4bd89 100644 --- a/assets/stylesheets/template/widget/sitemenu.scss +++ b/assets/stylesheets/template/widget/sitemenu.scss @@ -1,26 +1,30 @@ @charset "utf-8"; @import "../initial"; - +.sitemenu-wrap{ + // padding-right: 0.9375em!important; + // padding-left: 0.9375em!important; +} +.sitemenu-item{ + list-style: none; +} .sitemenu-horizontal { - padding-bottom: 0.5em; + // padding-left: 1em; + // padding-bottom: 0.5em; @include clearfix; -.sitemenu-list{ - li:nth-child(1){ - a{ - color: $theme-color-second; - } - } -} .sitemenu-item.level-1 { + @media(max-width: $screen-xs){ + margin-right: 0.5em; + margin-bottom: 0.5em; + } font-size: 1rem; font-weight: 900; position: relative; float: left; margin-right: 1%; - margin-bottom: 0; + margin-bottom: 0.5em; cursor: pointer; background-color: #fff; border-radius: 2em; diff --git a/modules/gallery/_gallery_widget7.html.erb b/modules/gallery/_gallery_widget7.html.erb deleted file mode 100644 index 30083b0..0000000 --- a/modules/gallery/_gallery_widget7.html.erb +++ /dev/null @@ -1,30 +0,0 @@ -
-

- {{widget-title}} -

-
-
- - {{alt_title}} - -
- {{link_text}} -
-
-
diff --git a/modules/universal_table/index.html.erb b/modules/universal_table/index.html.erb index 6df4915..acf60e8 100644 --- a/modules/universal_table/index.html.erb +++ b/modules/universal_table/index.html.erb @@ -1,9 +1,42 @@ - +
- @@ -91,33 +124,7 @@
{{export_button}}
{{pagination_goes_here}} - -

{{table-name}}

Reset
+ -
{{title}}
+
{{title}}
-
-
-
查詢
- Reset -
-
-
-
-
-
- -
{{title}}
-
-
-
- {{form-field}} - -
-
-
-
-
-
- -
-
-
+
- + - @@ -123,25 +114,14 @@

{{table-name}}

+ Reset
+ -
{{title}}
- @@ -114,6 +104,7 @@
+
{{title}}
-
{{total_entries}}
{{export_button}}
{{pagination_goes_here}} + diff --git a/modules/universal_table/index3.html.erb b/modules/universal_table/index3.html.erb index f7d0a77..590cff5 100644 --- a/modules/universal_table/index3.html.erb +++ b/modules/universal_table/index3.html.erb @@ -1,4 +1,13 @@ -
- + +
查詢
@@ -84,7 +93,7 @@
-
+
{{title}}
@@ -116,18 +125,18 @@
{{export_button}}
{{pagination_goes_here}} diff --git a/modules/universal_table/index4.html.erb b/modules/universal_table/index4.html.erb index f7d0a77..ee6278d 100644 --- a/modules/universal_table/index4.html.erb +++ b/modules/universal_table/index4.html.erb @@ -1,4 +1,7 @@ - - + +
查詢
@@ -84,7 +87,7 @@
-
+
{{title}}
@@ -116,18 +119,18 @@
{{export_button}}
{{pagination_goes_here}} diff --git a/modules/universal_table/info.json b/modules/universal_table/info.json index 65b6842..3a6438a 100644 --- a/modules/universal_table/info.json +++ b/modules/universal_table/info.json @@ -12,27 +12,27 @@ "filename" : "index2", "name" : { "zh_tw" : "2. 含序號表格列表", - "en" : "2. Index Table with serial number" - }, - "thumbnail" : "thumb.png" - }, - { - "filename" : "index3", - "name" : { - "zh_tw" : "3. 含序號表格列表 + 多欄位搜尋", - "en" : "3. Index Table with serial number + Multiple Field Search" + "en" : "2. Index Table with serial number " }, "thumbnail" : "thumb.png", "default": true }, { - "filename" : "index4", - "name" : { - "zh_tw" : "4. 含序號表格列表new", - "en" : "4. Index Table with serial number new" - }, - "thumbnail" : "thumb.png", - "default": true - } + "filename" : "index3", + "name" : { + "zh_tw" : "3. 單純表格列表 + 多欄位搜尋", + "en" : "3. col Pure index table+ Multiple Field Search" + }, + "thumbnail" : "thumb.png" + }, + { + "filename" : "index4", + "name" : { + "zh_tw" : "4.含序號表格列表 + 多欄位搜尋", + "en" : "4. col Index Table with serial number + Multiple Field Search" + }, + "thumbnail" : "thumb.png", + "default": true + } ] } diff --git a/template.json b/template.json index adde469..ed84afd 100644 --- a/template.json +++ b/template.json @@ -1 +1 @@ -{"key":"orbit_demo_new_old3","title":"orbit_demo_new_old3_漢堡鍵選單","author":"ken","thumbnail":"assets/images/design_thumb.png"} \ No newline at end of file +{"key":"orbit_demo_new_old3","title":"orbit_demo_new_old3漢堡","author":"ken","thumbnail":"assets/images/design_thumb.png"} \ No newline at end of file diff --git a/widgets/site_menu_widget/_site_menu_widget2.html.erb b/widgets/site_menu_widget/_site_menu_widget2.html.erb index 549ddf7..409b469 100644 --- a/widgets/site_menu_widget/_site_menu_widget2.html.erb +++ b/widgets/site_menu_widget/_site_menu_widget2.html.erb @@ -17,9 +17,4 @@ -
- + \ No newline at end of file diff --git a/widgets/site_menu_widget/info.json b/widgets/site_menu_widget/info.json index 1526150..437139b 100644 --- a/widgets/site_menu_widget/info.json +++ b/widgets/site_menu_widget/info.json @@ -6,7 +6,7 @@ "zh_tw" : "1. 橫式 ( 模組標題, 網站第二層選單, 網站第三層選單 )", "en" : "1. Horizontal (widget-title, second level dropdown, third level dropdown)" }, - "thumbnail" : "thumb.png" + "thumbnail" : "site_menu_widget1_thumbs.png" }, { "filename" : "site_menu_widget2", @@ -14,7 +14,7 @@ "zh_tw" : "1. 直式 ( 模組標題, 網站第二層選單, 網站第三層選單 )", "en" : "1. Vertical (widget-title, second level dropdown, third level dropdown)" }, - "thumbnail" : "thumb.png" + "thumbnail" : "site_menu_widget2_thumbs.png" }, { "filename" : "site_menu_widget3", @@ -22,7 +22,7 @@ "zh_tw" : "2. 直式 ( 模組標題, 網站第二層選單, 網站第三層選單 )", "en" : "2. Vertical2 (widget-title, second level dropdown, third level dropdown)" }, - "thumbnail" : "thumb.png" + "thumbnail" : "site_menu_widget3_thumbs.png" }, { "filename" : "site_menu_widget4", @@ -30,7 +30,7 @@ "zh_tw" : "2. 橫式 ( 模組標題, 網站第二層選單, 網站第三層選單 )", "en" : "2. Horizontal2 (widget-title, second level dropdown, third level dropdown)" }, - "thumbnail" : "thumb.png" + "thumbnail" : "site_menu_widget4_thumbs.png" } ] diff --git a/widgets/site_menu_widget/thumbs/site_menu_widget1_thumbs.png b/widgets/site_menu_widget/thumbs/site_menu_widget1_thumbs.png new file mode 100644 index 0000000..62cca5f Binary files /dev/null and b/widgets/site_menu_widget/thumbs/site_menu_widget1_thumbs.png differ diff --git a/widgets/site_menu_widget/thumbs/site_menu_widget2_thumbs.png b/widgets/site_menu_widget/thumbs/site_menu_widget2_thumbs.png new file mode 100644 index 0000000..7732a58 Binary files /dev/null and b/widgets/site_menu_widget/thumbs/site_menu_widget2_thumbs.png differ diff --git a/widgets/site_menu_widget/thumbs/site_menu_widget3_thumbs.png b/widgets/site_menu_widget/thumbs/site_menu_widget3_thumbs.png new file mode 100644 index 0000000..5c77cf9 Binary files /dev/null and b/widgets/site_menu_widget/thumbs/site_menu_widget3_thumbs.png differ diff --git a/widgets/site_menu_widget/thumbs/site_menu_widget4_thumbs.png b/widgets/site_menu_widget/thumbs/site_menu_widget4_thumbs.png new file mode 100644 index 0000000..a418370 Binary files /dev/null and b/widgets/site_menu_widget/thumbs/site_menu_widget4_thumbs.png differ