Skip to content

Commit

Permalink
Merge branch 'develop' into seth
Browse files Browse the repository at this point in the history
  • Loading branch information
@lackdaz
lackdaz committed Jun 1, 2017
2 parents 6e4fc92 + 735feba commit 331d7bb
Show file tree
Hide file tree
Showing 13 changed files with 81,215 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ width: 100%;}
.contant-2-img{}
#contant-2 .block-right{}
.contant-2-text-area{padding-top: 102px;}
.contant-2-text-area:{}
.contant-2-text-area{}
.contant-2-header:after{background: #949C9C;
content: "";
height: 2px;
Expand Down
2 changes: 1 addition & 1 deletion public/assets/.sprockets-manifest-4ecabb7f8be46c8bdfd70765342ea359.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"files":{"application-3054f877150d25a83b44274e39ff42f396767e72e6041dd6f9d5520480145676.js":{"logical_path":"application.js","mtime":"2017-05-30T09:46:18+08:00","size":3805501,"digest":"3054f877150d25a83b44274e39ff42f396767e72e6041dd6f9d5520480145676","integrity":"sha256-MFT4dxUNJag7RCdOOf9C85Z2fnLmBB3W+dVSBIAUVnY="},"application-a5615b5e6d3b0bfed4373cb9d2fd3a2eb927bd81cfd17cbdf06d068f3566e4c5.css":{"logical_path":"application.css","mtime":"2017-05-29T19:35:53+08:00","size":124084,"digest":"a5615b5e6d3b0bfed4373cb9d2fd3a2eb927bd81cfd17cbdf06d068f3566e4c5","integrity":"sha256-pWFbXm07C/7UNzy50v06LrknvYHP0Xy98G0GjzVm5MU="},"bootstrap/glyphicons-halflings-regular-13634da87d9e23f8c3ed9108ce1724d183a39ad072e73e1b3d8cbf646d2d0407.eot":{"logical_path":"bootstrap/glyphicons-halflings-regular.eot","mtime":"2017-05-29T11:29:43+08:00","size":20127,"digest":"13634da87d9e23f8c3ed9108ce1724d183a39ad072e73e1b3d8cbf646d2d0407","integrity":"sha256-E2NNqH2eI/jD7ZEIzhck0YOjmtBy5z4bPYy/ZG0tBAc="},"bootstrap/glyphicons-halflings-regular-fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c.woff2":{"logical_path":"bootstrap/glyphicons-halflings-regular.woff2","mtime":"2017-05-29T11:29:43+08:00","size":18028,"digest":"fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c","integrity":"sha256-/hhdEaSWdokNR7t4MxKgzaWkTEA5IUCU55V7TAQO8Rw="},"bootstrap/glyphicons-halflings-regular-a26394f7ede100ca118eff2eda08596275a9839b959c226e15439557a5a80742.woff":{"logical_path":"bootstrap/glyphicons-halflings-regular.woff","mtime":"2017-05-29T11:29:43+08:00","size":23424,"digest":"a26394f7ede100ca118eff2eda08596275a9839b959c226e15439557a5a80742","integrity":"sha256-omOU9+3hAMoRjv8u2ghZYnWpg5uVnCJuFUOVV6WoB0I="},"bootstrap/glyphicons-halflings-regular-e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456.ttf":{"logical_path":"bootstrap/glyphicons-halflings-regular.ttf","mtime":"2017-05-29T11:29:43+08:00","size":45404,"digest":"e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456","integrity":"sha256-45UEQJN1fYKvyxOJV9BqHqk2G9zwtELQahioBRr1dFY="},"bootstrap/glyphicons-halflings-regular-42f60659d265c1a3c30f9fa42abcbb56bd4a53af4d83d316d6dd7a36903c43e5.svg":{"logical_path":"bootstrap/glyphicons-halflings-regular.svg","mtime":"2017-05-29T11:29:43+08:00","size":108738,"digest":"42f60659d265c1a3c30f9fa42abcbb56bd4a53af4d83d316d6dd7a36903c43e5","integrity":"sha256-QvYGWdJlwaPDD5+kKry7Vr1KU69Ng9MW1t16NpA8Q+U="},"application-ab7510fc8c737556d3a7c7a03ae5f665403c2b6bfa03ba06493a1a0b20c66042.js":{"logical_path":"application.js","mtime":"2017-05-31T15:33:57+08:00","size":2813530,"digest":"ab7510fc8c737556d3a7c7a03ae5f665403c2b6bfa03ba06493a1a0b20c66042","integrity":"sha256-q3UQ/IxzdVbTp8egOuX2ZUA8K2v6A7oGSToaCyDGYEI="},"application-933eb9c07dcb92140c5a20e0ebee1cd9687f760c11d9142544c31e8f889475bf.css":{"logical_path":"application.css","mtime":"2017-06-01T00:07:16+08:00","size":124125,"digest":"933eb9c07dcb92140c5a20e0ebee1cd9687f760c11d9142544c31e8f889475bf","integrity":"sha256-kz65wH3LkhQMWiDg6+4c2Wh/dgwR2RQlRMMej4iUdb8="},"application-075ba01819d1206ecb160911f1370a6c10357e0390d02dd10db44b6bd6aaa1ac.js":{"logical_path":"application.js","mtime":"2017-06-01T00:39:04+08:00","size":2828733,"digest":"075ba01819d1206ecb160911f1370a6c10357e0390d02dd10db44b6bd6aaa1ac","integrity":"sha256-B1ugGBnRIG7LFgkR8TcKbBA1fgOQ0C3RDbRLa9aqoaw="}},"assets":{"application.js":"application-075ba01819d1206ecb160911f1370a6c10357e0390d02dd10db44b6bd6aaa1ac.js","application.css":"application-933eb9c07dcb92140c5a20e0ebee1cd9687f760c11d9142544c31e8f889475bf.css","bootstrap/glyphicons-halflings-regular.eot":"bootstrap/glyphicons-halflings-regular-13634da87d9e23f8c3ed9108ce1724d183a39ad072e73e1b3d8cbf646d2d0407.eot","bootstrap/glyphicons-halflings-regular.woff2":"bootstrap/glyphicons-halflings-regular-fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c.woff2","bootstrap/glyphicons-halflings-regular.woff":"bootstrap/glyphicons-halflings-regular-a26394f7ede100ca118eff2eda08596275a9839b959c226e15439557a5a80742.woff","bootstrap/glyphicons-halflings-regular.ttf":"bootstrap/glyphicons-halflings-regular-e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456.ttf","bootstrap/glyphicons-halflings-regular.svg":"bootstrap/glyphicons-halflings-regular-42f60659d265c1a3c30f9fa42abcbb56bd4a53af4d83d316d6dd7a36903c43e5.svg"}}
{"files":{"application-3054f877150d25a83b44274e39ff42f396767e72e6041dd6f9d5520480145676.js":{"logical_path":"application.js","mtime":"2017-05-30T09:46:18+08:00","size":3805501,"digest":"3054f877150d25a83b44274e39ff42f396767e72e6041dd6f9d5520480145676","integrity":"sha256-MFT4dxUNJag7RCdOOf9C85Z2fnLmBB3W+dVSBIAUVnY="},"application-a5615b5e6d3b0bfed4373cb9d2fd3a2eb927bd81cfd17cbdf06d068f3566e4c5.css":{"logical_path":"application.css","mtime":"2017-05-29T19:35:53+08:00","size":124084,"digest":"a5615b5e6d3b0bfed4373cb9d2fd3a2eb927bd81cfd17cbdf06d068f3566e4c5","integrity":"sha256-pWFbXm07C/7UNzy50v06LrknvYHP0Xy98G0GjzVm5MU="},"bootstrap/glyphicons-halflings-regular-13634da87d9e23f8c3ed9108ce1724d183a39ad072e73e1b3d8cbf646d2d0407.eot":{"logical_path":"bootstrap/glyphicons-halflings-regular.eot","mtime":"2017-05-29T11:29:43+08:00","size":20127,"digest":"13634da87d9e23f8c3ed9108ce1724d183a39ad072e73e1b3d8cbf646d2d0407","integrity":"sha256-E2NNqH2eI/jD7ZEIzhck0YOjmtBy5z4bPYy/ZG0tBAc="},"bootstrap/glyphicons-halflings-regular-fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c.woff2":{"logical_path":"bootstrap/glyphicons-halflings-regular.woff2","mtime":"2017-05-29T11:29:43+08:00","size":18028,"digest":"fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c","integrity":"sha256-/hhdEaSWdokNR7t4MxKgzaWkTEA5IUCU55V7TAQO8Rw="},"bootstrap/glyphicons-halflings-regular-a26394f7ede100ca118eff2eda08596275a9839b959c226e15439557a5a80742.woff":{"logical_path":"bootstrap/glyphicons-halflings-regular.woff","mtime":"2017-05-29T11:29:43+08:00","size":23424,"digest":"a26394f7ede100ca118eff2eda08596275a9839b959c226e15439557a5a80742","integrity":"sha256-omOU9+3hAMoRjv8u2ghZYnWpg5uVnCJuFUOVV6WoB0I="},"bootstrap/glyphicons-halflings-regular-e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456.ttf":{"logical_path":"bootstrap/glyphicons-halflings-regular.ttf","mtime":"2017-05-29T11:29:43+08:00","size":45404,"digest":"e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456","integrity":"sha256-45UEQJN1fYKvyxOJV9BqHqk2G9zwtELQahioBRr1dFY="},"bootstrap/glyphicons-halflings-regular-42f60659d265c1a3c30f9fa42abcbb56bd4a53af4d83d316d6dd7a36903c43e5.svg":{"logical_path":"bootstrap/glyphicons-halflings-regular.svg","mtime":"2017-05-29T11:29:43+08:00","size":108738,"digest":"42f60659d265c1a3c30f9fa42abcbb56bd4a53af4d83d316d6dd7a36903c43e5","integrity":"sha256-QvYGWdJlwaPDD5+kKry7Vr1KU69Ng9MW1t16NpA8Q+U="},"application-ab7510fc8c737556d3a7c7a03ae5f665403c2b6bfa03ba06493a1a0b20c66042.js":{"logical_path":"application.js","mtime":"2017-05-31T15:33:57+08:00","size":2813530,"digest":"ab7510fc8c737556d3a7c7a03ae5f665403c2b6bfa03ba06493a1a0b20c66042","integrity":"sha256-q3UQ/IxzdVbTp8egOuX2ZUA8K2v6A7oGSToaCyDGYEI="},"application-933eb9c07dcb92140c5a20e0ebee1cd9687f760c11d9142544c31e8f889475bf.css":{"logical_path":"application.css","mtime":"2017-06-01T00:07:16+08:00","size":124125,"digest":"933eb9c07dcb92140c5a20e0ebee1cd9687f760c11d9142544c31e8f889475bf","integrity":"sha256-kz65wH3LkhQMWiDg6+4c2Wh/dgwR2RQlRMMej4iUdb8="},"application-075ba01819d1206ecb160911f1370a6c10357e0390d02dd10db44b6bd6aaa1ac.js":{"logical_path":"application.js","mtime":"2017-06-01T00:39:04+08:00","size":2828733,"digest":"075ba01819d1206ecb160911f1370a6c10357e0390d02dd10db44b6bd6aaa1ac","integrity":"sha256-B1ugGBnRIG7LFgkR8TcKbBA1fgOQ0C3RDbRLa9aqoaw="},"font-awesome.min-ea088160e6e7e76ad4e7fc0c0c676fa353c33b736cee08b98f7077c729460edb.css":{"logical_path":"font-awesome.min.css","mtime":"2017-06-01T18:59:12+08:00","size":20767,"digest":"ea088160e6e7e76ad4e7fc0c0c676fa353c33b736cee08b98f7077c729460edb","integrity":"sha256-6giBYObn52rU5/wMDGdvo1PDO3Ns7gi5j3B3xylGDts="},"main-2af4889d61d722bc75acfeb63eb7c516b4ac81edcda20f7e4e506699c6606679.css":{"logical_path":"main.css","mtime":"2017-06-01T19:09:35+08:00","size":9762,"digest":"2af4889d61d722bc75acfeb63eb7c516b4ac81edcda20f7e4e506699c6606679","integrity":"sha256-KvSInWHXIrx1rP62PrfFFrSsge3Nog9+TlBmmcZgZnk="},"responsive-ec0b489d4b940106abe96964ae325af2b31c415f60fe5a7005ee4e07b98496f1.css":{"logical_path":"responsive.css","mtime":"2017-06-01T18:59:12+08:00","size":2435,"digest":"ec0b489d4b940106abe96964ae325af2b31c415f60fe5a7005ee4e07b98496f1","integrity":"sha256-7AtInUuUAQar6WlkrjJa8rMcQV9g/lpwBe5OB7mElvE="},"main-3d8ad4fc8ef41ec7cbbe35525a63d39e7d4409aee7e314d7b6669c9091a5dc80.js":{"logical_path":"main.js","mtime":"2017-06-01T18:59:12+08:00","size":484,"digest":"3d8ad4fc8ef41ec7cbbe35525a63d39e7d4409aee7e314d7b6669c9091a5dc80","integrity":"sha256-PYrU/I70HsfLvjVSWmPTnn1ECa7n4xTXtmackJGl3IA="},"plugins-294bd6c5d46cfd5fb5c6d732329b752e7097fc2ce0170d857f734d5c868c1d84.js":{"logical_path":"plugins.js","mtime":"2017-06-01T18:59:12+08:00","size":7049,"digest":"294bd6c5d46cfd5fb5c6d732329b752e7097fc2ce0170d857f734d5c868c1d84","integrity":"sha256-KUvWxdRs/V+1xtcyMpt1LnCX/CzgFw2Ff3NNXIaMHYQ="},"owl.carousel.min-ee217c0bc23f4d8dd78f1859aa30cfc915864228ad3d2077f9ad2befc8c4626e.js":{"logical_path":"owl.carousel.min.js","mtime":"2017-06-01T18:59:12+08:00","size":23891,"digest":"ee217c0bc23f4d8dd78f1859aa30cfc915864228ad3d2077f9ad2befc8c4626e","integrity":"sha256-7iF8C8I/TY3XjxhZqjDPyRWGQiitPSB3+a0r78jEYm4="},"jquery.typer-e71d62f0ea23937ee17f0fa4f18409702209466ddfb223862a7d4e97e942f823.js":{"logical_path":"jquery.typer.js","mtime":"2017-06-01T18:59:12+08:00","size":5515,"digest":"e71d62f0ea23937ee17f0fa4f18409702209466ddfb223862a7d4e97e942f823","integrity":"sha256-5x1i8Oojk37hfw+k8YQJcCIJRm3fsiOGKn1Ol+lC+CM="},"logo2-f07bc823c52d83ed2e94a7e978e40ca29d1070973ae83d2e6f4e027b7b031a49.png":{"logical_path":"logo2.png","mtime":"2017-06-01T18:59:12+08:00","size":9172,"digest":"f07bc823c52d83ed2e94a7e978e40ca29d1070973ae83d2e6f4e027b7b031a49","integrity":"sha256-8HvII8Utg+0ulKfpeOQMop0QcJc66D0ub04Ce3sDGkk="},"application-248f5fe0416be86663add067f44497c479baa309d4022585d4f3893d42e330e7.js":{"logical_path":"application.js","mtime":"2017-06-01T19:09:51+08:00","size":2879627,"digest":"248f5fe0416be86663add067f44497c479baa309d4022585d4f3893d42e330e7","integrity":"sha256-JI9f4EFr6GZjrdBn9ESXxHm6ownUAiWF1POJPULjMOc="},"application-717a36f430051fa17210d97f49cd7a2209cd9e8773500cc34d601c15d996a92f.css":{"logical_path":"application.css","mtime":"2017-06-01T18:59:12+08:00","size":124180,"digest":"717a36f430051fa17210d97f49cd7a2209cd9e8773500cc34d601c15d996a92f","integrity":"sha256-cXo29DAFH6FyENl/Sc16IgnNnodzUAzDTWAcFdmWqS8="}},"assets":{"application.js":"application-248f5fe0416be86663add067f44497c479baa309d4022585d4f3893d42e330e7.js","application.css":"application-717a36f430051fa17210d97f49cd7a2209cd9e8773500cc34d601c15d996a92f.css","bootstrap/glyphicons-halflings-regular.eot":"bootstrap/glyphicons-halflings-regular-13634da87d9e23f8c3ed9108ce1724d183a39ad072e73e1b3d8cbf646d2d0407.eot","bootstrap/glyphicons-halflings-regular.woff2":"bootstrap/glyphicons-halflings-regular-fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c.woff2","bootstrap/glyphicons-halflings-regular.woff":"bootstrap/glyphicons-halflings-regular-a26394f7ede100ca118eff2eda08596275a9839b959c226e15439557a5a80742.woff","bootstrap/glyphicons-halflings-regular.ttf":"bootstrap/glyphicons-halflings-regular-e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456.ttf","bootstrap/glyphicons-halflings-regular.svg":"bootstrap/glyphicons-halflings-regular-42f60659d265c1a3c30f9fa42abcbb56bd4a53af4d83d316d6dd7a36903c43e5.svg","font-awesome.min.css":"font-awesome.min-ea088160e6e7e76ad4e7fc0c0c676fa353c33b736cee08b98f7077c729460edb.css","main.css":"main-2af4889d61d722bc75acfeb63eb7c516b4ac81edcda20f7e4e506699c6606679.css","responsive.css":"responsive-ec0b489d4b940106abe96964ae325af2b31c415f60fe5a7005ee4e07b98496f1.css","main.js":"main-3d8ad4fc8ef41ec7cbbe35525a63d39e7d4409aee7e314d7b6669c9091a5dc80.js","plugins.js":"plugins-294bd6c5d46cfd5fb5c6d732329b752e7097fc2ce0170d857f734d5c868c1d84.js","owl.carousel.min.js":"owl.carousel.min-ee217c0bc23f4d8dd78f1859aa30cfc915864228ad3d2077f9ad2befc8c4626e.js","jquery.typer.js":"jquery.typer-e71d62f0ea23937ee17f0fa4f18409702209466ddfb223862a7d4e97e942f823.js","logo2.png":"logo2-f07bc823c52d83ed2e94a7e978e40ca29d1070973ae83d2e6f4e027b7b031a49.png"}}
Loading

0 comments on commit 331d7bb

Please sign in to comment.