Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c2fde78a1166
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 237292102a6e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 25, 2020

  1. Styles: various fixes for better compatibility with other GTK themes. F… 

    …ixes #105.
    @azonenberg
    azonenberg committed May 25, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    makenowjust Hiroya Fujinami
    GPG key ID: 9F4CB6A0CB6B6BE9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2372921 View commit details
Showing with 67 additions and 96 deletions.
  1. +67 −96 glscopeclient/styles/glscopeclient.css
163 changes: 67 additions & 96 deletions glscopeclient/styles/glscopeclient.css
View file
Original file line number Diff line number Diff line change
@@ -10,9 +10,33 @@ frame
background-color: @glscopeclient_bg_color;
}

label
toolbar,
.toolbar,
notebook *
{
color: @glscopeclient_text_color;
background-color: @glscopeclient_bg_color;
}

dialog,
dialog.*
{
color: @glscopeclient_text_color;
background-color: @glscopeclient_bg_color;
background-image: none;
}

label,
combobox *,
messagedialog *,
GtkGrid,
GtkGrid:disabled,
box,
box:disabled
{
color: @glscopeclient_text_color;
background-color: transparent;
background-image: none;
text-shadow: none;
}

button
@@ -28,9 +52,17 @@ button
color: @glscopeclient_text_color;
}

combobox *
toolbar button:hover,
toolbar button:hover:active
{
color: @glscopeclient_text_color;
background-image: none;
background-color: @glscopeclient_highlight_color;
}

toolbar button:focus
{
border-color: #202020;
border-image: none;
}

entry,
@@ -48,14 +80,6 @@ entry:disabled
background-color: @glscopeclient_inactive_color;
}

dialog,
dialog.*,
messagedialog *
{
background-color: @glscopeclient_bg_color;
background-image: none;
}

treeview
{
color: @glscopeclient_text_color;
@@ -79,11 +103,31 @@ row:selected:focus:hover,
background-color: @glscopeclient_highlight_color;
}


notebook,
notebook tab,
notebook header,
notebook header.top tab,
row:hover,
row:hover:focus,
.cell:hover
.cell:hover,
notebook viewport,
paned > separator
{
background-color: @glscopeclient_bg_color;
background-color: @glscopeclient_bg_color;
border: none;
}

notebook header.top tab
{
background-image: -gtk-gradient(
linear,
left top,
left bottom,
from (@glscopeclient_bg_color),
color-stop (0.5, @glscopeclient_gradient_color),
to (@glscopeclient_bg_color)
);
}

treeview header button
@@ -96,123 +140,50 @@ treeview header button
border-right: none;
}

paned > separator
{
background-color: @glscopeclient_bg_color;
border: none;
}

.toolbar
{
background-color: @glscopeclient_bg_color;
}

toolbar button:hover
{
background-image: none;
background-color: @glscopeclient_highlight_color;
}

toolbar button:hover:active
{
background-image: none;
background-color: @glscopeclient_highlight_color;
}

toolbar button:focus
{
border-color: #202020;
border-image: none;
}

tooltip *,
.tooltip *
{
color: black;
}

.status
tooltip
{
color: @glscopeclient_text_color;
background-color: #ffffa0;
}

menu,
.menu
{
background-image: none;
background-color: @glscopeclient_bg_color;
color: @glscopeclient_text_color;
}

.menu,
menubar,
menu menuitem
{
background-image: none;
background-color: @glscopeclient_bg_color;
}

menuitem arrow
{
color: @glscopeclient_text_color;
}

menu menuitem:hover
{
background-color: @glscopeclient_highlight_color;
border-color: transparent;
}

menuitem:disabled,
menuitem:disabled *
{
color: @glscopeclient_highlight_color;
text-shadow: none;
}

menuitem arrow,
menuitem separator,
menuitem separator,
.menu separator,
menuitem separator
{
color: @glscopeclient_text_color;
}

menubar
.status
{
background-image: none;
background-color: @glscopeclient_bg_color;
color: @glscopeclient_text_color;
}

menubar menuitem:hover,
.menubar menuitem:hover,
menuitem button.flat:hover,
menuitem button.flat:active
menuitem button.flat:active,
menu menuitem:hover
{
background-image: none;
background-color: @glscopeclient_highlight_color;
border-color: transparent;
}

notebook
{
background-color: @glscopeclient_bg_color;
}

notebook tab,
notebook header,
notebook header.top tab
{
background-color: @glscopeclient_bg_color;
}

notebook header.top tab
{
background-image: -gtk-gradient(
linear,
left top,
left bottom,
from (@glscopeclient_bg_color),
color-stop (0.5, @glscopeclient_gradient_color),
to (@glscopeclient_bg_color)
);
}