mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1169981 - Add win10 media query to listitem and treechildren. r=dao

This commit is contained in:
Richard Marti 2015-05-31 11:52:48 +02:00
Родитель 3b4c44713c
Коммит 85353bd196
2 изменённых файлов: 27 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
toolkit/themes/windows/global/listbox.css
Просмотреть файл

@ -62,7 +62,7 @@ listbox:focus > listitem[selected="true"] {
/* ::::: listheader ::::: */
listheader {
listheader {
-moz-appearance: treeheadercell;
-moz-box-align: center;
border: 2px solid;
@ -160,22 +160,20 @@ listheader[sortable="true"]:hover:active {
padding-top: 1px;
padding-bottom: 1px;
border-width: 1px;
border-radius: 3px;
background-repeat: no-repeat;
background-size: 100% 100%;
box-shadow: inset 0 0 0 1px rgba(255,255,255,.4), inset 0 -1px 0 1px rgba(255,255,255,.2);
}
listitem[selected="true"] {
border-color: @selectedBorderColor@;
background-image: linear-gradient(@selectedGradientColor1@, @selectedGradientColor2@);
background-image: linear-gradient(@selectedGradientColor2@, @selectedGradientColor2@);
background-color: rgba(190,190,190,.15);
color: -moz-DialogText;
}
listbox:focus > listitem[selected="true"] {
border-color: @selectedFocusBorderColor@;
background-image: linear-gradient(@selectedFocusGradientColor1@, @selectedFocusGradientColor2@);
background-image: linear-gradient(@selectedFocusGradientColor2@, @selectedFocusGradientColor2@);
background-color: rgba(131,183,249,.02);
color: -moz-DialogText;
}
@ -191,18 +189,19 @@ listheader[sortable="true"]:hover:active {
}
}
@media (-moz-os-version: windows-win8) {
@media (-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
listitem {
border-radius: 0;
box-shadow: none;
border-radius: 3px;
box-shadow: inset 0 0 0 1px rgba(255,255,255,.4), inset 0 -1px 0 1px rgba(255,255,255,.2);
}
listitem[selected="true"] {
background-image: linear-gradient(@selectedGradientColor2@, @selectedGradientColor2@);
background-image: linear-gradient(@selectedGradientColor1@, @selectedGradientColor2@);
}
listbox:focus > listitem[selected="true"] {
background-image: linear-gradient(@selectedFocusGradientColor2@, @selectedFocusGradientColor2@);
background-image: linear-gradient(@selectedFocusGradientColor1@, @selectedFocusGradientColor2@);
}
}
}

37
toolkit/themes/windows/global/tree.css
Просмотреть файл

@ -424,12 +424,10 @@ treechildren::-moz-tree-cell-text(selected, editing) {
color: -moz-FieldText;
-moz-margin-start: 1px;
-moz-margin-end: 1px;
border-width: 2px;
border-width: 1px;
border-color: transparent;
border-radius: 3px;
background-repeat: no-repeat;
background-size: 100% 100%;
-moz-outline-radius: 3px;
}
treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
@ -437,7 +435,7 @@ treechildren::-moz-tree-cell-text(selected, editing) {
-moz-border-right-colors: @selectedBorderColor@ @whiteOpacityBorderColor@;
-moz-border-left-colors: @selectedBorderColor@ @whiteOpacityBorderColor@;
-moz-border-bottom-colors: @selectedBorderColor@ @whiteOpacityBottomBorderColor@;
background-image: linear-gradient(@selectedGradientColor1@, @selectedGradientColor2@);
background-image: linear-gradient(@selectedGradientColor2@, @selectedGradientColor2@);
background-color: transparent;
outline: 1px solid @whiteOpacityBorderColor@;
}
@ -457,7 +455,7 @@ treechildren::-moz-tree-cell-text(selected, editing) {
-moz-border-right-colors: @selectedFocusBorderColor@ @whiteOpacityBorderColor@;
-moz-border-left-colors: @selectedFocusBorderColor@ @whiteOpacityBorderColor@;
-moz-border-bottom-colors: @selectedFocusBorderColor@ @whiteOpacityBottomBorderColor@;
background-image: linear-gradient(@selectedFocusGradientColor1@, @selectedFocusGradientColor2@);
background-image: linear-gradient(@selectedFocusGradientColor2@, @selectedFocusGradientColor2@);
background-color: transparent;
}
@ -467,7 +465,7 @@ treechildren::-moz-tree-cell-text(selected, editing) {
-moz-border-right-colors: @hoverAndFocusBorderColor@ @whiteOpacityBorderColor@;
-moz-border-left-colors: @hoverAndFocusBorderColor@ @whiteOpacityBorderColor@;
-moz-border-bottom-colors: @hoverAndFocusBorderColor@ @whiteOpacityBottomBorderColor@;
background-image: linear-gradient(@hoverAndCurrentFocusGradientColor1@, @hoverAndCurrentFocusGradientColor2@);
background-image: linear-gradient(@hoverAndCurrentFocusGradientColor2@, @hoverAndCurrentFocusGradientColor2@);
}
treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) {
@ -475,7 +473,7 @@ treechildren::-moz-tree-cell-text(selected, editing) {
-moz-border-right-colors: @hoverBorderColor@ @whiteOpacityBorderColor@;
-moz-border-left-colors: @hoverBorderColor@ @whiteOpacityBorderColor@;
-moz-border-bottom-colors: @hoverBorderColor@ @whiteOpacityBottomBorderColor@;
background-image: linear-gradient(@hoverGradientColor1@, @hoverGradientColor2@);
background-image: linear-gradient(@hoverGradientColor2@, @hoverGradientColor2@);
outline: 1px solid @whiteOpacityBorderColor@;
}
@ -484,7 +482,7 @@ treechildren::-moz-tree-cell-text(selected, editing) {
-moz-border-right-colors: @hoverAndFocusBorderColor@ @whiteOpacityBorderColor@;
-moz-border-left-colors: @hoverAndFocusBorderColor@ @whiteOpacityBorderColor@;
-moz-border-bottom-colors: @hoverAndFocusBorderColor@ @whiteOpacityBottomBorderColor@;
background-image: linear-gradient(@hoverGradientColor1@, @hoverGradientColor2@);
background-image: linear-gradient(@hoverGradientColor2@, @hoverGradientColor2@);
}
treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) {
@ -492,7 +490,7 @@ treechildren::-moz-tree-cell-text(selected, editing) {
-moz-border-right-colors: @hoverAndFocusBorderColor@ @whiteOpacityBorderColor@;
-moz-border-left-colors: @hoverAndFocusBorderColor@ @whiteOpacityBorderColor@;
-moz-border-bottom-colors: @hoverAndFocusBorderColor@ @whiteOpacityBottomBorderColor@;
background-image: linear-gradient(@hoverAndCurrentFocusGradientColor1@, @hoverAndCurrentFocusGradientColor2@);
background-image: linear-gradient(@hoverAndCurrentFocusGradientColor2@, @hoverAndCurrentFocusGradientColor2@);
}
tree[disabled="true"] > treechildren::-moz-tree-row {
@ -519,36 +517,37 @@ treechildren::-moz-tree-cell-text(selected, editing) {
color: -moz-DialogText;
}
@media (-moz-os-version: windows-win8) {
@media (-moz-os-version: windows-vista),
(-moz-os-version: windows-win7) {
treechildren:not(.autocomplete-treebody)::-moz-tree-row {
border-width: 1px;
border-radius: 0;
-moz-outline-radius: 0;
border-width: 2px;
border-radius: 3px;
-moz-outline-radius: 3px;
}
treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
background-image: linear-gradient(@selectedGradientColor2@, @selectedGradientColor2@);
background-image: linear-gradient(@selectedGradientColor1@, @selectedGradientColor2@);
}
treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus),
treechildren::-moz-tree-row(dropOn) {
background-image: linear-gradient(@selectedFocusGradientColor2@, @selectedFocusGradientColor2@);
background-image: linear-gradient(@selectedFocusGradientColor1@, @selectedFocusGradientColor2@);
}
treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, current, focus) {
background-image: linear-gradient(@hoverAndCurrentFocusGradientColor2@, @hoverAndCurrentFocusGradientColor2@);
background-image: linear-gradient(@hoverAndCurrentFocusGradientColor1@, @hoverAndCurrentFocusGradientColor2@);
}
treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) {
background-image: linear-gradient(@hoverGradientColor2@, @hoverGradientColor2@);
background-image: linear-gradient(@hoverGradientColor1@, @hoverGradientColor2@);
}
treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, current) {
background-image: linear-gradient(@hoverGradientColor2@, @hoverGradientColor2@);
background-image: linear-gradient(@hoverGradientColor1@, @hoverGradientColor2@);
}
treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) {
background-image: linear-gradient(@hoverAndCurrentFocusGradientColor2@, @hoverAndCurrentFocusGradientColor2@);
background-image: linear-gradient(@hoverAndCurrentFocusGradientColor1@, @hoverAndCurrentFocusGradientColor2@);
}
}
}