diff --git a/build.sh b/build.sh index acad376..be8da3b 100644 --- a/build.sh +++ b/build.sh @@ -14,7 +14,7 @@ i="0" echo "var css = {" >> compiledcss.js #Begin making compiledcss.js -echo -n "/* Copyright 2014 Owen Versteeg; MIT licensed */" >> entireframework.min.css +echo -n "/*Copyright 2014 Owen Versteeg; MIT licensed*/" >> entireframework.min.css #Begin making entireframework.min.css; -n is to remove the newline #For each subtype, we compile the LESS file, minify it, and concatenate it into two files: diff --git a/compiled/forms.css b/compiled/forms.css index 11cbd2f..b4c0fe5 100644 --- a/compiled/forms.css +++ b/compiled/forms.css @@ -20,7 +20,7 @@ select { padding: 8px; } textarea:focus, -input.focus { +input:focus { border-color: #5ab; } textarea, diff --git a/compiled/forms.min.css b/compiled/forms.min.css index 4f98ede..ac47022 100644 --- a/compiled/forms.min.css +++ b/compiled/forms.min.css @@ -1 +1 @@ -label>*{display:inline}form>*{display:block;margin-bottom:10px}.addon,.btn-sm,.nav a,textarea,input,select{font-size:14px}textarea,input,select{border:1px solid #ccc;padding:8px}textarea:focus,input.focus{border-color:#5ab}textarea,input[type=text]{-webkit-appearance:none;width:13em;outline:0}.addon{box-shadow:0 0 0 1px #ccc;padding:8px 12px} \ No newline at end of file +label>*{display:inline}form>*{display:block;margin-bottom:10px}.addon,.btn-sm,.nav a,textarea,input,select{font-size:14px}textarea,input,select{border:1px solid #ccc;padding:8px}textarea:focus,input:focus{border-color:#5ab}textarea,input[type=text]{-webkit-appearance:none;width:13em;outline:0}.addon{box-shadow:0 0 0 1px #ccc;padding:8px 12px} \ No newline at end of file diff --git a/compiled/navbar.css b/compiled/navbar.css index 660f20d..f495b4f 100644 --- a/compiled/navbar.css +++ b/compiled/navbar.css @@ -26,7 +26,7 @@ background: #000; float: right; font-size: 25px; - margin-top: -54px; + margin: -54px 7px; display: none; } @media (max-width: 500px) { diff --git a/compiled/navbar.min.css b/compiled/navbar.min.css index bf48974..6f62d7b 100644 --- a/compiled/navbar.min.css +++ b/compiled/navbar.min.css @@ -1 +1 @@ -.nav,.nav .current,.nav a:hover{background:#000;color:#fff}.nav{height:24px;padding:11px 0 15px}.nav a{color:#aaa;padding-right:1em;position:relative;top:-1px}.nav .pagename{font-size:22px;top:1px}.btn.btn-close{background:#000;float:right;font-size:25px;margin-top:-54px;display:none}@media(max-width:500px){.btn.btn-close{display:block}.nav{overflow:hidden}.pagename{margin-top:-11px}.nav:active,.nav:focus{height:auto}.nav div:before{background:#000;border-bottom:10px double;border-top:3px solid;content:'';float:right;height:4px;position:relative;right:3px;top:14px;width:20px}.nav a{display:block;padding:.5em 0;width:50%}} \ No newline at end of file +.nav,.nav .current,.nav a:hover{background:#000;color:#fff}.nav{height:24px;padding:11px 0 15px}.nav a{color:#aaa;padding-right:1em;position:relative;top:-1px}.nav .pagename{font-size:22px;top:1px}.btn.btn-close{background:#000;float:right;font-size:25px;margin:-54px 7px;display:none}@media(max-width:500px){.btn.btn-close{display:block}.nav{overflow:hidden}.pagename{margin-top:-11px}.nav:active,.nav:focus{height:auto}.nav div:before{background:#000;border-bottom:10px double;border-top:3px solid;content:'';float:right;height:4px;position:relative;right:3px;top:14px;width:20px}.nav a{display:block;padding:.5em 0;width:50%}} \ No newline at end of file diff --git a/compiledcss.js b/compiledcss.js index 42c2f83..0ce252c 100644 --- a/compiledcss.js +++ b/compiledcss.js @@ -4,8 +4,8 @@ var css = { "grid": ".row{margin:1% 0;overflow:auto}.col{float:left}.table,.c12{width:100%}.c11{width:91.66%}.c10{width:83.33%}.c9{width:75%}.c8{width:66.66%}.c7{width:58.33%}.c6{width:50%}.c5{width:41.66%}.c4{width:33.33%}.c3{width:25%}.c2{width:16.66%}.c1{width:8.33%}@media(max-width:870px){.row .col{width:100%}}", "headings": "h1{font-size:4em}", "icons": ".ico{font:33px Arial Unicode MS,Lucida Sans Unicode}", - "forms": "label>*{display:inline}form>*{display:block;margin-bottom:10px}.addon,.btn-sm,.nav a,textarea,input,select{font-size:14px}textarea,input,select{border:1px solid #ccc;padding:8px}textarea:focus,input.focus{border-color:#5ab}textarea,input[type=text]{-webkit-appearance:none;width:13em;outline:0}.addon{box-shadow:0 0 0 1px #ccc;padding:8px 12px}", - "navbar": ".nav,.nav .current,.nav a:hover{background:#000;color:#fff}.nav{height:24px;padding:11px 0 15px}.nav a{color:#aaa;padding-right:1em;position:relative;top:-1px}.nav .pagename{font-size:22px;top:1px}.btn.btn-close{background:#000;float:right;font-size:25px;margin-top:-54px;display:none}@media(max-width:500px){.btn.btn-close{display:block}.nav{overflow:hidden}.pagename{margin-top:-11px}.nav:active,.nav:focus{height:auto}.nav div:before{background:#000;border-bottom:10px double;border-top:3px solid;content:'';float:right;height:4px;position:relative;right:3px;top:14px;width:20px}.nav a{display:block;padding:.5em 0;width:50%}}", + "forms": "label>*{display:inline}form>*{display:block;margin-bottom:10px}.addon,.btn-sm,.nav a,textarea,input,select{font-size:14px}textarea,input,select{border:1px solid #ccc;padding:8px}textarea:focus,input:focus{border-color:#5ab}textarea,input[type=text]{-webkit-appearance:none;width:13em;outline:0}.addon{box-shadow:0 0 0 1px #ccc;padding:8px 12px}", + "navbar": ".nav,.nav .current,.nav a:hover{background:#000;color:#fff}.nav{height:24px;padding:11px 0 15px}.nav a{color:#aaa;padding-right:1em;position:relative;top:-1px}.nav .pagename{font-size:22px;top:1px}.btn.btn-close{background:#000;float:right;font-size:25px;margin:-54px 7px;display:none}@media(max-width:500px){.btn.btn-close{display:block}.nav{overflow:hidden}.pagename{margin-top:-11px}.nav:active,.nav:focus{height:auto}.nav div:before{background:#000;border-bottom:10px double;border-top:3px solid;content:'';float:right;height:4px;position:relative;right:3px;top:14px;width:20px}.nav a{display:block;padding:.5em 0;width:50%}}", "tables": ".table th,.table td{padding:.5em;text-align:left}.table tbody>:nth-child(2n-1){background:#ddd}", "messages": ".msg{background:#def;border-left:5px solid #59d;padding:1.5em}" }; diff --git a/entireframework.min.css b/entireframework.min.css index ee2205d..23e360e 100644 --- a/entireframework.min.css +++ b/entireframework.min.css @@ -1 +1 @@ -/* Copyright 2014 Owen Versteeg; MIT licensed */body,textarea,input,select{background:0;border-radius:0;font:16px sans-serif;margin:0}.smooth{transition:all .2s}.btn,.nav a{text-decoration:none}.container{margin:0 20px;width:auto}h2,.btn{font-size:2em}.btn{background:#999;border-radius:6px;border:0;color:#fff;cursor:pointer;display:inline-block;margin:2px 0;padding:12px 30px 14px}.btn:hover{background:#888}.btn:active,.btn:focus{background:#777}.btn-a{background:#0ae}.btn-a:hover{background:#09d}.btn-a:active,.btn-a:focus{background:#08b}.btn-b{background:#3c5}.btn-b:hover{background:#2b4}.btn-b:active,.btn-b:focus{background:#2a4}.btn-c{background:#d33}.btn-c:hover{background:#c22}.btn-c:active,.btn-c:focus{background:#b22}.btn-sm{border-radius:4px;padding:10px 15px 11px}.row{margin:1% 0;overflow:auto}.col{float:left}.table,.c12{width:100%}.c11{width:91.66%}.c10{width:83.33%}.c9{width:75%}.c8{width:66.66%}.c7{width:58.33%}.c6{width:50%}.c5{width:41.66%}.c4{width:33.33%}.c3{width:25%}.c2{width:16.66%}.c1{width:8.33%}h1{font-size:4em}.ico{font:33px Arial Unicode MS,Lucida Sans Unicode}label>*{display:inline}form>*{display:block;margin-bottom:10px}.addon,.btn-sm,.nav a,textarea,input,select{font-size:14px}textarea,input,select{border:1px solid #ccc;padding:8px}textarea:focus,input.focus{border-color:#5ab}textarea,input[type=text]{-webkit-appearance:none;width:13em;outline:0}.addon{box-shadow:0 0 0 1px #ccc;padding:8px 12px}.nav,.nav .current,.nav a:hover{background:#000;color:#fff}.nav{height:24px;padding:11px 0 15px}.nav a{color:#aaa;padding-right:1em;position:relative;top:-1px}.nav .pagename{font-size:22px;top:1px}.btn.btn-close{background:#000;float:right;font-size:25px;margin-top:-54px;display:none}@media(max-width:870px){.row .col{width:100%}}@media(min-width:1310px){.container{margin:auto;width:1270px}}@media(max-width:500px){.btn.btn-close{display:block}.nav{overflow:hidden}.pagename{margin-top:-11px}.nav:active,.nav:focus{height:auto}.nav div:before{background:#000;border-bottom:10px double;border-top:3px solid;content:'';float:right;height:4px;position:relative;right:3px;top:14px;width:20px}.nav a{display:block;padding:.5em 0;width:50%}}.table th,.table td{padding:.5em;text-align:left}.table tbody>:nth-child(2n-1){background:#ddd}.msg{background:#def;border-left:5px solid #59d;padding:1.5em} \ No newline at end of file +/*Copyright 2014 Owen Versteeg; MIT licensed*/body,textarea,input,select{background:0;border-radius:0;font:16px sans-serif;margin:0}.smooth{transition:all .2s}.btn,.nav a{text-decoration:none}.container{margin:0 20px;width:auto}label>*{display:inline}form>*{display:block;margin-bottom:10px}.btn{background:#999;border-radius:6px;border:0;color:#fff;cursor:pointer;display:inline-block;margin:2px 0;padding:12px 30px 14px}.btn:hover{background:#888}.btn:active,.btn:focus{background:#777}.btn-a{background:#0ae}.btn-a:hover{background:#09d}.btn-a:active,.btn-a:focus{background:#08b}.btn-b{background:#3c5}.btn-b:hover{background:#2b4}.btn-b:active,.btn-b:focus{background:#2a4}.btn-c{background:#d33}.btn-c:hover{background:#c22}.btn-c:active,.btn-c:focus{background:#b22}.btn-sm{border-radius:4px;padding:10px 15px 11px}.row{margin:1% 0;overflow:auto}.col{float:left}.table,.c12{width:100%}.c11{width:91.66%}.c10{width:83.33%}.c9{width:75%}.c8{width:66.66%}.c7{width:58.33%}.c6{width:50%}.c5{width:41.66%}.c4{width:33.33%}.c3{width:25%}.c2{width:16.66%}.c1{width:8.33%}h1{font-size:4em}h2,.btn{font-size:2em}.ico{font:33px Arial Unicode MS,Lucida Sans Unicode}.addon,.btn-sm,.nav a,textarea,input,select{font-size:14px}textarea,input,select{padding:8px;border:1px solid #ccc}textarea:focus,input:focus{border-color:#5ab}textarea,input[type=text]{-webkit-appearance:none;width:13em;outline:0}.addon{padding:8px 12px;box-shadow:0 0 0 1px #ccc}.nav,.nav .current,.nav a:hover{background:#000;color:#fff}.nav{height:24px;padding:11px 0 15px}.nav a{color:#aaa;padding-right:1em;position:relative;top:-1px}.nav .pagename{font-size:22px;top:1px}.btn.btn-close{background:#000;float:right;font-size:25px;margin:-54px 7px;display:none}@media(min-width:1310px){.container{margin:auto;width:1270px}}@media(max-width:870px){.row .col{width:100%}}@media(max-width:500px){.btn.btn-close{display:block}.nav{overflow:hidden}.pagename{margin-top:-11px}.nav:active,.nav:focus{height:auto}.nav div:before{background:#000;border-bottom:10px double;border-top:3px solid;content:'';float:right;height:4px;position:relative;right:3px;top:14px;width:20px}.nav a{padding:.5em 0;display:block;width:50%}}.table th,.table td{padding:.5em;text-align:left}.table tbody>:nth-child(2n-1){background:#ddd}.msg{padding:1.5em;background:#def;border-left:5px solid #59d} \ No newline at end of file diff --git a/less/forms.less b/less/forms.less index df85ba2..c35e457 100644 --- a/less/forms.less +++ b/less/forms.less @@ -16,7 +16,7 @@ textarea, input, select { padding: 8px; } -textarea:focus, input.focus { +textarea:focus, input:focus { border-color: #5ab; } diff --git a/less/navbar.less b/less/navbar.less index 3e3b6d1..49c0a25 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -28,7 +28,7 @@ background: #000; float: right; font-size: 25px; - margin-top: -54px; + margin: -54px 7px; display: none; }