Skip to content

Commit 2a320f8

Browse files
yurydelendikyurydelendik
committed
Merge branch 'vyv03354/unprefix_gradient'
Conflicts: web/viewer.css
2 parents f9e5649 + 36ea87a commit 2a320f8

File tree

1 file changed

+8
-41
lines changed

1 file changed

+8
-41
lines changed

‎web/viewer.css

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,7 @@ html[dir='rtl'] #sidebarContent {
256256
#toolbarSidebar {
257257
width: 200px;
258258
height: 32px;
259-
background-image: url(images/texture.png),
260-
-webkit-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
261-
background-image: url(images/texture.png),
262-
-moz-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
263-
background-image: url(images/texture.png),
264-
-ms-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
265-
background-image: url(images/texture.png),
266-
-o-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
259+
background-color: #424242; /* fallback */
267260
background-image: url(images/texture.png),
268261
linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
269262
box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25),
@@ -275,15 +268,8 @@ html[dir='rtl'] #sidebarContent {
275268

276269
#toolbarContainer, .findbar {
277270
position: relative;
278-
background-color: #474747; /* IE9 */
279-
background-image: url(images/texture.png),
280-
-webkit-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
281-
background-image: url(images/texture.png),
282-
-moz-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
283-
background-image: url(images/texture.png),
284-
-ms-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
285-
background-image: url(images/texture.png),
286-
-o-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
271+
height: 32px;
272+
background-color: #474747; /* fallback */
287273
background-image: url(images/texture.png),
288274
linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
289275
box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08),
@@ -358,9 +344,6 @@ html[dir='rtl'] #sidebarContent {
358344
height: 100%;
359345
width: 50px;
360346

361-
background-image: -moz-linear-gradient(left, #999 0%, #fff 50%, #999 100%);
362-
background-image: -ms-linear-gradient(left, #999 0%, #fff 50%, #999 100%);
363-
background-image: -webkit-linear-gradient(left, #999 0%, #fff 50%, #999 100%);
364347
background-image: linear-gradient(left, #999 0%, #fff 50%, #999 100%);
365348
background-size: 100% 100% no-repeat;
366349

@@ -540,10 +523,6 @@ html[dir='rtl'] .splitToolbarButton > .toolbarButton {
540523
.splitToolbarButton.toggled > .toolbarButton,
541524
.toolbarButton.textButton {
542525
background-color: hsla(0,0%,0%,.12);
543-
background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
544-
background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
545-
background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
546-
background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
547526
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
548527
background-clip: padding-box;
549528
border: 1px solid hsla(0,0%,0%,.35);
@@ -678,10 +657,6 @@ html[dir='rtl'] .dropdownToolbarButton {
678657
.toolbarButton:focus,
679658
.dropdownToolbarButton {
680659
background-color: hsla(0,0%,0%,.12);
681-
background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
682-
background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
683-
background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
684-
background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
685660
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
686661
background-clip: padding-box;
687662
border: 1px solid hsla(0,0%,0%,.35);
@@ -694,10 +669,6 @@ html[dir='rtl'] .dropdownToolbarButton {
694669
.toolbarButton:hover:active,
695670
.dropdownToolbarButton:hover:active {
696671
background-color: hsla(0,0%,0%,.2);
697-
background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
698-
background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
699-
background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
700-
background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
701672
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
702673
border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.4) hsla(0,0%,0%,.45);
703674
box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
@@ -723,10 +694,6 @@ html[dir='rtl'] .dropdownToolbarButton {
723694
.toolbarButton.toggled,
724695
.splitToolbarButton.toggled > .toolbarButton.toggled {
725696
background-color: hsla(0,0%,0%,.3);
726-
background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
727-
background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
728-
background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
729-
background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
730697
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
731698
border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.45) hsla(0,0%,0%,.5);
732699
box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
@@ -958,7 +925,7 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
958925
border: 1px solid transparent;
959926
border-radius: 2px;
960927
background-color: hsla(0,0%,100%,.09);
961-
background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
928+
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
962929
background-clip: padding-box;
963930
border: 1px solid hsla(0,0%,0%,.35);
964931
border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
@@ -1055,7 +1022,7 @@ a:focus > .thumbnail > .thumbnailSelectionRing > .thumbnailImage,
10551022
a:focus > .thumbnail > .thumbnailSelectionRing,
10561023
.thumbnail:hover > .thumbnailSelectionRing {
10571024
background-color: hsla(0,0%,100%,.15);
1058-
background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
1025+
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
10591026
background-clip: padding-box;
10601027
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
10611028
0 0 1px hsla(0,0%,100%,.2) inset,
@@ -1070,7 +1037,7 @@ a:focus > .thumbnail > .thumbnailSelectionRing,
10701037

10711038
.thumbnail.selected > .thumbnailSelectionRing {
10721039
background-color: hsla(0,0%,100%,.3);
1073-
background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
1040+
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
10741041
background-clip: padding-box;
10751042
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
10761043
0 0 1px hsla(0,0%,100%,.1) inset,
@@ -1121,7 +1088,7 @@ html[dir='rtl'] .outlineItem > a {
11211088

11221089
.outlineItem > a:hover {
11231090
background-color: hsla(0,0%,100%,.02);
1124-
background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
1091+
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
11251092
background-clip: padding-box;
11261093
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
11271094
0 0 1px hsla(0,0%,100%,.2) inset,
@@ -1131,7 +1098,7 @@ html[dir='rtl'] .outlineItem > a {
11311098

11321099
.outlineItem.selected {
11331100
background-color: hsla(0,0%,100%,.08);
1134-
background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
1101+
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
11351102
background-clip: padding-box;
11361103
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
11371104
0 0 1px hsla(0,0%,100%,.1) inset,

0 commit comments

Comments
 (0)