mmoser/skill-assessment-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jennifer Siegfried 2016-08-04 07:54:38 -06:00
parent cff2985c01
commit 2f75164bcd
2 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/live-coder.js → app/assets/javascripts/live-coder.js.erb
View File

@ -14,19 +14,24 @@ function updateResults(elem) {
codeFrame.setAttribute("height", "100%");
resultsContainer.appendChild(codeFrame);
var jqueryNode = document.createElement("script");
jqueryNode.setAttribute("type", "text/javascript");
jqueryNode.setAttribute("src", "<%= "//#{ENV['full_app_url']}#{javascript_path "jquery"}" %>");
iHead.appendChild(jqueryNode);
var codeStyle = document.createElement("style");
codeStyle.setAttribute("type", "text/css");
var rulesNode = document.createTextNode(codeCss);
codeStyle.appendChild(rulesNode);
iHead.appendChild(codeStyle);
iDoc.appendChild(iHead);
iDoc.appendChild(iHead);
iBody.innerHTML = codeHtml;
iDoc.appendChild(iBody);
var codeScript = document.createElement("script");
codeScript.setAttribute("type", "text/javascript");
var scriptNode = document.createTextNode(codeJs);
var scriptNode = document.createTextNode("setTimeout(function(){ " + codeJs + "}, 800);");
codeScript.appendChild(scriptNode);
iDoc.appendChild(codeScript);

103
app/assets/stylesheets/atoms/_fonts.scss
View File

@ -3,62 +3,63 @@
@font-face {
font-family: 'HalisR';
src:local('Halis R Thin'),
font-url('HalisR-Thin.woff2') format('woff2'),
font-url('HalisR-Thin.woff') format('woff'),
font-url('HalisR-Thin.otf') format('opentype');
font_url('HalisR-Thin.woff2') format('woff2'),
font_url('HalisR-Thin.woff') format('woff'),
font_url('HalisR-Thin.otf') format('opentype');
font-weight:100;
}
@font-face {
font-family: 'HalisR';
src:local('Halis R Light'),
font-url('HalisR-Light.woff2') format('woff2'),
font-url('HalisR-Light.woff') format('woff'),
font-url('HalisR-Light.otf') format('opentype');
font_url('HalisR-Light.woff2') format('woff2'),
font_url('HalisR-Light.woff') format('woff'),
font_url('HalisR-Light.otf') format('opentype');
font-weight:200;
}
@font-face {
font-family: 'HalisR';
src:local('Halis R Book'),
font-url('HalisR-Book.woff2') format('woff2'),
font-url('HalisR-Book.woff') format('woff'),
font-url('HalisR-Book.otf') format('opentype');
font_url('HalisR-Book.woff2') format('woff2'),
font_url('HalisR-Book.woff') format('woff'),
font_url('HalisR-Book.otf') format('opentype');
font-weight:300;
}
@font-face {
font-family: 'HalisR';
src:local('Halis R Regular'),
font-url('HalisR-Regular.woff2') format('woff2'),
font-url('HalisR-Regular.woff') format('woff'),
font-url('HalisR-Regular.otf') format('opentype');
font_url('HalisR-Regular.woff2') format('woff2'),
font_url('HalisR-Regular.woff') format('woff'),
font_url('HalisR-Regular.otf') format('opentype');
font-weight:500;
}
@font-face {
font-family: 'HalisR';
src:local('Halis R Medium'),
font-url('HalisR-Medium.woff2') format('woff2'),
font-url('HalisR-Medium.woff') format('woff'),
font-url('HalisR-Medium.otf') format('opentype');
font_url('HalisR-Medium.woff2') format('woff2'),
font_url('HalisR-Medium.woff') format('woff'),
font_url('HalisR-Medium.otf') format('opentype');
font-weight:600;
}
@font-face {
font-family: 'HalisR';
src:local('Halis R Bold'),
font-url('HalisR-Bold.woff2') format('woff2'),
font-url('HalisR-Bold.woff') format('woff'),
font-url('HalisR-Bold.otf') format('opentype');
font_url('HalisR-Bold.woff2') format('woff2'),
font_url('HalisR-Bold.woff') format('woff'),
font_url('HalisR-Bold.otf') format('opentype');
font-weight:700;
}
@font-face {
font-family: 'HalisR';
src:local('Halis R Black'),
font-url('HalisR-Black.woff2') format('woff2'),
font-url('HalisR-Black.woff') format('woff'),
font-url('HalisR-Black.otf') format('opentype');
font_url('HalisR-Black.woff2') format('woff2'),
font_url('HalisR-Black.woff') format('woff'),
font_url('HalisR-Black.otf') format('opentype');
font-weight:900;
}
@ -69,44 +70,44 @@
@font-face {
font-family: 'Lato';
src:local('Lato Hairline'),
font-url('Lato-Hairline.woff2') format('woff2'),
font-url('Lato-Hairline.woff') format('woff'),
font-url('Lato-Hairline.ttf') format('truetype');
font_url('Lato-Hairline.woff2') format('woff2'),
font_url('Lato-Hairline.woff') format('woff'),
font_url('Lato-Hairline.ttf') format('truetype');
font-weight:100;
}
@font-face {
font-family: 'Lato';
src:local('Lato Light'),
font-url('Lato-Light.woff2') format('woff2'),
font-url('Lato-Light.woff') format('woff'),
font-url('Lato-Light.ttf') format('truetype');
font_url('Lato-Light.woff2') format('woff2'),
font_url('Lato-Light.woff') format('woff'),
font_url('Lato-Light.ttf') format('truetype');
font-weight:300;
}
@font-face {
font-family: 'Lato';
src:local('Lato Regular'),
font-url('Lato-Regular.woff2') format('woff2'),
font-url('Lato-Regular.woff') format('woff'),
font-url('Lato-Regular.ttf') format('truetype');
font_url('Lato-Regular.woff2') format('woff2'),
font_url('Lato-Regular.woff') format('woff'),
font_url('Lato-Regular.ttf') format('truetype');
font-weight:500;
}
@font-face {
font-family: 'Lato';
src:local('Lato Bold'),
font-url('Lato-Bold.woff2') format('woff2'),
font-url('Lato-Bold.woff') format('woff'),
font-url('Lato-Bold.ttf') format('truetype');
font_url('Lato-Bold.woff2') format('woff2'),
font_url('Lato-Bold.woff') format('woff'),
font_url('Lato-Bold.ttf') format('truetype');
font-weight:700;
}
@font-face {
font-family: 'Lato';
src:local('Lato Black'),
font-url('Lato-Black.woff2') format('woff2'),
font-url('Lato-Black.woff') format('woff'),
font-url('Lato-Black.ttf') format('truetype');
font_url('Lato-Black.woff2') format('woff2'),
font_url('Lato-Black.woff') format('woff'),
font_url('Lato-Black.ttf') format('truetype');
font-weight:900;
}
@ -115,18 +116,18 @@
@font-face {
font-family: 'Lato';
src:local('Lato Hairline Italic'),
font-url('Lato-HairlineItalic.woff2') format('woff2'),
font-url('Lato-HairlineItalic.woff') format('woff'),
font-url('Lato-HairlineItalic.ttf') format('truetype');
font_url('Lato-HairlineItalic.woff2') format('woff2'),
font_url('Lato-HairlineItalic.woff') format('woff'),
font_url('Lato-HairlineItalic.ttf') format('truetype');
font-weight:100;
font-style: italic;
}
@font-face {
font-family: 'Lato';
src:local('Lato Light Italic'),
font-url('Lato-LightItalic.woff2') format('woff2'),
font-url('Lato-LightItalic.woff') format('woff'),
font-url('Lato-LightItalic.ttf') format('truetype');
font_url('Lato-LightItalic.woff2') format('woff2'),
font_url('Lato-LightItalic.woff') format('woff'),
font_url('Lato-LightItalic.ttf') format('truetype');
font-weight:300;
font-style: italic;
}
@ -134,9 +135,9 @@
@font-face {
font-family: 'Lato';
src:local('Lato Italic'),
font-url('Lato-Italic.woff2') format('woff2'),
font-url('Lato-Italic.woff') format('woff'),
font-url('Lato-Italic.ttf') format('truetype');
font_url('Lato-Italic.woff2') format('woff2'),
font_url('Lato-Italic.woff') format('woff'),
font_url('Lato-Italic.ttf') format('truetype');
font-weight:500;
font-style: italic;
}
@ -144,9 +145,9 @@
@font-face {
font-family: 'Lato';
src:local('Lato Bold Italic'),
font-url('Lato-BoldItalic.woff2') format('woff2'),
font-url('Lato-BoldItalic.woff') format('woff'),
font-url('Lato-BoldItalic.ttf') format('truetype');
font_url('Lato-BoldItalic.woff2') format('woff2'),
font_url('Lato-BoldItalic.woff') format('woff'),
font_url('Lato-BoldItalic.ttf') format('truetype');
font-weight:700;
font-style: italic;
}
@ -154,9 +155,9 @@
@font-face {
font-family: 'Lato';
src:local('Lato Black Italic'),
font-url('Lato-BlackItalic.woff2') format('woff2'),
font-url('Lato-BlackItalic.woff') format('woff'),
font-url('Lato-BlackItalic.ttf') format('truetype');
font_url('Lato-BlackItalic.woff2') format('woff2'),
font_url('Lato-BlackItalic.woff') format('woff'),
font_url('Lato-BlackItalic.ttf') format('truetype');
font-weight:900;
font-style: italic;
}