Skip to content

Commit

Permalink
Package upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
@KishCom
KishCom committed Jan 19, 2016
1 parent 668ddad commit 8ddb438
Show file tree
Hide file tree
Showing 3 changed files with 247 additions and 23 deletions.
32 changes: 16 additions & 16 deletions package.json
View file
Expand Up @@ -6,35 +6,35 @@
"start": "clear;NODE_ENV=dev nodemon app.js | bunyan"
},
"engines": {
"node": "0.10.x"
"node": "4.2.x"
},
"version": "1.12.0",
"version": "1.12.1",
"dependencies": {
"accepts": "1.1.x",
"body-parser": "1.9.x",
"bunyan": "1.2.x",
"cookie-parser": "1.3.x",
"accepts": "1.3.x",
"body-parser": "1.14.x",
"bunyan": "1.5.x",
"cookie-parser": "1.4.x",
"escape-html": "1.0.x",
"express": "4.10.x",
"express": "4.13.x",
"express-extras": "0.3.x",
"express-session": "1.9.x",
"less": "2.1.x",
"less-middleware": "1.0.x",
"mongoose": "3.8.x",
"multer": "0.1.x",
"express-session": "1.13.x",
"less": "2.5.x",
"less-middleware": "2.0.x",
"mongoose": "4.3.x",
"multer": "1.1.x",
"nodeunit": "0.7.x",
"nunjucks": "1.1.x",
"nunjucks": "2.3.x",
"sanitize-caja": "0.1.x",
"validator": "3.22.x"
"validator": "4.5.x"
},
"devDependencies": {
"nodeunit": "latest",
"request": "latest",
"async": "latest",
"grunt": "~0.4.x",
"grunt-contrib-concat": "~0.5.x",
"grunt-contrib-less": "~0.12.x",
"grunt-contrib-uglify": "~0.6.x",
"grunt-contrib-less": "~1.1.x",
"grunt-contrib-uglify": "~0.11.x",
"grunt-contrib-watch": "~0.6.x",
"grunt-git-describe": "~2.3.x"
}
Expand Down
226 changes: 225 additions & 1 deletion public/media/shorten.min.css
View file
@@ -1 +1,225 @@
@import "css/reset.css";@import "css/fonts.css";body{width:100%;}body:before,body:after{content:"";display:table}body:after{clear:both}body,html{font-family:PTSans-Regular,sans-serif;font-size:11px;color:#444;background:#eee;background:-webkit-gradient(linear,left bottom,left top,color-stop(0,#e6e6e6),color-stop(1,#fff));background:-ms-linear-gradient(bottom,#e6e6e6 0,#e6e6e6 100%);background:-moz-linear-gradient(center bottom,#e6e6e6 0,#fff 100%);height:100%;margin:0;background-repeat:no-repeat;background-attachment:fixed}h1{font-family:PTSans-Bold,sans-serif;font-weight:bolder;margin:50px 0 50px 0;font-size:50px}a,a:hover,a:visited,a:active{color:#444}#header,#content,#footer{width:81.25%;margin:0 1.04166667%;margin:0 auto;clear:both;max-width:850px;overflow:hidden}#instructions,#response{font-family:PTSans-Regular,sans-serif;font-size:1em;padding-top:.5em;float:left;clear:left;width:45%;margin:0}#content{min-height:175px}#response{float:right;text-align:right;display:none}#footer{margin-top:10em;text-align:center}#Modal{display:none;top:50px;width:60em;min-height:300px;border:solid 1px #444;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box;-webkit-box-shadow:0 3px 5px rgba(0,0,0,.2);-moz-box-shadow:0 3px 5px rgba(0,0,0,.2);box-shadow:0 3px 5px rgba(0,0,0,.2);background:#eee;background:-webkit-gradient(linear,left bottom,left top,color-stop(0,#fff),color-stop(1,#e6e6e6));background:-ms-linear-gradient(bottom,#fff 0,#fff 100%);background:-moz-linear-gradient(center bottom,#fff 0,#e6e6e6 100%);text-align:center;padding:20px}.close{position:absolute;right:4px;top:4px;width:25px;height:20px;background:#000;color:#FFF;display:inline-block;font-size:1.5em;font-weight:bolder;cursor:pointer;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;-moz-background-clip:padding;-webkit-background-clip:padding-box;background-clip:padding-box}::-webkit-input-placeholder{color:#999}:-moz-placeholder{color:#999}#originalURL,#shortenedURL{font-size:2em;font-family:PTSans-Regular,sans-serif;width:80%;height:30px;border:solid 1px #CCC;margin:10px 0 1em 0}button{font-size:1.5em;font-family:PTSans-Regular,sans-serif;display:block;width:18%;float:right;height:33px;background:#f5f5f5;background:-webkit-gradient(linear,left bottom,left top,color-stop(0,#eee),color-stop(1,#fff));background:-ms-linear-gradient(bottom,#eee,#fff);background:-moz-linear-gradient(center bottom,#eee 0,#fff 100%);border:solid 1px #CCC;margin:10px 0 1em 0;padding:0}button:hover{cursor:pointer;background:#f5f5f5;background:-webkit-gradient(linear,left bottom,left top,color-stop(0,#ccc),color-stop(1,#fff));background:-ms-linear-gradient(bottom,#ccc,#fff);background:-moz-linear-gradient(center bottom,#ccc 0,#fff 100%)}#liveCopyToClip{font-size:1em;margin:5px 0 0 0;width:30%}#response input{clear:both;display:inline-block}#errorMessage,#statsError{font-family:PTSans-Bold,sans-serif;font-weight:bolder;font-size:1.5em;color:#FF7878;float:right}#getLinkResponse{display:none;text-align:left}#getLinkResponse table{width:90%}#Statstable{clear:both}#StatsTitle,th{font-family:PTSans-Bold,sans-serif;font-weight:bolder;font-size:1.75em;float:left}#StatsOriginalURL{font-family:PTSans-Bold,sans-serif;font-size:1em;margin:5px 0;clear:both;float:left;width:100%}th{font-size:1em}.odd{background:#FFF}.tableCount{text-align:right;float:right;width:5%}table{margin:15px 0}blockquote{font-family:monospace;font-size:1em;background:#FFF;border:solid 1px #444;padding:10px}p{margin:0 0 15px 0}#timesUsedHolder{clear:both}
@import "css/reset.css";
@import "css/fonts.css";
body {
width: 100%;
*zoom: 1;
}
body:before,
body:after {
content: "";
display: table;
}
body:after {
clear: both;
}
body,
html {
font-family: 'PTSans-Regular', sans-serif;
font-size: 11px;
color: #444;
background: #EEE;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #e6e6e6), color-stop(1, #ffffff));
background: -ms-linear-gradient(bottom, #e6e6e6 0%, #e6e6e6 100%);
background: -moz-linear-gradient(center bottom, #e6e6e6 0%, #ffffff 100%);
height: 100%;
margin: 0;
background-repeat: no-repeat;
background-attachment: fixed;
}
h1 {
font-family: 'PTSans-Bold', sans-serif;
font-weight: bolder;
margin: 50px 0 50px 0;
font-size: 50px;
}
a,
a:hover,
a:visited,
a:active {
color: #444;
}
#header,
#content,
#footer {
width: 81.25%;
margin: 0 1.04166667%;
margin: 0 auto;
clear: both;
max-width: 850px;
overflow: hidden;
}
#instructions,
#response {
font-family: 'PTSans-Regular', sans-serif;
font-size: 1em;
padding-top: 0.5em;
float: left;
clear: left;
width: 45%;
margin: 0;
}
#content {
min-height: 175px;
}
#response {
float: right;
text-align: right;
display: none;
}
#footer {
margin-top: 10em;
text-align: center;
}
#Modal {
display: none;
top: 50px;
width: 60em;
min-height: 300px;
border: solid 1px #444;
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
-moz-background-clip: padding;
-webkit-background-clip: padding-box;
background-clip: padding-box;
-webkit-box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
background: #EEE;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ffffff), color-stop(1, #e6e6e6));
background: -ms-linear-gradient(bottom, #ffffff 0%, #ffffff 100%);
background: -moz-linear-gradient(center bottom, #ffffff 0%, #e6e6e6 100%);
text-align: center;
padding: 20px;
}
.close {
position: absolute;
right: 4px;
top: 4px;
width: 25px;
height: 20px;
background: #000;
color: #FFF;
display: inline-block;
font-size: 1.5em;
font-weight: bolder;
cursor: pointer;
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
-moz-background-clip: padding;
-webkit-background-clip: padding-box;
background-clip: padding-box;
}
::-webkit-input-placeholder {
color: #999;
}
:-moz-placeholder {
color: #999;
}
#originalURL,
#shortenedURL {
font-size: 2em;
font-family: 'PTSans-Regular', sans-serif;
width: 80%;
height: 30px;
border: solid 1px #CCC;
margin: 10px 0 1em 0;
}
button {
font-size: 1.5em;
font-family: 'PTSans-Regular', sans-serif;
display: block;
width: 18%;
float: right;
height: 33px;
background: #F5F5F5;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #EEE), color-stop(1, #FFF));
background: -ms-linear-gradient(bottom, #EEE, #FFF);
background: -moz-linear-gradient(center bottom, #EEE 0%, #FFF 100%);
border: solid 1px #CCC;
margin: 10px 0 1em 0;
padding: 0;
}
button:hover {
cursor: pointer;
background: #F5F5F5;
background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #CCC), color-stop(1, #FFF));
background: -ms-linear-gradient(bottom, #CCC, #FFF);
background: -moz-linear-gradient(center bottom, #CCC 0%, #FFF 100%);
}
#liveCopyToClip {
font-size: 1em;
margin: 5px 0 0 0;
width: 30%;
}
#response input {
/* IE7/8 */
clear: both;
display: inline-block;
}
#errorMessage,
#statsError {
font-family: 'PTSans-Bold', sans-serif;
font-weight: bolder;
font-size: 1.5em;
color: #FF7878;
float: right;
}
#getLinkResponse {
display: none;
text-align: left;
}
#getLinkResponse table {
width: 90%;
}
#Statstable {
clear: both;
}
#StatsTitle,
th {
font-family: 'PTSans-Bold', sans-serif;
font-weight: bolder;
font-size: 1.75em;
float: left;
}
#StatsOriginalURL {
font-family: 'PTSans-Bold', sans-serif;
font-size: 1.0em;
margin: 5px 0;
clear: both;
float: left;
width: 100%;
}
th {
font-size: 1.0em;
}
.odd {
background: #FFF;
}
.tableCount {
text-align: right;
float: right;
width: 5%;
}
table {
margin: 15px 0;
}
blockquote {
font-family: monospace;
font-size: 1em;
background: #FFF;
border: solid 1px #444;
padding: 10px;
}
p {
margin: 0 0 15px 0;
}
#timesUsedHolder {
clear: both;
}
/* TODO
@media screen and (max-width: 720px) {
}
*/

0 comments on commit 8ddb438

Please sign in to comment.