Merge pull request #398 from 0ip/vendor_pref

Get rid of these idiotic vendor prefixes
This commit is contained in:
John McLear 2012-02-04 09:57:12 -08:00
commit 82bda0b0ab
5 changed files with 31 additions and 48 deletions

1
.gitignore vendored
View file

@ -1,6 +1,7 @@
node_modules node_modules
settings.json settings.json
static/js/jquery.js static/js/jquery.js
static/js/prefixfree.js
APIKEY.txt APIKEY.txt
bin/abiword.exe bin/abiword.exe
bin/node.exe bin/node.exe

View file

@ -67,6 +67,21 @@ if [ $DOWNLOAD_JQUERY = "true" ]; then
curl -lo static/js/jquery.js http://code.jquery.com/jquery-$NEEDED_VERSION.js || exit 1 curl -lo static/js/jquery.js http://code.jquery.com/jquery-$NEEDED_VERSION.js || exit 1
fi fi
echo "Ensure prefixfree is downloaded and up to date..."
DOWNLOAD_PREFIXFREE="true"
NEEDED_VERSION="1.0.4"
if [ -f "static/js/prefixfree.js" ]; then
VERSION=$(cat static/js/prefixfree.js | grep "PrefixFree" | grep -o "[0-9].[0-9].[0-9]");
if [ $VERSION = $NEEDED_VERSION ]; then
DOWNLOAD_PREFIXFREE="false"
fi
fi
if [ $DOWNLOAD_PREFIXFREE = "true" ]; then
curl -lo static/js/prefixfree.js https://raw.github.com/LeaVerou/prefixfree/master/prefixfree.js || exit 1
fi
#Remove all minified data to force node creating it new #Remove all minified data to force node creating it new
echo "Clear minfified cache..." echo "Clear minfified cache..."
rm -f var/minified* rm -f var/minified*

View file

