1
0
mirror of https://github.com/bobwen-dev/react-templates synced 2025-04-12 00:56:39 +02:00

cleanup css, remove hr, update dependecies

This commit is contained in:
ido 2015-01-01 10:19:50 +02:00
parent 0acb98b7ce
commit 2f9824be85
8 changed files with 1463 additions and 1558 deletions

View File

@ -86,14 +86,19 @@ module.exports = function (grunt) {
}, },
requirejs: { requirejs: {
compile: { compile: {
options: eval(require('fs').readFileSync('./home.config.js').toString()) options: readConfig('./home.config.js')
}, },
playground: { playground: {
options: eval(require('fs').readFileSync('./playground.config.js').toString()) options: readConfig('./home.config.js')
} }
} }
}); });
function readConfig(file) {
/*eslint no-eval:0*/
return eval(require('fs').readFileSync(file).toString());
}
grunt.loadNpmTasks('grunt-browserify'); grunt.loadNpmTasks('grunt-browserify');
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-requirejs'); grunt.loadNpmTasks('grunt-contrib-requirejs');

View File

@ -22,6 +22,7 @@
<link rel="stylesheet" href="playground/css/playground.css"/> <link rel="stylesheet" href="playground/css/playground.css"/>
<link rel="stylesheet" href="playground/css/home.css"/> <link rel="stylesheet" href="playground/css/home.css"/>
<!--<link rel="stylesheet" href="playground/dist/css/tidy.css"/>-->
</head> </head>
<body> <body>
@ -30,8 +31,7 @@
<div class="nav-main"> <div class="nav-main">
<div class="wrap"> <div class="wrap">
<a class="nav-home" href="index.html"> <a class="nav-home" href="index.html">
<img class="nav-logo" src="https://wix.github.io/react-templates/img/logo-rt.svg" width="56" <img class="nav-logo" src="https://wix.github.io/react-templates/img/logo-rt.svg" width="56" height="24" />
height="24">
<span>React Templates</span> <span>React Templates</span>
</a> </a>
<ul class="nav-site"> <ul class="nav-site">
@ -43,8 +43,7 @@
</div> </div>
</div> </div>
<a href="https://github.com/wix/react-templates"> <a href="https://github.com/wix/react-templates">
<img style="position: fixed; top: 0; right: 0; border: 0; z-index: 101" src="img/github-fork-me.png" <img class="img-fork-github" src="img/github-fork-me.png" alt="Fork me on GitHub" />
alt="Fork me on GitHub">
</a> </a>
<div class="hero"> <div class="hero">
@ -77,7 +76,6 @@
Loading... Loading...
</div> </div>
</section> </section>
<hr class="home-divider"/>
</section> </section>
<footer class="footer"> <footer class="footer">
@ -86,12 +84,7 @@
</div> </div>
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script> <script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
<!--<script src="playground/libs/ace-builds-1.1.8/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8"></script>-->
<script src="playground/dist/rt-main.browser.min.js"></script> <script src="playground/dist/rt-main.browser.min.js"></script>
<!--<script data-main="playground/home-main.js" src="http://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.15/require.js"></script>-->
<!--<script src="http://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.15/require.js"></script>-->
<!--http://requirejs.org/docs/release/2.1.15/minified/require.js-->
<!--<script data-main="playground/home-main.js" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.15/require.min.js"></script>--> <!--<script data-main="playground/home-main.js" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.15/require.min.js"></script>-->
<script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.15/require.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.15/require.min.js"></script>
<script src="playground/dist/home.min.js"></script> <script src="playground/dist/home.min.js"></script>

View File

