Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

partially revert #3902 Skins: fix qss icons with kIconThemes 5.80 #3931

Merged
merged 1 commit into from
Jun 1, 2021
Merged

partially revert #3902 Skins: fix qss icons with kIconThemes 5.80 #3931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,16 +307,15 @@ WLibrary QLineEdit,

/* button in library "Preview" column */
QPushButton#LibraryPreviewButton {
background: transparent;
background-color: transparent;
margin: 0px;
padding: 3px;
padding: 0px;
border: 1px solid transparent;
border-radius: 2px;
}

QPushButton#LibraryPreviewButton:!checked {
/* TODO ronso0 Restore once fixed lib linKIconThemes (vers. <..80) is in *ubuntu main repos */
/*image: url(skin:/../Deere/icon/ic_library_preview_play.svg);*/
image: url(skin:/../Deere/icon/ic_library_preview_play.svg);
}

QPushButton#LibraryPreviewButton:!checked:hover {
Expand All @@ -325,7 +324,7 @@ QPushButton#LibraryPreviewButton:!checked:hover {
}

QPushButton#LibraryPreviewButton:checked {
/*image: url(skin:/../Deere/icon/ic_library_preview_pause.svg);*/
image: url(skin:/../Deere/icon/ic_library_preview_pause.svg);
background-color: #0f0f0f;
border: 1px solid #006596;
}
Expand All @@ -338,15 +337,15 @@ QPushButton#LibraryPreviewButton:checked:hover {
#LibraryContainer QHeaderView {
/* Don't set a font size to pick up the system font size. */
color: #d2d2d2;
background: #1A1A1A;
background-color: #1A1A1A;
border-bottom: 1px solid #141414;
}

#LibraryContainer QHeaderView::section {
height: 1.1em;
font-weight: bold;
padding: 2px;
background: #1A1A1A;
background-color: #1A1A1A;
border-top: none;
border-left: none;
border-bottom: 1px solid #141414;
Expand Down Expand Up @@ -468,14 +467,14 @@ WSearchLineEdit {
#LibraryVerticalSplitter::handle,
#WaveformSplitter::handle {
image: url(skin:/../Deere/image/style_handle_vertical_unchecked.svg);
background: #222;
background-color: #222;
}

#LibraryCoverArtSplitter::handle:pressed,
#LibraryVerticalSplitter::handle:pressed,
#WaveformSplitter::handle:pressed {
image: url(skin:/../Deere/image/style_handle_vertical_checked.svg);
background: #222;
background-color: #222;
}

#LibraryCoverArtSplitter::handle:horizontal,
Expand Down Expand Up @@ -650,7 +649,7 @@ WEffectSelector QAbstractScrollArea QScrollBar:horizontal,
border-top: 1px solid #141414;
min-width: 12px;
height: 15px;
background: #222222;
background-color: #222222;
padding: 3px;
}
#LibraryContainer QScrollBar:vertical,
Expand All @@ -659,7 +658,7 @@ WEffectSelector QAbstractScrollArea QScrollBar:vertical,
border-left: 1px solid #141414;
min-height: 12px;
width: 15px;
background: #222222;
background-color: #222222;
padding: 3px;
}
/* "add-page" and "sub-page" are the gutter of the scrollbar */
Expand All @@ -675,15 +674,15 @@ WEffectSelector QAbstractScrollArea QScrollBar::sub-page,
WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal,
#fadeModeCombobox QAbstractScrollArea QScrollBar::handle:horizontal {
min-width: 25px;
background: #5F5F5F;
background-color: #5F5F5F;
border-radius: 3px;
border: none;
}
#LibraryContainer QScrollBar::handle:vertical,
WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical,
#fadeModeCombobox QAbstractScrollArea QScrollBar::handle:vertical {
min-height: 25px;
background: #5F5F5F;
background-color: #5F5F5F;
border-radius: 3px;
border: none;
}
Expand All @@ -693,7 +692,7 @@ WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal:hover,
WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical:hover,
#fadeModeCombobox QAbstractScrollArea QScrollBar::handle:horizontal:hover,
#fadeModeCombobox QAbstractScrollArea QScrollBar::handle:vertical:hover {
background: #B3B3B3;
background-color: #B3B3B3;
}

/* Turn off buttons */
Expand Down Expand Up @@ -777,7 +776,7 @@ WEffectSelector QAbstractScrollArea::corner,
#SkinSettings > #h3 WPushButton:hover,
#SkinSettingsButton:hover,
#SkinSettingsCategoryButton:hover {
background: #222222;
background-color: #222222;
}

/*******************************************************************************
Expand Down Expand Up @@ -1064,7 +1063,7 @@ WBeatSpinBox,
#BpmKeyEditRowExpanded {
/* emphasize active widget */
border: 1px solid #FF6600;
background: rgba(255, 102, 0, 64);
background-color: rgba(255, 102, 0, 64);
color: #D6D6D6;
}

Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
<!-- ToDo ronso0 :: Unfortunately, variables are not considered here, yet ;)
because the launch screen appears while the skin is parsed.
image: url(skin:/style_<Variable name="scheme"/>/mixxx_logo.svg); -->
background: transparent url(skin:/palemoon/style/mixxx_logo.svg) no-repeat center center;
image: url(skin:/palemoon/style/mixxx_logo.svg);
padding: 0;
margin: 0px 2px 0px 2px;
border: none;
Expand Down
Loading