@ -21,6 +21,7 @@
, "chat.js" , "chat.js"
, "excanvas.js" , "excanvas.js"
, "farbtastic.js" , "farbtastic.js"
, "prefixfree.js"
] ]
, "timeslider.js": [ , "timeslider.js": [
"jquery.js" "jquery.js"

View file

@ -15,7 +15,6 @@ iframe {position:absolute;}
top: 40px; top: 40px;
color: #fff; color: #fff;
padding: 5px; padding: 5px;
-moz-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
} }
@ -39,10 +38,7 @@ a img
#editbar #editbar
{ {
background: #f7f7f7; background: #f7f7f7;
background: -moz-linear-gradient(#f7f7f7, #f1f1f1 80%); background: linear-gradient(#f7f7f7, #f1f1f1 80%);
background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%);
background: -o-linear-gradient(#f7f7f7, #f1f1f1 80%);
background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%);
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
height: 32px; height: 32px;
overflow: hidden; overflow: hidden;
@ -53,10 +49,7 @@ a img
#editbar ul li #editbar ul li
{ {
background: #fff; background: #fff;
background: -moz-linear-gradient(#fff, #f0f0f0); background: linear-gradient(#fff, #f0f0f0);
background: -ms-linear-gradient(#fff, #f0f0f0);
background: -o-linear-gradient(#fff, #f0f0f0);
background: -webkit-linear-gradient(#fff, #f0f0f0);
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
@ -86,10 +79,7 @@ a img
#editbar ul li:active { #editbar ul li:active {
background: #eee; background: #eee;
background: -moz-linear-gradient(#ddd, #fff); background: linear-gradient(#ddd, #fff);
background: -ms-linear-gradient(#ddd, #fff);
background: -o-linear-gradient(#ddd, #fff);
background: -webkit-linear-gradient(#ddd, #fff);
} }
#editbar ul li.separator #editbar ul li.separator
@ -190,7 +180,6 @@ a#backtoprosite { padding-left: 20px; left: 6px;
#alertbar { #alertbar {
margin-top: 6px; margin-top: 6px;
opacity: 0; opacity: 0;
filter: alpha(opacity = 0); /* IE */
display: none; display: none;
position:absolute; position:absolute;
left:0; left:0;
@ -384,10 +373,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
#mycolorpickersave, #mycolorpickercancel { #mycolorpickersave, #mycolorpickercancel {
background: #fff; background: #fff;
background: -moz-linear-gradient(#fff, #ccc); background: linear-gradient(#fff, #ccc);
background: -ms-linear-gradient(#fff, #ccc);
background: -o-linear-gradient(#fff, #ccc);
background: -webkit-linear-gradient(#fff, #ccc);
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 4px; border-radius: 4px;
font-size:12px; font-size:12px;
@ -725,14 +711,7 @@ a#topbarmaximize {
text-decoration: none; text-decoration: none;
padding: 50pt; padding: 50pt;
font-size: 20pt; font-size: 20pt;
-moz-border-radius-topleft: 3pt; border-radius: 3pt;
-moz-border-radius-topright: 3pt;
-moz-border-radius-bottomleft: 3pt;
-moz-border-radius-bottomright: 3pt;
-webkit-border-top-left-radius: 3pt;
-webkit-border-top-right-radius: 3pt;
-webkit-border-bottom-left-radius: 3pt;
-webkit-border-bottom-right-radius: 3pt;
} }
.modaldialog .bigbutton { .modaldialog .bigbutton {
@ -953,7 +932,7 @@ position: relative;
} }
.impexpbutton{ .impexpbutton{
background-image: -moz-linear-gradient(center top , #EEEEEE, white 20%, white 20%); background-image: linear-gradient(center top , #EEEEEE, white 20%, white 20%);
padding:3px; padding:3px;
} }
@ -1021,7 +1000,6 @@ color: white;
background-color: rgb(0,0,0); background-color: rgb(0,0,0);
background-color: rgba(0,0,0,0.7); background-color: rgba(0,0,0,0.7);
padding: 10px; padding: 10px;
-moz-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
opacity:.8; opacity:.8;
} }
@ -1118,14 +1096,12 @@ width:33px !important;
#embedreadonlyqr { #embedreadonlyqr {
box-shadow: 0 0 10px #000; box-shadow: 0 0 10px #000;
border-radius: 3px; border-radius: 3px;
-webkit-transition: all .2s ease-in-out; transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
} }
#embedreadonlyqr:hover { #embedreadonlyqr:hover {
cursor: none; cursor: none;
-moz-transform: scale(1.5); transform: scale(1.5);
-webkit-transform: scale(1.5);
} }
@media screen and (max-width: 960px) { @media screen and (max-width: 960px) {
@ -1166,10 +1142,7 @@ width:33px !important;
} }
#editbar ul#menu_right { #editbar ul#menu_right {
background: #f7f7f7; background: #f7f7f7;
background: -moz-linear-gradient(#f7f7f7, #f1f1f1 80%); background: linear-gradient(#f7f7f7, #f1f1f1 80%);
background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%);
background: -o-linear-gradient(#f7f7f7, #f1f1f1 80%);
background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%);
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
height: 32px; height: 32px;
@ -1193,10 +1166,7 @@ width:33px !important;
border-right: none; border-right: none;
border-radius: 0; border-radius: 0;
background: #f7f7f7; background: #f7f7f7;
background: -moz-linear-gradient(#f7f7f7, #f1f1f1 80%); background: linear-gradient(#f7f7f7, #f1f1f1 80%);
background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%);
background: -o-linear-gradient(#f7f7f7, #f1f1f1 80%);
background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%);
border: 0; border: 0;
} }
#chatbox { #chatbox {
@ -1237,8 +1207,7 @@ label {
border-radius: 6px; border-radius: 6px;
background: #222; background: #222;
background: rgba(0,0,0,.7); background: rgba(0,0,0,.7);
background: -webkit-linear-gradient(rgba(0,0,0,.6), rgba(0,0,0,.7) 35px, rgba(0,0,0,.6)); background: linear-gradient(rgba(0,0,0,.6), rgba(0,0,0,.7) 35px, rgba(0,0,0,.6));
background: -moz-linear-gradient(rgba(0,0,0,.6), rgba(0,0,0,.7) 35px, rgba(0,0,0,.6));
box-shadow: 0 0 8px #888; box-shadow: 0 0 8px #888;
color: #fff; color: #fff;
} }
@ -1247,7 +1216,6 @@ label {
width: 100%; width: 100%;
padding: 5px; padding: 5px;
box-sizing: border-box; box-sizing: border-box;
-moz-box-sizing: border-box;
display:block; display:block;
margin-top: 10px; margin-top: 10px;
} }
@ -1292,8 +1260,5 @@ label {
.selected { .selected {
background: #eee !important; background: #eee !important;
background: -webkit-linear-gradient(#EEE, #F0F0F0) !important; background: linear-gradient(#EEE, #F0F0F0) !important;
background: -moz-linear-gradient(#EEE, #F0F0F0) !important;
background: -ms-linear-gradient(#EEE, #F0F0F0) !important;
background: -o-linear-gradient(#EEE, #F0F0F0) !important;
} }

View file

@ -31,6 +31,7 @@ require('/farbtastic');
require('/excanvas'); require('/excanvas');
JSON = require('/json2'); JSON = require('/json2');
require('/undo-xpopup'); require('/undo-xpopup');
require('/prefixfree');
var chat = require('/chat').chat; var chat = require('/chat').chat;
var getCollabClient = require('/collab_client').getCollabClient; var getCollabClient = require('/collab_client').getCollabClient;