@ -25,7 +25,7 @@
"escodegen": "^1.4.1", "escodegen": "^1.4.1",
"esprima": "^1.2.2", "esprima": "^1.2.2",
"lodash": "^2.4.1", "lodash": "^2.4.1",
"optionator": "^0.4.0", "optionator": "^0.5.0",
"text-table": "^0.2.0" "text-table": "^0.2.0"
}, },
"devDependencies": { "devDependencies": {
@ -34,11 +34,11 @@
"grunt": "^0.4.5", "grunt": "^0.4.5",
"grunt-browserify": "^3.2.0", "grunt-browserify": "^3.2.0",
"grunt-contrib-requirejs": "^0.4.4", "grunt-contrib-requirejs": "^0.4.4",
"grunt-contrib-uglify": "^0.6.0", "grunt-contrib-uglify": "^0.7.0",
"grunt-contrib-watch": "^0.6.1", "grunt-contrib-watch": "^0.6.1",
"grunt-eslint": "^2.1.0", "grunt-eslint": "^3.0.0",
"grunt-node-tap": "^0.1.61", "grunt-node-tap": "^0.1.61",
"react": "^0.12.0", "react": "^0.12.2",
"tape": "^3.0.2" "tape": "^3.0.2"
}, },
"keywords": [ "keywords": [

View File

@ -57,12 +57,12 @@ define(['react', 'lodash', 'jquery', './libs/codemirror-4.8/lib/codemirror'], fu
tt.appendChild(content.cloneNode(true)); tt.appendChild(content.cloneNode(true));
document.body.appendChild(tt); document.body.appendChild(tt);
function position(e) { function position(ev) {
if (!tt.parentNode) { if (!tt.parentNode) {
return CodeMirror.off(document, 'mousemove', position); return CodeMirror.off(document, 'mousemove', position);
} }
tt.style.top = Math.max(0, e.clientY - tt.offsetHeight - 5) + 'px'; tt.style.top = Math.max(0, ev.clientY - tt.offsetHeight - 5) + 'px';
tt.style.left = (e.clientX + 5) + 'px'; tt.style.left = (ev.clientX + 5) + 'px';
} }
CodeMirror.on(document, 'mousemove', position); CodeMirror.on(document, 'mousemove', position);
position(e); position(e);

View File

@ -332,13 +332,13 @@ html {
background: #f9f9f9 background: #f9f9f9
} }
.left { /*.left {*/
float: left /*float: left*/
} /*}*/
.right { /*.right {*/
float: right /*float: right*/
} /*}*/
.container { .container {
padding-top: 50px; padding-top: 50px;
@ -356,13 +356,13 @@ html {
padding-right: 20px padding-right: 20px
} }
.skinnyWrap { /*.skinnyWrap {*/
width: 690px; /*width: 690px;*/
margin-left: auto; /*margin-left: auto;*/
margin-right: auto; /*margin-right: auto;*/
padding-left: 20px; /*padding-left: 20px;*/
padding-right: 20px /*padding-right: 20px*/
} /*}*/
hr { hr {
height: 0; height: 0;
@ -528,9 +528,9 @@ h1:hover .hash-link, h2:hover .hash-link, h3:hover .hash-link, h4:hover .hash-li
background: #c5695c background: #c5695c
} }
.buttons-unit.downloads { /*.buttons-unit.downloads {*/
margin: 30px 0 /*margin: 30px 0*/
} /*}*/
.nav-docs { .nav-docs {
color: #2d2d2d; color: #2d2d2d;
@ -603,53 +603,53 @@ h1:hover .hash-link, h2:hover .hash-link, h3:hover .hash-link, h4:hover .hash-li
width: 960px width: 960px
} }
.skinny-row:after { /**.skinny-row:after {
content: ""; content: "";
display: table; display: table;
clear: both clear: both
} }
**/
.skinny-col { /**.skinny-col {
float: left; float: left;
margin-left: 40px; margin-left: 40px;
width: 305px width: 305px
} }
**/
.skinny-col:first-child { /**.skinny-col:first-child {
margin-left: 0 margin-left: 0
} }
**/
.marketing-row { /**.marketing-row {
margin: 50px 0 margin: 50px 0
} }
**/
.marketing-row:after { /**.marketing-row:after {
content: ""; content: "";
display: table; display: table;
clear: both clear: both
} }
**/
.marketing-col { /**.marketing-col {
float: left; float: left;
margin-left: 40px; margin-left: 40px;
width: 280px width: 280px
} }
**/
.marketing-col h3 { /**.marketing-col h3 {
color: #2d2d2d; color: #2d2d2d;
font-size: 24px; font-size: 24px;
font-weight: normal; font-weight: normal;
text-transform: uppercase text-transform: uppercase
} }
**/
.marketing-col p { /**.marketing-col p {
font-size: 16px font-size: 16px
} }
**/
.marketing-col:first-child { /**.marketing-col:first-child {
margin-left: 0 margin-left: 0
} }
**/
h3 { h3 {
color: #2d2d2d; color: #2d2d2d;
font-size: 24px; font-size: 24px;
@ -780,35 +780,35 @@ section.black content {
padding-bottom: 40px padding-bottom: 40px
} }
.jsxCompiler { /*.jsxCompiler {*/
margin: 0 auto; /*margin: 0 auto;*/
padding-top: 20px; /*padding-top: 20px;*/
width: 1220px /*width: 1220px*/
} /*}*/
.jsxCompiler label.compiler-option { /*.jsxCompiler label.compiler-option {*/
display: block; /*display: block;*/
margin-top: 5px /*margin-top: 5px*/
} /*}*/
.jsxCompiler #jsxCompiler { /*.jsxCompiler #jsxCompiler {*/
margin-top: 20px /*margin-top: 20px*/
} /*}*/
.jsxCompiler .playgroundPreview { /*.jsxCompiler .playgroundPreview {*/
padding: 0; /*padding: 0;*/
width: 600px /*width: 600px*/
} /*}*/
.jsxCompiler .playgroundPreview pre { /*.jsxCompiler .playgroundPreview pre {*/
font-family: 'source-code-pro', Menlo, Consolas, 'Courier New', monospace; /*font-family: 'source-code-pro', Menlo, Consolas, 'Courier New', monospace;*/
font-size: 0.8em; /*font-size: 0.8em;*/
line-height: 1.5 /*line-height: 1.5*/
} /*}*/
.jsxCompiler .playgroundError { /*.jsxCompiler .playgroundError {*/
padding: 15px 20px /*padding: 15px 20px*/
} /*}*/
.button { .button {
background: -webkit-linear-gradient(#9a9a9a, #646464); background: -webkit-linear-gradient(#9a9a9a, #646464);

View File

@ -1,9 +1,10 @@
/* uncss:ignore */
.playground-error { .playground-error {
color: red; color: red;
font-weight: 500; font-weight: 500;
} }
/* uncss:ignore */
.cm-s-solarized .editor-error { .cm-s-solarized .editor-error {
background-color: #F0F079; background-color: #F0F079;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long