Merge pull request +8063 from c9/fix/firefox

Fix firefox styling issues
pull/117/merge
Ruben Daniels 2015-07-02 17:24:31 -07:00
commit 8e68e8c7e1
15 zmienionych plików z 66 dodań i 44 usunięć

7
node_modules/architect-build/build.js wygenerowano vendored
Wyświetl plik

@ -41,14 +41,9 @@ function build(config, opts, callback){
if (!mains.length)
return callback(new Error("Config contains no packages"));
// Add Architect
// Add Architect
if (!opts.noArchitect) {
mains.push("lib/architect/architect");
(opts.ignore || (opts.ignore = [])).push(
//path.resolve(__dirname + "/../architect/events"),
path.resolve(__dirname + "/../architect/path"),
path.resolve(__dirname + "/../architect/fs")
);
}
// Add RequireJS

Wyświetl plik

@ -67,7 +67,7 @@
"c9.ide.language.javascript.tern": "#2b0bb024da",
"c9.ide.language.javascript.infer": "#cfec494a3c",
"c9.ide.language.jsonalyzer": "#ba3e0d298c",
"c9.ide.collab": "#2fc3852058",
"c9.ide.collab": "#a2d4e23a2b",
"c9.ide.local": "#a9703b630c",
"c9.ide.find": "#6cc6d3379d",
"c9.ide.find.infiles": "#72582de3cd",
@ -75,7 +75,7 @@
"c9.ide.run.debug": "#f4d8c0e8d9",
"c9.automate": "#47e2c429c9",
"c9.ide.ace.emmet": "#0ab4c6cd68",
"c9.ide.ace.gotoline": "#4d1a93172c",
"c9.ide.ace.gotoline": "#a8ff07c8f4",
"c9.ide.ace.keymaps": "#43445d6306",
"c9.ide.ace.repl": "#f3a62c1f2a",
"c9.ide.ace.split": "#0ae0151c78",
@ -88,7 +88,7 @@
"c9.ide.fontawesome": "#781602c5d8",
"c9.ide.format": "#b0bb91a623",
"c9.ide.help.support": "#61f5a81d8c",
"c9.ide.imgeditor": "#ed89162aa7",
"c9.ide.imgeditor": "#66a9733dc1",
"c9.ide.immediate": "#6845a93705",
"c9.ide.installer": "#c36540bd61",
"c9.ide.mount": "#f89d3f7570",
@ -108,7 +108,7 @@
"c9.ide.run.debug.xdebug": "#3b1520f83d",
"c9.ide.save": "#58b8616a88",
"c9.ide.terminal.monitor": "#b0b4d03280",
"c9.ide.theme.flat": "#b1d65fa9bb",
"c9.ide.theme.flat": "#2de8414db7",
"c9.ide.threewaymerge": "#229382aa0b",
"c9.ide.undo": "#b028bcb4d5",
"c9.ide.upload": "#0bd010d3dc",

Wyświetl plik

@ -10,13 +10,13 @@
}
.errorlabel.anim, .disconnectlabel.anim{
transition: top 0.2s;
-moz-transition: top 0.2s; /* Gecko */
-webkit-transition: top 0.2s; /* Safari */
transition: top 0.2s;
}
.errorlabel.fade-in{
transition: opacity 0.2s;
-moz-transition: opacity 0.2s; /* Gecko */
-webkit-transition: opacity 0.2s; /* Safari */
transition: opacity 0.2s;
}
.errorlabel div{
background: @error-background;

Wyświetl plik

@ -14,23 +14,22 @@
@-moz-keyframes running-spinner { 0%, 4.55% { background-position: -0px 0px; } 4.56%, 9.09% { background-position: -16px 0px; } 9.1%, 13.64% { background-position: -32px 0px; } 13.65%, 18.18% { background-position: -48px 0px; } 18.19%, 22.73% { background-position: -64px 0px; } 22.740000000000002%, 27.27% { background-position: -80px 0px; } 27.28%, 31.82% { background-position: -96px 0px; } 31.830000000000002%, 36.36% { background-position: -112px 0px; } 36.37%, 40.91% { background-position: -128px 0px; } 40.919999999999995%, 45.45% { background-position: -144px 0px; } 45.46%, 50% { background-position: -160px 0px; } 50.01%, 54.55% { background-position: -176px 0px; } 54.559999999999995%, 59.09% { background-position: -192px 0px; } 59.1%, 63.64% { background-position: -208px 0px; } 63.65%, 68.18% { background-position: -224px 0px; } 68.19000000000001%, 72.73% { background-position: -240px 0px; } 72.74000000000001%, 77.27% { background-position: -256px 0px; } 77.28%, 81.82% { background-position: -272px 0px; } 81.83%, 86.36% { background-position: -288px 0px; } 86.37%, 90.91% { background-position: -304px 0px; } 90.92%, 95.45% { background-position: -320px 0px; } 95.46000000000001%, 100% { background-position: -336px 0px; } }
@-keyframes running-spinner { 0%, 4.55% { background-position: -0px 0px; } 4.56%, 9.09% { background-position: -16px 0px; } 9.1%, 13.64% { background-position: -32px 0px; } 13.65%, 18.18% { background-position: -48px 0px; } 18.19%, 22.73% { background-position: -64px 0px; } 22.740000000000002%, 27.27% { background-position: -80px 0px; } 27.28%, 31.82% { background-position: -96px 0px; } 31.830000000000002%, 36.36% { background-position: -112px 0px; } 36.37%, 40.91% { background-position: -128px 0px; } 40.919999999999995%, 45.45% { background-position: -144px 0px; } 45.46%, 50% { background-position: -160px 0px; } 50.01%, 54.55% { background-position: -176px 0px; } 54.559999999999995%, 59.09% { background-position: -192px 0px; } 59.1%, 63.64% { background-position: -208px 0px; } 63.65%, 68.18% { background-position: -224px 0px; } 68.19000000000001%, 72.73% { background-position: -240px 0px; } 72.74000000000001%, 77.27% { background-position: -256px 0px; } 77.28%, 81.82% { background-position: -272px 0px; } 81.83%, 86.36% { background-position: -288px 0px; } 86.37%, 90.91% { background-position: -304px 0px; } 90.92%, 95.45% { background-position: -320px 0px; } 95.46000000000001%, 100% { background-position: -336px 0px; } }
@-webkit-keyframes loading-spinner { 0%, 8.32% { background-position: -0px -0px; } 8.33%, 16.65% { background-position: -15px -0px; } 16.66%, 24.99% { background-position: -30px -0px; } 25%, 33.32% { background-position: -45px -0px; } 33.33%, 41.65% { background-position: -60px -0px; } 41.66%, 49.99% { background-position: -75px -0px; } 50%, 58.32% { background-position: -90px -0px; } 58.33%, 66.65% { background-position: -105px -0px; } 66.66%, 74.99% { background-position: -120px -0px; } 75%, 83.32% { background-position: -135px -0px; } 83.33%, 91.65% { background-position: -150px -0px; } 91.66%, 99.99% { background-position: -165px -0px; } }
@-moz-keyframes loading-spinner { 0%, 8.32% { background-position: -0px -0px; } 8.33%, 16.65% { background-position: -15px -0px; } 16.66%, 24.99% { background-position: -30px -0px; } 25%, 33.32% { background-position: -45px -0px; } 33.33%, 41.65% { background-position: -60px -0px; } 41.66%, 49.99% { background-position: -75px -0px; } 50%, 58.32% { background-position: -90px -0px; } 58.33%, 66.65% { background-position: -105px -0px; } 66.66%, 74.99% { background-position: -120px -0px; } 75%, 83.32% { background-position: -135px -0px; } 83.33%, 91.65% { background-position: -150px -0px; } 91.66%, 99.99% { background-position: -165px -0px; } }
@keyframes loading-spinner { 0%, 8.32% { background-position: -0px -0px; } 8.33%, 16.65% { background-position: -15px -0px; } 16.66%, 24.99% { background-position: -30px -0px; } 25%, 33.32% { background-position: -45px -0px; } 33.33%, 41.65% { background-position: -60px -0px; } 41.66%, 49.99% { background-position: -75px -0px; } 50%, 58.32% { background-position: -90px -0px; } 58.33%, 66.65% { background-position: -105px -0px; } 66.66%, 74.99% { background-position: -120px -0px; } 75%, 83.32% { background-position: -135px -0px; } 83.33%, 91.65% { background-position: -150px -0px; } 91.66%, 99.99% { background-position: -165px -0px; } }
@-webkit-keyframes loading-spinner { from { background-position: 0 0; } to { background-position: -165px 0px; } }
@-moz-keyframes loading-spinner { from { background-position: 0 0; } to { background-position: -165px 0px; } }
@keyframes loading-spinner { from { background-position: 0 0; } to { background-position: -165px 0px; } }
@-webkit-keyframes saving { 0%, 10%, 100% { opacity: 1; } 50%, 60% { opacity: .3; } }
@-moz-keyframes saving { 0%, 10%, 100% { opacity: 1; } 50%, 60% { opacity: .3; } }
@-keyframes saving { 0%, 10%, 100% { opacity: 1; } 50%, 60% { opacity: .3; } }
@-webkit-keyframes loading-24-spinner { 0.000001%, 4.166666666666667% { background-position: -0px 0px; } 4.166667666666667%, 8.333333333333334% { background-position: -14px 0px; } 8.333334333333333%, 12.5% { background-position: -28px 0px; } 12.500001%, 16.666666666666668% { background-position: -42px 0px; } 16.66666766666667%, 20.833333333333336% { background-position: -56px 0px; } 20.833334333333337%, 25% { background-position: -70px 0px; } 25.000001%, 29.166666666666668% { background-position: -84px 0px; } 29.16666766666667%, 33.333333333333336% { background-position: -98px 0px; } 33.33333433333333%, 37.5% { background-position: -112px 0px; } 37.500001%, 41.66666666666667% { background-position: -126px 0px; } 41.66666766666667%, 45.833333333333336% { background-position: -140px 0px; } 45.83333433333333%, 50% { background-position: -154px 0px; } 50.000001%, 54.16666666666667% { background-position: -168px 0px; } 54.16666766666667%, 58.333333333333336% { background-position: -182px 0px; } 58.33333433333333%, 62.50000000000001% { background-position: -196px 0px; } 62.500001000000005%, 66.66666666666667% { background-position: -210px 0px; } 66.66666766666667%, 70.83333333333334% { background-position: -224px 0px; } 70.83333433333334%, 75% { background-position: -238px 0px; } 75.000001%, 79.16666666666667% { background-position: -252px 0px; } 79.16666766666667%, 83.33333333333334% { background-position: -266px 0px; } 83.33333433333334%, 87.5% { background-position: -280px 0px; } 87.500001%, 91.66666666666667% { background-position: -294px 0px; } 91.66666766666667%, 95.83333333333334% { background-position: -308px 0px; } 95.83333433333334%, 100% { background-position: -322px 0px; } }
@-moz-keyframes loading-24-spinner { 0.000001%, 4.166666666666667% { background-position: -0px 0px; } 4.166667666666667%, 8.333333333333334% { background-position: -14px 0px; } 8.333334333333333%, 12.5% { background-position: -28px 0px; } 12.500001%, 16.666666666666668% { background-position: -42px 0px; } 16.66666766666667%, 20.833333333333336% { background-position: -56px 0px; } 20.833334333333337%, 25% { background-position: -70px 0px; } 25.000001%, 29.166666666666668% { background-position: -84px 0px; } 29.16666766666667%, 33.333333333333336% { background-position: -98px 0px; } 33.33333433333333%, 37.5% { background-position: -112px 0px; } 37.500001%, 41.66666666666667% { background-position: -126px 0px; } 41.66666766666667%, 45.833333333333336% { background-position: -140px 0px; } 45.83333433333333%, 50% { background-position: -154px 0px; } 50.000001%, 54.16666666666667% { background-position: -168px 0px; } 54.16666766666667%, 58.333333333333336% { background-position: -182px 0px; } 58.33333433333333%, 62.50000000000001% { background-position: -196px 0px; } 62.500001000000005%, 66.66666666666667% { background-position: -210px 0px; } 66.66666766666667%, 70.83333333333334% { background-position: -224px 0px; } 70.83333433333334%, 75% { background-position: -238px 0px; } 75.000001%, 79.16666666666667% { background-position: -252px 0px; } 79.16666766666667%, 83.33333333333334% { background-position: -266px 0px; } 83.33333433333334%, 87.5% { background-position: -280px 0px; } 87.500001%, 91.66666666666667% { background-position: -294px 0px; } 91.66666766666667%, 95.83333333333334% { background-position: -308px 0px; } 95.83333433333334%, 100% { background-position: -322px 0px; } }
@keyframes loading-24-spinner { 0.000001%, 4.166666666666667% { background-position: -0px 0px; } 4.166667666666667%, 8.333333333333334% { background-position: -14px 0px; } 8.333334333333333%, 12.5% { background-position: -28px 0px; } 12.500001%, 16.666666666666668% { background-position: -42px 0px; } 16.66666766666667%, 20.833333333333336% { background-position: -56px 0px; } 20.833334333333337%, 25% { background-position: -70px 0px; } 25.000001%, 29.166666666666668% { background-position: -84px 0px; } 29.16666766666667%, 33.333333333333336% { background-position: -98px 0px; } 33.33333433333333%, 37.5% { background-position: -112px 0px; } 37.500001%, 41.66666666666667% { background-position: -126px 0px; } 41.66666766666667%, 45.833333333333336% { background-position: -140px 0px; } 45.83333433333333%, 50% { background-position: -154px 0px; } 50.000001%, 54.16666666666667% { background-position: -168px 0px; } 54.16666766666667%, 58.333333333333336% { background-position: -182px 0px; } 58.33333433333333%, 62.50000000000001% { background-position: -196px 0px; } 62.500001000000005%, 66.66666666666667% { background-position: -210px 0px; } 66.66666766666667%, 70.83333333333334% { background-position: -224px 0px; } 70.83333433333334%, 75% { background-position: -238px 0px; } 75.000001%, 79.16666666666667% { background-position: -252px 0px; } 79.16666766666667%, 83.33333333333334% { background-position: -266px 0px; } 83.33333433333334%, 87.5% { background-position: -280px 0px; } 87.500001%, 91.66666666666667% { background-position: -294px 0px; } 91.66666766666667%, 95.83333333333334% { background-position: -308px 0px; } 95.83333433333334%, 100% { background-position: -322px 0px; } }
@-webkit-keyframes loading-24-spinner { from { background-position: 0 0; } to { background-position: -336px 0px; } }
@-moz-keyframes loading-24-spinner { from { background-position: 0 0; } to { background-position: -336px 0px; } }
@keyframes loading-24-spinner { from { background-position: 0 0; } to { background-position: -336px 0px; } }
.loading-spinner {
background: url("@{image-path}/tab-save-spinner-active.png") no-repeat;
-webkit-animation: loading-spinner 1.2s linear 0s infinite normal;
-moz-animation: loading-spinner 1.2s linear 0s infinite normal;
animation: loading-spinner 1.2s linear 0s infinite normal;
-webkit-animation: loading-24-spinner 1.2s steps(24) infinite;
animation: loading-24-spinner 1.2s steps(24) infinite;
}
@-webkit-keyframes ball { 0%, 19.99%, 100% { background-position: 0 0 } 20%, 39.99% { background-position: -30px 0 } 40%, 59.99% { background-position: -60px 0 } 60%,79.99% { background-position: -90px 0 } 80%, 99.99% { background-position: -120px 0 } }

Wyświetl plik

@ -35,7 +35,7 @@ define(function(require, exports, module) {
var logobar, removeTheme, theme;
var c9console, menus, tabManager, panels;
var userLayout, ignoreTheme, notify;
var userLayout, ignoreTheme, notify, svg;
var loaded = false;
function load(){
@ -129,6 +129,8 @@ define(function(require, exports, module) {
window.addEventListener("resize", resize, false);
window.addEventListener("focus", resize, false);
setGeckoMask();
plugin.addOther(function(){
window.removeEventListener("resize", resize, false);
window.removeEventListener("focus", resize, false);
@ -190,6 +192,8 @@ define(function(require, exports, module) {
type: type
}) !== false;
setGeckoMask();
if (noquestion) return;
if (auto)
@ -230,6 +234,37 @@ define(function(require, exports, module) {
/***** Methods *****/
// There will be a better place for this when theming is fully
// abstracted. For now this is a hack
function setGeckoMask(){
if (!apf.isGecko) return;
if (svg) svg.parentNode.removeChild(svg);
var isFlatTheme = theme.indexOf("flat") > -1;
var img = options.staticPrefix + "/images/" + (
isFlatTheme
? "gecko_mask_flat_light.png"
: "gecko_mask.png");
var width = isFlatTheme ? 76 : 46;
var height = isFlatTheme ? 26 : 24;
var x1 = isFlatTheme ? 1 : 1;
var x2 = isFlatTheme ? -40 : -28;
document.body.insertAdjacentHTML("beforeend", '<svg xmlns="http://www.w3.org/2000/svg">'
+ '<defs>'
+ '<mask id="tab-mask-left" maskUnits="userSpaceOnUse" maskContentUnits="userSpaceOnUse">'
+ '<image width="' + width + 'px" height="' + height + 'px" xlink:href="' + img + '" x="' + x1 + 'px"></image>'
+ '</mask>'
+ '<mask id="tab-mask-right" maskUnits="userSpaceOnUse" maskContentUnits="userSpaceOnUse">'
+ '<image width="' + width + 'px" height="' + height + 'px" xlink:href="' + img + '" x="' + x2 + 'px"></image>'
+ '</mask>'
+ '</defs>'
+ '</svg>');
svg = document.body.lastChild;
}
function findParent(obj, where) {
if (obj.name == "menus") {
menus = obj;
@ -530,6 +565,10 @@ define(function(require, exports, module) {
activeFindArea = null;
defaultFindArea = null;
activating = null;
if (svg && svg.parentNode)
svg.parentNode.removeChild(svg);
svg = null;
});
/***** Register and define API *****/

Wyświetl plik

@ -42,8 +42,7 @@
min-height: 20px;
background: #616161;
opacity : 0.8;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.sbios .indicator .indi_left {

Wyświetl plik

@ -14,11 +14,6 @@
.toolbar .subbar {
background-image: linear-gradient(bottom, rgb(236,239,242) 0%, rgb(237,240,243) 50%, rgb(243,246,248) 51%, rgb(249,251,254) 100%);
background-image: -o-linear-gradient(bottom, rgb(236,239,242) 0%, rgb(237,240,243) 50%, rgb(243,246,248) 51%, rgb(249,251,254) 100%);
background-image: -moz-linear-gradient(bottom, rgb(236,239,242) 0%, rgb(237,240,243) 50%, rgb(243,246,248) 51%, rgb(249,251,254) 100%);
background-image: -webkit-linear-gradient(bottom, rgb(236,239,242) 0%, rgb(237,240,243) 50%, rgb(243,246,248) 51%, rgb(249,251,254) 100%);
background-image: -ms-linear-gradient(bottom, rgb(236,239,242) 0%, rgb(237,240,243) 50%, rgb(243,246,248) 51%, rgb(249,251,254) 100%);
font-family: Arial;
@ -37,10 +32,6 @@
.toolbar.modal-toolbar .subbar {
background-image: linear-gradient(bottom, rgb(217,217,217) 0%, rgb(237,237,237) 100%);
background-image: -o-linear-gradient(bottom, rgb(217,217,217) 0%, rgb(237,237,237) 100%);
background-image: -moz-linear-gradient(bottom, rgb(217,217,217) 0%, rgb(237,237,237) 100%);
background-image: -webkit-linear-gradient(bottom, rgb(217,217,217) 0%, rgb(237,237,237) 100%);
background-image: -ms-linear-gradient(bottom, rgb(217,217,217) 0%, rgb(237,237,237) 100%);
border-top: 1px solid #f6f6f6;
border-bottom: 1px solid #bfbfbf;

Wyświetl plik

@ -49,12 +49,14 @@ define(function(require, exports, module) {
callback(err, data);
});
} else {
http.request(themePrefix + "/" + name + ".css", {
var url = themePrefix + "/" + name + ".css";
http.request(url, {
timeout: 2 * 60 * 1000
}, function(err, data) {
if (err)
return callback(err, data);
// set sourceurl so that sourcemaps work when theme is inserted as a style tag
data += "\n/*# sourceURL=" + url + " */";
themes[name] = data;
callback(err, data);
});

Wyświetl plik

@ -369,7 +369,7 @@
@pane-button-save-height: 15px;
@pane-button-save-right: -5px;
@pane-button-save-top: 4px;
@pane-button-save-animation: loading-spinner 1.2s linear 0s infinite normal;
@pane-button-save-animation: loading-spinner 1.2s steps(11) infinite;
@pane-button-close-image: "@{image-path}/close_tab_btn.png";
@pane-button-close-image-width: 42px;
@pane-button-close-image-height: 28px;

Wyświetl plik

@ -369,7 +369,7 @@
@pane-button-save-height: 15px;
@pane-button-save-right: -5px;
@pane-button-save-top: 4px;
@pane-button-save-animation: loading-spinner 1.2s linear 0s infinite normal;
@pane-button-save-animation: loading-spinner 1.2s steps(11) infinite;
@pane-button-close-image: "@{image-path}/close_tab_btn.png";
@pane-button-close-image-width: 42px;
@pane-button-close-image-height: 28px;

Wyświetl plik

@ -369,7 +369,7 @@
@pane-button-save-height: 14px;
@pane-button-save-right: -9px;
@pane-button-save-top: 7px;
@pane-button-save-animation: loading-24-spinner 1.2s linear 0s infinite normal;
@pane-button-save-animation: loading-24-spinner 1.2s steps(24) infinite;
@pane-button-close-image: "@{image-path}/close_tab_btn_flat_light.png";
@pane-button-close-image-width: 42px;
@pane-button-close-image-height: 28px;

Wyświetl plik

@ -369,7 +369,7 @@
@pane-button-save-height: 15px;
@pane-button-save-right: -5px;
@pane-button-save-top: 4px;
@pane-button-save-animation: loading-spinner 1.2s linear 0s infinite normal;
@pane-button-save-animation: loading-spinner 1.2s steps(11) infinite;
@pane-button-close-image: "@{image-path}/close_tab_btn.png";
@pane-button-close-image-width: 42px;
@pane-button-close-image-height: 28px;

Wyświetl plik

@ -369,7 +369,7 @@
@pane-button-save-height: 15px;
@pane-button-save-right: -5px;
@pane-button-save-top: 4px;
@pane-button-save-animation: loading-spinner 1.2s linear 0s infinite normal;
@pane-button-save-animation: loading-spinner 1.2s steps(11) infinite;
@pane-button-close-image: "@{image-path}/close_tab_btn.png";
@pane-button-close-image-width: 42px;
@pane-button-close-image-height: 28px;

Wyświetl plik

@ -383,7 +383,7 @@
.loading-spinner {
.image-2x("/static/@{pane-button-save-image}", @pane-button-save-image-width, @pane-button-save-image-height);
.animation(~"loading-24-spinner 1s linear 0s infinite normal");
.animation(~"loading-24-spinner 1.2s steps(24, end) infinite");
}
.searchresults .item{

Wyświetl plik

@ -5,13 +5,10 @@
}
.editor_tab .c9terminal .c9terminalcontainer{
-webkit-box-shadow: 0 -1px 0 0 #000;
-moz-box-shadow: 0 -1px 0 0 #000;
box-shadow: 0 -1px 0 0 #000;
}
.editor_tab .c9terminal .c9terminalcontainer.dark{
background-image: -webkit-linear-gradient(top,rgba(0, 0, 0, 0.29) 0%, rgba(0, 0, 0, 0.11) 8px, rgba(0, 0, 0, 0.01) 13px, transparent 15px);
background-image: -moz-linear-gradient(top,rgba(0, 0, 0, 0.29) 0%, rgba(0, 0, 0, 0.11) 8px, rgba(0, 0, 0, 0.01) 13px, transparent 15px);
background-image: linear-gradient(top,rgba(0, 0, 0, 0.29) 0%, rgba(0, 0, 0, 0.11) 8px, rgba(0, 0, 0, 0.01) 13px, transparent 15px);
}