Merge changes Icbf9ac6c,I1e7a1e67

* changes:
  Prevent visual effect on disabled toolbar buttons
  Remove use of filter property for CSS opacity
This commit is contained in:
jenkins-bot 2013-06-26 02:37:14 +00:00 committed by Gerrit Code Review
commit a7844ec34a
5 changed files with 7 additions and 20 deletions

View file

@ -13,7 +13,6 @@
.ve-ce-surface-textarea {
position: absolute;
z-index: -1;
filter: alpha(opacity=0);
opacity: 0;
color: white;
background-color: #fff;
@ -55,7 +54,6 @@
display: none;
height: 1px;
left: 0;
filter: alpha(opacity=0);
opacity: 0;
overflow: hidden;
position: fixed;

View file

@ -174,7 +174,6 @@
width: 1.5em;
height: 1.5em;
cursor: pointer;
filter: alpha(opacity=8);
opacity: 0.8;
/* @see ve.init.mw.Icons */
background-position: left top;
@ -191,7 +190,6 @@
width: 1.5em;
height: 1.5em;
cursor: pointer;
filter: alpha(opacity=8);
opacity: 0.8;
/* @see ve.init.mw.Icons */
background-position: right top;

View file

@ -40,18 +40,17 @@
box-shadow: inset 0 0.07em 0.07em 0 rgba(0, 0, 0, 0.07);
}
.ve-ui-widget-disabled.ve-ui-buttonTool:active {
.ve-ui-buttonTool.ve-ui-widget-disabled:active {
background-image: none;
box-shadow: none;
}
.ve-ui-widget-disabled.ve-ui-buttonTool {
filter: alpha(opacity=25);
opacity: 0.25;
.ve-ui-buttonTool.ve-ui-widget-disabled:hover {
border-color: transparent;
}
.ve-ui-widget-disabled.ve-ui-buttonTool:hover {
border-color: transparent;
.ve-ui-buttonTool.ve-ui-widget-disabled {
cursor: auto;
}
.ve-ui-buttonTool-icon {
@ -60,18 +59,15 @@
width: 1.5em;
background-position: center center;
background-repeat: no-repeat;
filter: alpha(opacity=80);
opacity: 0.8;
}
.ve-ui-buttonTool:hover .ve-ui-buttonTool-icon {
filter: alpha(opacity=100);
.ve-ui-buttonTool:not(.ve-ui-widget-disabled):hover .ve-ui-buttonTool-icon {
opacity: 1;
}
.ve-ui-widget-disabled .ve-ui-buttonTool-icon {
filter: alpha(opacity=80);
opacity: 0.8;
opacity: 0.2;
}
/* ve.ui.DropdownTool */
@ -111,12 +107,10 @@
/* @see ve.ui.Icons */
background-position: 50% 50%;
background-repeat: no-repeat;
filter: alpha(opacity=80);
opacity: 0.8;
}
.ve-ui-dropdownTool:hover .ve-ui-dropdownTool-icon {
filter: alpha(opacity=100);
opacity: 1;
}

View file

@ -95,11 +95,9 @@
-ms-transition: opacity 500ms ease-in-out;
-o-transition: opacity 500ms ease-in-out;
transition: opacity 500ms ease-in-out;
filter: alpha(opacity=12);
opacity: 0.125;
}
.ve-ui-toolbar-floating .ve-ui-toolbar-shadow {
filter: alpha(opacity=50);
opacity: 0.5;
}

View file

@ -85,7 +85,6 @@
.ve-ui-widget-disabled.ve-ui-buttonWidget,
.ve-ui-widget-disabled.ve-ui-buttonWidget:active {
filter: alpha(opacity=25);
opacity: 0.5;
cursor: default;
box-shadow: none;