Merge branch 'master' of github.com:vinceliuice/WhiteSur-gtk-theme
This commit is contained in:
commit
f4fd65e3c1
2 changed files with 9 additions and 3 deletions
|
@ -244,7 +244,8 @@ $osd_fg_color: #eeeeec;
|
|||
}
|
||||
|
||||
#dashtodockContainer.dashtodock #dash .dash-background {
|
||||
background: #2e3436;
|
||||
background: $dash_background_color;
|
||||
border-width: 0;
|
||||
}
|
||||
|
||||
#dashtodockContainer.dashtodock .progress-bar {
|
||||
|
@ -256,7 +257,7 @@ $osd_fg_color: #eeeeec;
|
|||
|
||||
#dashtodockContainer.top #dash .placeholder,
|
||||
#dashtodockContainer.bottom #dash .placeholder {
|
||||
width: 32px;
|
||||
width: $dash_placeholder_size;
|
||||
height: 1px;
|
||||
}
|
||||
|
||||
|
|
|
@ -39,8 +39,13 @@ findbar:-moz-window-inactive {
|
|||
}
|
||||
|
||||
#titlebar {
|
||||
<<<<<<< HEAD
|
||||
min-height: 0 !important
|
||||
max-height: 48px !important;
|
||||
=======
|
||||
min-height: 0 !important;
|
||||
max-height: 36px !important;
|
||||
>>>>>>> aa1efe3563d62b390a902b9bea4af15a361886c8
|
||||
}
|
||||
|
||||
#TabsToolbar {
|
||||
|
@ -90,7 +95,7 @@ findbar:-moz-window-inactive {
|
|||
|
||||
/* bookmark-item */
|
||||
toolbarbutton.bookmark-item {
|
||||
padding: 0 4px; !important;
|
||||
padding: 0 4px !important;
|
||||
margin: 0 2px !important;
|
||||
border-radius: 3px !important;
|
||||
max-height: 20px !important;
|
||||
|
|
Loading…
Reference in a new issue