paoda
/
polyglot
mirror of https://github.com/beatriceo/polyglot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #53 from beatriceo/revert-52-brandi 

Revert "done"
This commit is contained in:
Beatrice Olivera 2018-09-04 12:04:34 +01:00 committed by GitHub
parent 64acc6fe35 7e728b6fbd
commit a42f72974a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/pages/_home.scss
View File

@ -31,5 +31,3 @@ video {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }

13
app/javascript/components/banner.js
View File

@ -1,13 +0,0 @@
import Typed from 'typed.js';
function loadDynamicBannerText() {
new Typed('#banner-typed-text', {
strings: ["Language is not a barrier anymore", "Stay connected"],
typeSpeed: 50,
loop: true
});
}
export { loadDynamicBannerText };

3
app/javascript/packs/application.js
View File

@ -3,9 +3,6 @@ import ActionCable from 'actioncable'
import { triggerModalEvent } from "../components/modal.js"; import { triggerModalEvent } from "../components/modal.js";
import { loadDynamicBannerText } from '../components/banner';
loadDynamicBannerText();
triggerModalEvent(); triggerModalEvent();
const settingsPage = document.getElementById('settings-page'); const settingsPage = document.getElementById('settings-page');

3
app/views/pages/home.html.erb
View File

@ -1,8 +1,5 @@
<div class="banner" style="background-image: linear-gradient(-225deg, rgba(5,25,55,0.3) 0%, rgba(68,73,101,0.3),rgba(128,129,149,0.3),rgba(191,190,200,0.3),rgba(255,255,255,0.3) 50%), url('<%= image_path 'phone.jpg' %>');"> <div class="banner" style="background-image: linear-gradient(-225deg, rgba(5,25,55,0.3) 0%, rgba(68,73,101,0.3),rgba(128,129,149,0.3),rgba(191,190,200,0.3),rgba(255,255,255,0.3) 50%), url('<%= image_path 'phone.jpg' %>');">
<div class="banner-content"> <div class="banner-content">
<p>
<span id="banner-typed-text"></span>
</p>
<h1>Make a call</h1> <h1>Make a call</h1>
<p>Communicate in different languages</p> <p>Communicate in different languages</p>
<p>and receive real-time translated</p> <p>and receive real-time translated</p>

3
package.json
View File

@ -6,8 +6,7 @@
"actioncable": "^5.2.1", "actioncable": "^5.2.1",
"babel-plugin-transform-runtime": "^6.23.0", "babel-plugin-transform-runtime": "^6.23.0",
"bootstrap": "3", "bootstrap": "3",
"jquery": "^3.3.1", "jquery": "^3.3.1"
"typed.js": "^2.0.9"
}, },
"devDependencies": { "devDependencies": {
"webpack-dev-server": "2.11.2" "webpack-dev-server": "2.11.2"

4
yarn.lock
View File

@ -5524,10 +5524,6 @@ type-is@~1.6.15, type-is@~1.6.16:
media-typer "0.3.0" media-typer "0.3.0"
mime-types "~2.1.18" mime-types "~2.1.18"
typed.js@^2.0.9:
version "2.0.9"
resolved "https://registry.yarnpkg.com/typed.js/-/typed.js-2.0.9.tgz#2e4e590466938ecb2ef5ec966a79b2d9381495ff"
typedarray@^0.0.6: typedarray@^0.0.6:
version "0.0.6" version "0.0.6"
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"