diff -Naur ubuntu-themes.orig/Ambiance/gtk-3.0/assets/combobox-button-toolbar-focused.png ubuntu-themes/Ambiance/gtk-3.0/assets/combobox-button-toolbar-focused.png --- ubuntu-themes.orig/Ambiance/gtk-3.0/assets/combobox-button-toolbar-focused.png 1970-01-01 05:00:00.000000000 +0500 +++ ubuntu-themes/Ambiance/gtk-3.0/assets/combobox-button-toolbar-focused.png 2013-05-31 21:59:28.933901903 +0600 @@ -0,0 +1,4 @@ +PNG + + IHDRvY߉bKGD pHYs  tIME-CIDAT8˕=OTQ9"b4kcHkb q+K J +b-&JBDl-Lpw~36jX\-;3vxxX.jJܸ>US j,B$|VUYn6;ǵFI`QdNqWGoz{oGnu{CQ]WR&IT(hU/rޭXe9f .֖ϼxo_ W19T@ۥ9)Z `L޽n`)2U!b1Fask! lss3 ΃)\\\O`llLs&@ߗKf"g"9]ES@'k!]0H^8}: ]x*6h *sy)Nd⇓K"ґS"Ρ+$ED4Kz興fYi۶RFFƳc7ˀTD?cldIENDB` \ Brak znaku nowej linii na końcu pliku diff -Naur ubuntu-themes.orig/Ambiance/gtk-3.0/assets/combobox-button-toolbar.png ubuntu-themes/Ambiance/gtk-3.0/assets/combobox-button-toolbar.png --- ubuntu-themes.orig/Ambiance/gtk-3.0/assets/combobox-button-toolbar.png 1970-01-01 05:00:00.000000000 +0500 +++ ubuntu-themes/Ambiance/gtk-3.0/assets/combobox-button-toolbar.png 2013-05-31 21:59:28.933901903 +0600 @@ -0,0 +1,4 @@ +PNG + + IHDRvY߉bKGD pHYs  tIME#ՆIDAT8˝?Ar&+w*HLLHCT6~|?V)@ʜwB.DX x߼ 3^q^t:-SleЀ2 qHEGȲ? VJE'I"Y:PAYkc:_]}z)".`l# +qm.;s眨JO;u>Iz]Dn_s!EQ2zDw{m)x<?PNOZ;4NXP.ޠH,百Rr ([VecZvO)-:EгL~ZmG)WJim\^"I I% RL08?2 2/(o֖l7#2I6y~◡/CIIENDB` \ Brak znaku nowej linii na końcu pliku diff -Naur ubuntu-themes.orig/Ambiance/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png ubuntu-themes/Ambiance/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png --- ubuntu-themes.orig/Ambiance/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png 1970-01-01 05:00:00.000000000 +0500 +++ ubuntu-themes/Ambiance/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png 2013-05-31 21:59:28.933901903 +0600 @@ -0,0 +1,4 @@ +PNG + + IHDRvY߉bKGD pHYs  tIME# IDAT8˝?Ar&+w*HLLHCT6~|?V)@ʜwB.DX x߼ 3^q^t:-SleЀ2 qHEGȲ? VJE'I"Y:PAYkc:_]}z)".`l# +qm.;s眨JO;u>Iz]Dn_s!EQ2zDw{m)x<?PNOZ;4NXP.ޠH,百Rr ([VecZvO)-:EгL~ZmG)WJim\^"I I% RL08?2 2/(o֖l7#2I6y~◡/CIIENDB` \ Brak znaku nowej linii na końcu pliku diff -Naur ubuntu-themes.orig/Ambiance/gtk-3.0/gtk-widgets-assets.css ubuntu-themes/Ambiance/gtk-3.0/gtk-widgets-assets.css --- ubuntu-themes.orig/Ambiance/gtk-3.0/gtk-widgets-assets.css 2013-05-28 02:32:41.312339000 +0600 +++ ubuntu-themes/Ambiance/gtk-3.0/gtk-widgets-assets.css 2013-05-31 21:59:28.933901903 +0600 @@ -383,16 +383,22 @@ }*/ .primary-toolbar .menu .check, +.menubar.toolbar .menu .check, +.header-bar .menu .check, .menu .check { background-image: url("assets/check-menuitem-unselected.png"); } .primary-toolbar .menu .radio, +.menubar.toolbar .menu .radio, +.header-bar .menu .radio, .menu .radio { background-image: url("assets/check-menuitem-unselected.png"); } .primary-toolbar .menu .check:active, +.menubar.toolbar .menu .check:active, +.header-bar .menu .check:active, .toolbar .menu .check:active:hover, .menu .check:active, .menu .check:active:hover { @@ -400,6 +406,8 @@ } .primary-toolbar .menu .check:active:insensitive, +.menubar.toolbar .menu .check:active:insensitive, +.header-bar .menu .check:active:insensitive, .toolbar .menu .check:active:hover:insensitive, .menu .check:active:insensitive, .menu .check:active:hover:insensitive { @@ -407,6 +415,8 @@ } .primary-toolbar .menu .radio:active, +.menubar.toolbar .menu .radio:active, +.header-bar .menu .radio:active, .toolbar .menu .radio:active:hover, .menu .radio:active, .menu .radio:active:hover { @@ -414,6 +424,8 @@ } .primary-toolbar .menu .radio:active:insensitive, +.menubar.toolbar .menu .radio:active:insensitive, +.header-bar .menu .radio:active:insensitive, .toolbar .menu .radio:active:hover:insensitive, .menu .radio:active:insensitive, .menu .radio:active:hover:insensitive { diff -Naur ubuntu-themes.orig/Ambiance/gtk-3.0/gtk-widgets-borders.css ubuntu-themes/Ambiance/gtk-3.0/gtk-widgets-borders.css --- ubuntu-themes.orig/Ambiance/gtk-3.0/gtk-widgets-borders.css 2013-05-28 02:32:41.312339000 +0600 +++ ubuntu-themes/Ambiance/gtk-3.0/gtk-widgets-borders.css 2013-05-31 21:59:28.933901903 +0600 @@ -110,27 +110,39 @@ border-image: url("assets/button-default-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button { +.primary-toolbar .button, +.menubar.toolbar .button, +.header-bar .button { border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:focused { +.primary-toolbar .button:focused, +.menubar.toolbar .button:focused, +.header-bar .button:focused { border-image: url("assets/button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:active { +.primary-toolbar .button:active, +.menubar.toolbar .button:active, +.header-bar .button:active { border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:active:focused { +.primary-toolbar .button:active:focused, +.menubar.toolbar .button:active:focused, +.header-bar .button:active:focused { border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:backdrop { +.primary-toolbar .button:backdrop, +.menubar.toolbar .button:backdrop, +.header-bar .button:backdrop { border-image: url("assets/backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:active:backdrop { +.primary-toolbar .button:active:backdrop, +.menubar.toolbar .button:active:backdrop, +.header-bar .button:active:backdrop { border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } @@ -176,16 +188,24 @@ border-image: url("assets/backdrop-entry-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .entry { +.primary-toolbar .entry, +.menubar.toolbar .entry, +.header-bar .entry { border-image: url("assets/entry-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .entry:focus { +.primary-toolbar .entry:focus, +.menubar.toolbar .entry:focus, +.header-bar .entry:focus { border-image: url("assets/entry-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } .primary-toolbar .entry.progressbar, .primary-toolbar .entry.progressbar, +.menubar.toolbar .entry.progressbar, +.menubar.toolbar .entry.progressbar, +.header-bar .entry.progressbar, +.header-bar .entry.progressbar, .entry.progressbar { border-radius: 8px; border-width: 0; @@ -232,16 +252,45 @@ border-image: url("assets/combobox-button-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch; } +.primary-toolbar GtkComboBox.combobox-entry .button, +.primary-toolbar GtkComboBox.combobox-entry .button:focus:insensitive, +.menubar.toolbar GtkComboBox.combobox-entry .button, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus:insensitive, +.header-bar GtkComboBox.combobox-entry .button, +.header-bar GtkComboBox.combobox-entry .button:focus:insensitive { + border-image: url("assets/combobox-button-toolbar.png") 10 12 10 1 / 10px 12px 10px 1px stretch; +} + +.primary-toolbar GtkComboBox.combobox-entry .button:focus, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus, +.header-bar GtkComboBox.combobox-entry .button:focus { + border-image: url("assets/combobox-button-toolbar-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch; +} + +.primary-toolbar GtkComboBox.combobox-entry .button:focus:active:focus, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus:active:focus, +.header-bar GtkComboBox.combobox-entry .button:focus:active:focus { + border-image: url("assets/combobox-button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch; +} + .primary-toolbar GtkComboBox.combobox-entry .entry:first-child, -.primary-toolbar GtkComboBox.combobox-entry .button:first-child { +.primary-toolbar GtkComboBox.combobox-entry .button:first-child, +.menubar.toolbar GtkComboBox.combobox-entry .entry:first-child, +.menubar.toolbar GtkComboBox.combobox-entry .button:first-child, +.header-bar GtkComboBox.combobox-entry .entry:first-child, +.header-bar GtkComboBox.combobox-entry .button:first-child { border-image-width: 10px 0 10px 12px; border-radius: 8px 0 0 8px; border-right-width: 0; } .primary-toolbar GtkComboBox.combobox-entry .entry:last-child, -.primary-toolbar GtkComboBox.combobox-entry .button:last-child { - border-image-width: 10px 12px 10px 0; +.primary-toolbar GtkComboBox.combobox-entry .button:last-child, +.menubar.toolbar GtkComboBox.combobox-entry .entry:last-child, +.menubar.toolbar GtkComboBox.combobox-entry .button:last-child, +.header-bar GtkComboBox.combobox-entry .entry:last-child, +.header-bar GtkComboBox.combobox-entry .button:last-child { + border-image-width: 10px 12px 10px 1px; border-radius: 0 8px 8px 0; border-left-width: 0; } @@ -265,6 +314,22 @@ .primary-toolbar .raised .button:active, .primary-toolbar .button.raised:insensitive, .primary-toolbar .raised .button:insensitive, +.menubar.toolbar .entry, +.menubar.toolbar GtkComboBox.combobox-entry .entry, +.menubar.toolbar GtkComboBox.combobox-entry .button, +.menubar.toolbar .button:active, +.menubar.toolbar .button.raised:active, +.menubar.toolbar .raised .button:active, +.menubar.toolbar .button.raised:insensitive, +.menubar.toolbar .raised .button:insensitive, +.header-bar .entry, +.header-bar GtkComboBox.combobox-entry .entry, +.header-bar GtkComboBox.combobox-entry .button, +.header-bar .button:active, +.header-bar .button.raised:active, +.header-bar .raised .button:active, +.header-bar .button.raised:insensitive, +.header-bar .raised .button:insensitive, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar .button:insensitive, .inline-toolbar.toolbar GtkToolButton .button:active, @@ -272,7 +337,15 @@ .primary-toolbar GtkSwitch.trough, .primary-toolbar GtkSwitch.trough:insensitive, .primary-toolbar GtkComboBox .button:active, -.primary-toolbar GtkComboBox .button:insensitive { +.primary-toolbar GtkComboBox .button:insensitive, +.menubar.toolbar GtkSwitch.trough, +.menubar.toolbar GtkSwitch.trough:insensitive, +.menubar.toolbar GtkComboBox .button:active, +.menubar.toolbar GtkComboBox .button:insensitive, +.header-bar GtkSwitch.trough, +.header-bar GtkSwitch.trough:insensitive, +.header-bar GtkComboBox .button:active, +.header-bar GtkComboBox .button:insensitive { } /* primary toolbar - focused element borders */ @@ -284,16 +357,40 @@ .primary-toolbar .raised .button:focus:active, .primary-toolbar .button.raised.default:active, .primary-toolbar .raised .button.default:active, +.menubar.toolbar .entry:focus, +.menubar.toolbar .button:active:focus, +.menubar.toolbar GtkComboBox.combobox-entry .entry:focus, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus, +.menubar.toolbar .button.raised:focus:active, +.menubar.toolbar .raised .button:focus:active, +.menubar.toolbar .button.raised.default:active, +.menubar.toolbar .raised .button.default:active, +.header-bar .entry:focus, +.header-bar .button:active:focus, +.header-bar GtkComboBox.combobox-entry .entry:focus, +.header-bar GtkComboBox.combobox-entry .button:focus, +.header-bar .button.raised:focus:active, +.header-bar .raised .button:focus:active, +.header-bar .button.raised.default:active, +.header-bar .raised .button.default:active, .inline-toolbar.toolbar .button:focus:active, .inline-toolbar.toolbar .button.default:active, -.primary-toolbar GtkComboBox .button:active:focus { +.primary-toolbar GtkComboBox .button:active:focus, +.menubar.toolbar GtkComboBox .button:active:focus, +.header-bar GtkComboBox .button:active:focus { } /* primary toolbar - generic button borders */ .primary-toolbar .button.raised, .primary-toolbar .raised .button, +.menubar.toolbar .button.raised, +.menubar.toolbar .raised .button, +.header-bar .button.raised, +.header-bar .raised .button, .inline-toolbar.toolbar .button, -.primary-toolbar GtkComboBox .button { +.primary-toolbar GtkComboBox .button, +.menubar.toolbar GtkComboBox .button, +.header-bar GtkComboBox .button { } /* primary toolbar - focused button borders */ @@ -301,9 +398,19 @@ .primary-toolbar .button.raised.default, .primary-toolbar .raised .button:focus, .primary-toolbar .raised .button.default, +.menubar.toolbar .button.raised:focus, +.menubar.toolbar .button.raised.default, +.menubar.toolbar .raised .button:focus, +.menubar.toolbar .raised .button.default, +.header-bar .button.raised:focus, +.header-bar .button.raised.default, +.header-bar .raised .button:focus, +.header-bar .raised .button.default, .inline-toolbar.toolbar .button:focus, .inline-toolbar.toolbar .button.default, -.primary-toolbar GtkComboBox .button:focus { +.primary-toolbar GtkComboBox .button:focus, +.menubar.toolbar GtkComboBox .button:focus, +.header-bar GtkComboBox .button:focus { } /* column-headers borders */ @@ -398,11 +505,15 @@ border-image: url("assets/switch-trough-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar GtkSwitch.trough { +.primary-toolbar GtkSwitch.trough, +.menubar.toolbar GtkSwitch.trough, +.header-bar GtkSwitch.trough { border-image: url("assets/switch-trough-toolbar-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar GtkSwitch.trough:active { +.primary-toolbar GtkSwitch.trough:active, +.menubar.toolbar GtkSwitch.trough:active, +.header-bar GtkSwitch.trough:active { border-image: url("assets/switch-trough-toolbar-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } diff -Naur ubuntu-themes.orig/Ambiance/gtk-3.0/gtk-widgets.css ubuntu-themes/Ambiance/gtk-3.0/gtk-widgets.css --- ubuntu-themes.orig/Ambiance/gtk-3.0/gtk-widgets.css 2013-05-28 02:32:41.312339000 +0600 +++ ubuntu-themes/Ambiance/gtk-3.0/gtk-widgets.css 2013-05-31 21:59:28.937901903 +0600 @@ -272,7 +272,17 @@ .primary-toolbar .linked .button, .primary-toolbar .linked .button:active, .primary-toolbar .linked .button:active:hover, -.primary-toolbar .linked .button:insensitive { +.primary-toolbar .linked .button:insensitive, +.menubar.toolbar .linked .entry, +.menubar.toolbar .linked .button, +.menubar.toolbar .linked .button:active, +.menubar.toolbar .linked .button:active:hover, +.menubar.toolbar .linked .button:insensitive, +.header-bar .linked .entry, +.header-bar .linked .button, +.header-bar .linked .button:active, +.header-bar .linked .button:active:hover, +.header-bar .linked .button:insensitive { border-width: 1px; border-right-width: 0; @@ -400,44 +410,86 @@ /* Set up shadows and hilights for button visual separation */ .primary-toolbar .linked .button, .primary-toolbar .button.raised.linked, -.primary-toolbar .raised.linked .button { +.primary-toolbar .raised.linked .button, +.menubar.toolbar .linked .button, +.menubar.toolbar .button.raised.linked, +.menubar.toolbar .raised.linked .button, +.header-bar .linked .button, +.header-bar .button.raised.linked, +.header-bar .raised.linked .button { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4), inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:first-child, .primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .raised.linked .button:first-child { +.primary-toolbar .raised.linked .button:first-child, +.menubar.toolbar .linked .button:first-child, +.menubar.toolbar .button.raised.linked:first-child, +.menubar.toolbar .raised.linked .button:first-child, +.header-bar .linked .button:first-child, +.header-bar .button.raised.linked:first-child, +.header-bar .raised.linked .button:first-child { box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:last-child, .primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .raised.linked .button:last-child { +.primary-toolbar .raised.linked .button:last-child, +.menubar.toolbar .linked .button:last-child, +.menubar.toolbar .button.raised.linked:last-child, +.menubar.toolbar .raised.linked .button:last-child, +.header-bar .linked .button:last-child,s +.header-bar .button.raised.linked:last-child, +.header-bar .raised.linked .button:last-child { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4) } .primary-toolbar .linked .button:active, .primary-toolbar .button.raised.linked:active, -.primary-toolbar .raised.linked .button:active { +.primary-toolbar .raised.linked .button:active, +.menubar.toolbar .linked .button:active, +.menubar.toolbar .button.raised.linked:active +.menubar.toolbar .raised.linked .button:active, +.header-bar .linked .button:active, +.header-bar .button.raised.linked:active, +.header-bar .raised.linked .button:active { box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:insensitive, .primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button:insensitive { +.primary-toolbar .raised.linked .button:insensitive, +.menubar.toolbar .linked .button:insensitive, +.menubar.toolbar .button.raised.linked:insensitive, +.menubar.toolbar .raised.linked .button:insensitive, +.header-bar .linked .button:insensitive, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button:insensitive { box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:backdrop:last-child, .primary-toolbar .button.raised.linked:backdrop:last-child, -.primary-toolbar .raised.linked .button:backdrop:last-child { +.primary-toolbar .raised.linked .button:backdrop:last-child, +.menubar.toolbar .linked .button:backdrop:last-child, +.menubar.toolbar .button.raised.linked:backdrop:last-child, +.menubar.toolbar .raised.linked .button:backdrop:last-child, +.header-bar .linked .button:backdrop:last-child, +.header-bar .button.raised.linked:backdrop:last-child, +.header-bar .raised.linked .button:backdrop:last-child { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.2); } /*.primary-toolbar .linked .button:insensitive:backdrop, .primary-toolbar .button.raised.linked:insensitive:backdrop, -.primary-toolbar .raised.linked .button:insensitive:backdrop { +.primary-toolbar .raised.linked .button:insensitive:backdrop, +.menubar.toolbar .linked .button:insensitive:backdrop, +.menubar.toolbar .button.raised.linked:insensitive:backdrop, +.menubar.toolbar .raised.linked .button:insensitive:backdrop, +.header-bar .linked .button:insensitive:backdrop, +.header-bar .button.raised.linked:insensitive:backdrop, +.header-bar .raised.linked .button:insensitive:backdrop { box-shadow: inset -1px 0 @unfocused_insensitive_borders; }*/ @@ -447,7 +499,17 @@ .primary-toolbar .linked .button:only-child, .primary-toolbar .linked .button:active:only-child, .primary-toolbar .linked .button:active:hover:only-child, -.primary-toolbar .linked .button:insensitive:only-child { +.primary-toolbar .linked .button:insensitive:only-child, +.menubar.toolbar .linked .entry:only-child, +.menubar.toolbar .linked .button:only-child, +.menubar.toolbar .linked .button:active:only-child, +.menubar.toolbar .linked .button:active:hover:only-child, +.menubar.toolbar .linked .button:insensitive:only-child, +.header-bar .linked .entry:only-child, +.header-bar .linked .button:only-child, +.header-bar .linked .button:active:only-child, +.header-bar .linked .button:active:hover:only-child, +.header-bar .linked .button:insensitive:only-child { border-radius: 8px; box-shadow: none; } @@ -646,6 +708,9 @@ * entry * *********/ GtkComboBox.combobox-entry .button, +.primary-toolbar GtkComboBox.combobox-entry .button, +.menubar.toolbar GtkComboBox.combobox-entry .button, +.header-bar GtkComboBox.combobox-entry .button, .entry { -GtkWidget-focus-line-width: 0; @@ -658,6 +723,9 @@ } GtkComboBox.combobox-entry .button:backdrop, +.primary-toolbar GtkComboBox.combobox-entry .button:backdrop, +.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop, +.header-bar GtkComboBox.combobox-entry .button:backdrop, .entry:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (mix (shade (@base_color, 0.96), @bg_color, 0.5)), @@ -676,6 +744,9 @@ } GtkComboBox.combobox-entry .button:insensitive, +.primary-toolbar GtkComboBox.combobox-entry .button:insensitive, +.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive, +.header-bar GtkComboBox.combobox-entry .button:insensitive, .entry:insensitive { background-color: #f5f5f5; background-image: none; @@ -684,6 +755,9 @@ } GtkComboBox.combobox-entry .button:insensitive:backdrop, +.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop, +.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop, +.header-bar GtkComboBox.combobox-entry .button:insensitive:backdrop, .entry:insensitive:backdrop { background-color: mix (#f5f5f5, @bg_color, 0.5); @@ -692,6 +766,10 @@ .primary-toolbar .entry.progressbar, .primary-toolbar .entry.progressbar, +.menubar.toolbar .entry.progressbar, +.menubar.toolbar .entry.progressbar, +.header-bar .entry.progressbar, +.header-bar .entry.progressbar, .entry.progressbar { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@selected_bg_color, 0.8)), @@ -850,8 +928,12 @@ ********/ GtkTreeMenu.menu, .toolbar .primary-toolbar .menu, +.toolbar .menubar.toolbar .menu, +.toolbar .header-bar .menu, GtkMenuToolButton.menu, .primary-toolbar .button .menu, +.menubar.toolbar .button .menu, +.header-bar .button .menu, .menu { background-image: none; background-color: shade (@dark_bg_color, 1.08); @@ -902,7 +984,17 @@ .primary-toolbar .menu.button:active, .primary-toolbar .menu.button:active:insensitive, .primary-toolbar .menu.button:insensitive, -.primary-toolbar .menu.button */ +.primary-toolbar .menu.button, +.menubar.toolbar .menu.button:hover, +.menubar.toolbar .menu.button:active, +.menubar.toolbar .menu.button:active:insensitive, +.menubar.toolbar .menu.button:insensitive, +.menubar.toolbar .menu.button, +.header-bar .menu.button:hover, +.header-bar .menu.button:active, +.header-bar .menu.button:active:insensitive, +.header-bar .menu.button:insensitive, +.header-bar .menu.button */ { background-color: shade (@dark_bg_color, 1.08); background-image: none; @@ -1015,10 +1107,18 @@ GtkTreeMenu.menu .menuitem *:insensitive, .toolbar .primary-toolbar .menu .menuitem:insensitive, .toolbar .primary-toolbar .menu .menuitem *:insensitive, +.toolbar .menubar.toolbar .menu .menuitem:insensitive, +.toolbar .menubar.toolbar .menu .menuitem *:insensitive, +.toolbar .header-bar .menu .menuitem:insensitive, +.toolbar .header-bar .menu .menuitem *:insensitive, GtkMenuToolButton.menu .menuitem:insensitive, GtkMenuToolButton.menu .menuitem *:insensitive, .primary-toolbar .button .menu .menuitem:insensitive, .primary-toolbar .button .menu .menuitem *:insensitive, +.menubar.toolbar .button .menu .menuitem:insensitive, +.menubar.toolbar .button .menu .menuitem *:insensitive, +.header-bar .button .menu .menuitem:insensitive, +.header-bar .button .menu .menuitem *:insensitive, .menuitem:insensitive, .menuitem *:insensitive { color: mix (@dark_fg_color, @dark_bg_color, 0.5); @@ -1070,6 +1170,10 @@ .primary-toolbar GtkScale.trough, .primary-toolbar GtkScale.trough:backdrop, +.menubar.toolbar GtkScale.trough, +.menubar.toolbar GtkScale.trough:backdrop, +.header-bar GtkScale.trough, +.header-bar GtkScale.trough:backdrop, .menuitem GtkScale.trough { background-color: @dark_bg_color; background-image: none; @@ -1572,8 +1676,12 @@ GtkTreeMenu .menuitem.separator, .toolbar .primary-toolbar .menuitem.separator, +.toolbar .menubar.toolbar .menuitem.separator, +.toolbar .header-bar .menuitem.separator, GtkMenuToolButton .menuitem.separator, .primary-toolbar .button .menuitem.separator, +.menubar.toolbar .button .menuitem.separator, +.header-bar .button .menuitem.separator, .menuitem.separator { border-color: shade (@dark_bg_color, 0.99); border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5); @@ -1754,7 +1862,11 @@ .menu.spinner, .primary-toolbar .spinner, -.primary-toolbar .spinner { +.primary-toolbar .spinner, +.menubar.toolbar .spinner, +.menubar.toolbar .spinner, +.header-bar .spinner, +.header-bar .spinner { color: @selected_bg_color; } @@ -1846,7 +1958,9 @@ /* primary-toolbar */ .primary-toolbar, .primary-toolbar .toolbar, -.primary-toolbar.toolbar { +.primary-toolbar.toolbar, +.menubar.toolbar, +.header-bar { -GtkWidget-window-dragging: true; background-image: -gtk-gradient (linear, left top, left bottom, @@ -1864,7 +1978,10 @@ } .primary-toolbar .toolbar:backdrop, -.primary-toolbar.toolbar:backdrop { +.primary-toolbar.toolbar:backdrop, +.menubar.toolbar .toolbar:backdrop, +.menubar.toolbar.toolbar:backdrop, +.header-bar:backdrop { background-image: none; background-color: @dark_bg_color; box-shadow: none; @@ -1874,12 +1991,18 @@ color: @backdrop_dark_fg_color; } -.primary-toolbar :insensitive { +.primary-toolbar :insensitive, +.menubar.toolbar .toolbar :insensitive, +.header-bar :insensitive { text-shadow: 0 -1px shade (@dark_bg_color, 0.7); } .primary-toolbar GtkComboBox, -.primary-toolbar .button { +.primary-toolbar .button, +.menubar.toolbar GtkComboBox, +.menubar.toolbar .button, +.header-bar GtkComboBox, +.header-bar .button { background-color: transparent; background-image: none; border-color: transparent; @@ -1892,7 +2015,11 @@ } .primary-toolbar GtkComboBox:backdrop, -.primary-toolbar .button:backdrop { +.primary-toolbar .button:backdrop, +.menubar.toolbar GtkComboBox:backdrop, +.menubar.toolbar .button:backdrop, +.header-bar GtkComboBox:backdrop, +.header-bar .button:backdrop { color: @backdrop_dark_fg_color; text-shadow: 0 -1px shade (@dark_bg_color, 0.9); } @@ -1901,7 +2028,17 @@ .primary-toolbar .raised.button, .primary-toolbar .button:hover, .primary-toolbar .button:active, -.primary-toolbar .button:insensitive { +.primary-toolbar .button:insensitive, +.menubar.toolbar .raised .button, +.menubar.toolbar .raised.button, +.menubar.toolbar .button:hover, +.menubar.toolbar .button:active, +.menubar.toolbar .button:insensitive, +.header-bar .raised .button, +.header-bar .raised.button, +.header-bar .button:hover, +.header-bar .button:active, +.header-bar .button:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.2)), to (shade (@dark_bg_color, 1.1))); @@ -1912,19 +2049,36 @@ .primary-toolbar .raised.button:focus, .primary-toolbar .button:hover:focus, .primary-toolbar .button:active:focus, -.primary-toolbar .button:insensitive:focus { -} - -.primary-toolbar GtkComboBox.combobox-entry .button { +.primary-toolbar .button:insensitive:focus, +.menubar.toolbar .raised .button:focus, +.menubar.toolbar .raised.button:focus, +.menubar.toolbar .button:hover:focus, +.menubar.toolbar .button:active:focus, +.menubar.toolbar .button:insensitive:focus, +.header-bar .raised .button:focus, +.header-bar .raised.button:focus, +.header-bar .button:hover:focus, +.header-bar .button:active:focus, +.header-bar .button:insensitive:focus { } .primary-toolbar GtkComboBox.combobox-entry .button, .primary-toolbar .raised .button, .primary-toolbar .raised.button, -.primary-toolbar .button:hover { +.primary-toolbar .button:hover, +.menubar.toolbar GtkComboBox.combobox-entry .button, +.menubar.toolbar .raised .button, +.menubar.toolbar .raised.button, +.menubar.toolbar .button:hover, +.header-bar GtkComboBox.combobox-entry .button, +.header-bar .raised .button, +.header-bar .raised.button, +.header-bar .button:hover { } -.primary-toolbar .button:active { +.primary-toolbar .button:active, +.menubar.toolbar .button:active, +.header-bar .button:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.9)), to (shade (@dark_bg_color, 0.95))); @@ -1932,24 +2086,34 @@ text-shadow: 0 -1px shade (@dark_bg_color, 0.6); } -.primary-toolbar .button:active:hover { +.primary-toolbar .button:active:hover, +.menubar.toolbar .button:active:hover, +.header-bar .button:active:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.95)), to (shade (@dark_bg_color, 1.0))); } .primary-toolbar .button:active:insensitive, -.primary-toolbar .button:insensitive { +.primary-toolbar .button:insensitive, +.menubar.toolbar .button:active:insensitive, +.menubar.toolbar .button:insensitive, +.header-bar .button:active:insensitive, +.header-bar .button:insensitive { text-shadow: none; } -.primary-toolbar .button:insensitive { +.primary-toolbar .button:insensitive, +.menubar.toolbar .button:insensitive, +.header-bar .button:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.01)), to (shade (@dark_bg_color, 0.99))); } -.primary-toolbar .button:active:insensitive { +.primary-toolbar .button:active:insensitive, +.menubar.toolbar .button:active:insensitive, +.header-bar .button:active:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.94)), to (shade (@dark_bg_color, 1.02))); @@ -1957,7 +2121,13 @@ .primary-toolbar .entry, .primary-toolbar .entry:active, -.primary-toolbar .entry:focused { +.primary-toolbar .entry:focused, +.menubar.toolbar .entry, +.menubar.toolbar .entry:active, +.menubar.toolbar .entry:focused, +.header-bar .entry, +.header-bar .entry:active, +.header-bar .entry:focused { border-radius: 9px; /* background-color: @dark_bg_color; @@ -1968,7 +2138,13 @@ .primary-toolbar GtkSeparatorToolItem, .primary-toolbar .separator, -.primary-toolbar .separator:insensitive { +.primary-toolbar .separator:insensitive, +.menubar.toolbar GtkSeparatorToolItem, +.menubar.toolbar .separator, +.menubar.toolbar .separator:insensitive, +.header-bar GtkSeparatorToolItem, +.header-bar .separator, +.header-bar .separator:insensitive { border-color: alpha (shade (@dark_bg_color, 0.94), 0.35); border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5); border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5); @@ -2017,6 +2193,42 @@ .primary-toolbar .raised.linked .button:focus:active, .primary-toolbar .raised.linked .button:insensitive, .primary-toolbar .raised.linked .button:backdrop, +.menubar.toolbar .linked .button, +.menubar.toolbar .linked .button:active, +.menubar.toolbar .linked .button:focus, +.menubar.toolbar .linked .button:focus:active, +.menubar.toolbar .linked .button:hover, +.menubar.toolbar .linked .button:hover:active, +.menubar.toolbar .linked .button:insensitive, +.menubar.toolbar .linked .button:backdrop, +.menubar.toolbar .linked .entry, +.menubar.toolbar .linked .entry:active, +.menubar.toolbar .linked .entry:focused, +.menubar.toolbar .linked .entry:focused:active, +.menubar.toolbar .linked .entry:insensitive, +.menubar.toolbar .raised.linked .button, +.menubar.toolbar .raised.linked .button:active, +.menubar.toolbar .raised.linked .button:focus, +.menubar.toolbar .raised.linked .button:focus:active, +.menubar.toolbar .raised.linked .button:insensitive, +.menubar.toolbar .raised.linked .button:backdrop, +.header-bar .linked .button, +.header-bar .linked .button:active, +.header-bar .linked .button:focus, +.header-bar .linked .button:focus:active, +.header-bar .linked .button:insensitive, +.header-bar .linked .button:backdrop, +.header-bar .linked .entry, +.header-bar .linked .entry:active, +.header-bar .linked .entry:focused, +.header-bar .linked .entry:focused:active, +.header-bar .linked .entry:insensitive, +.header-bar .raised.linked .button, +.header-bar .raised.linked .button:active, +.header-bar .raised.linked .button:focus, +.header-bar .raised.linked .button:focus:active, +.header-bar .raised.linked .button:insensitive, +.header-bar .raised.linked .button:backdrop, .inline-toolbar.toolbar .button, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar .button:focus, @@ -2050,6 +2262,40 @@ .primary-toolbar .raised.linked .button:focus:active:first-child, .primary-toolbar .raised.linked .button:insensitive:first-child, .primary-toolbar .raised.linked .button:backdrop:first-child, +.menubar.toolbar .linked .button:first-child, +.menubar.toolbar .linked .button:active:first-child, +.menubar.toolbar .linked .button:focus:first-child, +.menubar.toolbar .linked .button:focus:active:first-child, +.menubar.toolbar .linked .button:insensitive:first-child, +.menubar.toolbar .linked .button:backdrop:first-child, +.menubar.toolbar .linked .entry:first-child, +.menubar.toolbar .linked .entry:active:first-child, +.menubar.toolbar .linked .entry:focused:first-child, +.menubar.toolbar .linked .entry:focused:active:first-child, +.menubar.toolbar .linked .entry:insensitive:first-child, +.menubar.toolbar .raised.linked .button:first-child, +.menubar.toolbar .raised.linked .button:active:first-child, +.menubar.toolbar .raised.linked .button:focus:first-child, +.menubar.toolbar .raised.linked .button:focus:active:first-child, +.menubar.toolbar .raised.linked .button:insensitive:first-child, +.menubar.toolbar .raised.linked .button:backdrop:first-child, +.header-bar .linked .button:first-child, +.header-bar .linked .button:active:first-child, +.header-bar .linked .button:focus:first-child, +.header-bar .linked .button:focus:active:first-child, +.header-bar .linked .button:insensitive:first-child, +.header-bar .linked .button:backdrop:first-child, +.header-bar .linked .entry:first-child, +.header-bar .linked .entry:active:first-child, +.header-bar .linked .entry:focused:first-child, +.header-bar .linked .entry:focused:active:first-child, +.header-bar .linked .entry:insensitive:first-child, +.header-bar .raised.linked .button:first-child, +.header-bar .raised.linked .button:active:first-child, +.header-bar .raised.linked .button:focus:first-child, +.header-bar .raised.linked .button:focus:active:first-child, +.header-bar .raised.linked .button:insensitive:first-child, +.header-bar .raised.linked .button:backdrop:first-child, .inline-toolbar.toolbar .button:first-child, .inline-toolbar.toolbar .button:active:first-child, .inline-toolbar.toolbar .button:focus:first-child, @@ -2085,6 +2331,40 @@ .primary-toolbar .raised.linked .button:focus:active:last-child, .primary-toolbar .raised.linked .button:insensitive:last-child, .primary-toolbar .raised.linked .button:backdrop:last-child, +.menubar.toolbar .linked .button:last-child, +.menubar.toolbar .linked .button:active:last-child, +.menubar.toolbar .linked .button:focus:last-child, +.menubar.toolbar .linked .button:focus:active:last-child, +.menubar.toolbar .linked .button:insensitive:last-child, +.menubar.toolbar .linked .button:backdrop:last-child, +.menubar.toolbar .linked .entry:last-child, +.menubar.toolbar .linked .entry.active:last-child, +.menubar.toolbar .linked .entry:focused:last-child, +.menubar.toolbar .linked .entry:focused:active:last-child, +.menubar.toolbar .linked .entry:insensitive:last-child, +.menubar.toolbar .linked .raised.linked .button:last-child, +.menubar.toolbar .linked .raised.linked .button:active:last-child, +.menubar.toolbar .linked .raised.linked .button:focus:last-child, +.menubar.toolbar .linked .raised.linked .button:focus:active:last-child, +.menubar.toolbar .linked .raised.linked .button:insensitive:last-child, +.menubar.toolbar .linked .raised.linked .button:backdrop:last-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:focus:last-child, +.header-bar .linked .button:focus:active:last-child, +.header-bar .linked .button:insensitive:last-child, +.header-bar .linked .button:backdrop:last-child, +.header-bar .linked .entry:last-child, +.header-bar .linked .entry.active:last-child, +.header-bar .linked .entry:focused:last-child, +.header-bar .linked .entry:focused:active:last-child, +.header-bar .linked .entry:insensitive:last-child, +.header-bar .linked .raised.linked .button:last-child, +.header-bar .linked .raised.linked .button:active:last-child, +.header-bar .linked .raised.linked .button:focus:last-child, +.header-bar .linked .raised.linked .button:focus:active:last-child, +.header-bar .linked .raised.linked .button:insensitive:last-child, +.header-bar .linked .raised.linked .button:backdrop:last-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:active:last-child, .inline-toolbar.toolbar .button:focus:last-child, @@ -2123,6 +2403,34 @@ .primary-toolbar.toolbar GtkToolButton:only-child .button:insensitive, .primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop, .primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive, +.menubar.toolbar.toolbar .button:only-child, +.menubar.toolbar.toolbar .button:active:only-child, +.menubar.toolbar.toolbar .button:focus:only-child, +.menubar.toolbar.toolbar .button:focus:active:only-child, +.menubar.toolbar.toolbar .button:insensitive:only-child, +.menubar.toolbar.toolbar .button:backdrop:only-child, +.menubar.toolbar.toolbar .button:backdrop:insensitive:only-child, +.menubar.toolbar.toolbar GtkToolButton:only-child .button, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:active, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:focus, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:focus:active, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:insensitive, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:backdrop, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive, +.header-bar .button:only-child, +.header-bar .button:active:only-child, +.header-bar .button:focus:only-child, +.header-bar .button:focus:active:only-child, +.header-bar .button:insensitive:only-child, +.header-bar .button:backdrop:only-child, +.header-bar .button:backdrop:insensitive:only-child, +.header-bar GtkToolButton:only-child .button, +.header-bar GtkToolButton:only-child .button:active, +.header-bar GtkToolButton:only-child .button:focus, +.header-bar GtkToolButton:only-child .button:focus:active, +.header-bar GtkToolButton:only-child .button:insensitive, +.header-bar GtkToolButton:only-child .button:backdrop, +.header-bar GtkToolButton:only-child .button:backdrop:insensitive, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:active:only-child, .inline-toolbar.toolbar .button:focus:only-child, diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/assets/combobox-button-toolbar-focused.png ubuntu-themes/Radiance/gtk-3.0/assets/combobox-button-toolbar-focused.png --- ubuntu-themes.orig/Radiance/gtk-3.0/assets/combobox-button-toolbar-focused.png 1970-01-01 05:00:00.000000000 +0500 +++ ubuntu-themes/Radiance/gtk-3.0/assets/combobox-button-toolbar-focused.png 2013-05-31 21:59:39.105902324 +0600 @@ -0,0 +1,4 @@ +PNG + + IHDRvY߉bKGD pHYs  tIME-CIDAT8˕=OTQ9"b4kcHkb q+K J +b-&JBDl-Lpw~36jX\-;3vxxX.jJܸ>US j,B$|VUYn6;ǵFI`QdNqWGoz{oGnu{CQ]WR&IT(hU/rޭXe9f .֖ϼxo_ W19T@ۥ9)Z `L޽n`)2U!b1Fask! lss3 ΃)\\\O`llLs&@ߗKf"g"9]ES@'k!]0H^8}: ]x*6h *sy)Nd⇓K"ґS"Ρ+$ED4Kz興fYi۶RFFƳc7ˀTD?cldIENDB` \ Brak znaku nowej linii na końcu pliku diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/assets/combobox-button-toolbar.png ubuntu-themes/Radiance/gtk-3.0/assets/combobox-button-toolbar.png --- ubuntu-themes.orig/Radiance/gtk-3.0/assets/combobox-button-toolbar.png 1970-01-01 05:00:00.000000000 +0500 +++ ubuntu-themes/Radiance/gtk-3.0/assets/combobox-button-toolbar.png 2013-05-31 21:59:39.105902324 +0600 @@ -0,0 +1,4 @@ +PNG + + IHDRvY߉bKGD pHYs  tIME#ՆIDAT8˝?Ar&+w*HLLHCT6~|?V)@ʜwB.DX x߼ 3^q^t:-SleЀ2 qHEGȲ? VJE'I"Y:PAYkc:_]}z)".`l# +qm.;s眨JO;u>Iz]Dn_s!EQ2zDw{m)x<?PNOZ;4NXP.ޠH,百Rr ([VecZvO)-:EгL~ZmG)WJim\^"I I% RL08?2 2/(o֖l7#2I6y~◡/CIIENDB` \ Brak znaku nowej linii na końcu pliku diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png ubuntu-themes/Radiance/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png --- ubuntu-themes.orig/Radiance/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png 1970-01-01 05:00:00.000000000 +0500 +++ ubuntu-themes/Radiance/gtk-3.0/assets/combobox-button-toolbar-pressed-focused.png 2013-05-31 21:59:39.105902324 +0600 @@ -0,0 +1,4 @@ +PNG + + IHDRvY߉bKGD pHYs  tIME# IDAT8˝?Ar&+w*HLLHCT6~|?V)@ʜwB.DX x߼ 3^q^t:-SleЀ2 qHEGȲ? VJE'I"Y:PAYkc:_]}z)".`l# +qm.;s眨JO;u>Iz]Dn_s!EQ2zDw{m)x<?PNOZ;4NXP.ޠH,百Rr ([VecZvO)-:EгL~ZmG)WJim\^"I I% RL08?2 2/(o֖l7#2I6y~◡/CIIENDB` \ Brak znaku nowej linii na końcu pliku diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar-focused.png ubuntu-themes/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar-focused.png --- ubuntu-themes.orig/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar-focused.png 1970-01-01 05:00:00.000000000 +0500 +++ ubuntu-themes/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar-focused.png 2013-05-31 21:59:39.109902325 +0600 @@ -0,0 +1,7 @@ +PNG + + IHDRvY߉bKGD pHYs  tIME7>NIDAT8˕;hTQ9ݸ*  +B2""YYBJ,"|P"Mjw9c庄{~fF>\|Wcgaũ1 +b1)0nfQLxnʝ.ZUˡ_^IFR!2A$(<kz%`uq6<6}`uu]K:\~bS@7H- j + +M vVfDw(#w.4 xk?Ғ?P^}8YLG1&q$شMYKr^Vl ׌Wv5DOj}o͙ȮMJa8??i<-5^ZPK!㲣KwwӗD#f/:QQq8 z~ÆӰ2vo7OqDZNwP8=K{O58a+IENDB` \ Brak znaku nowej linii na końcu pliku diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar.png ubuntu-themes/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar.png --- ubuntu-themes.orig/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar.png 1970-01-01 05:00:00.000000000 +0500 +++ ubuntu-themes/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar.png 2013-05-31 21:59:39.109902325 +0600 @@ -0,0 +1,5 @@ +PNG + + IHDRvY߉bKGD pHYs  tIME8 IDAT8˕jQsg$C[$jjn\ .tBA;_½M +]T"( `v29ńoFcrXVCf9#*~CQ(~ݨٜwT,U2nvR+ky/wuSUh"s=EHq|V[izHUŌ9M8E `sv?3t*NdOx,*`f=%$^[GN)ݮ+P(*X⋍y#J겧Qf< ݜ*Vr \1[_- 륓L{\`VYT.͹|q$KnXƺkY"{lH 5A|D _D_Z>\y;HvrGb8g;mrw +IENDB` \ Brak znaku nowej linii na końcu pliku diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar-pressed-focused.png ubuntu-themes/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar-pressed-focused.png --- ubuntu-themes.orig/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar-pressed-focused.png 1970-01-01 05:00:00.000000000 +0500 +++ ubuntu-themes/Radiance/gtk-3.0/assets/radiance-combobox-button-toolbar-pressed-focused.png 2013-05-31 21:59:39.109902325 +0600 @@ -0,0 +1,5 @@ +PNG + + IHDRvY߉bKGD pHYs  tIME8rIDAT8˕jQsg$C[$jjn\ .tBA;_½M +]T"( `v29ńoFcrXVCf9#*~CQ(~ݨٜwT,U2nvR+ky/wuSUh"s=EHq|V[izHUŌ9M8E `sv?3t*NdOx,*`f=%$^[GN)ݮ+P(*X⋍y#J겧Qf< ݜ*Vr \1[_- 륓L{\`VYT.͹|q$KnXƺkY"{lH 5A|D _D_Z>\y;HvrGb8g;mrw +IENDB` \ Brak znaku nowej linii na końcu pliku diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets-assets.css ubuntu-themes/Radiance/gtk-3.0/gtk-widgets-assets.css --- ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets-assets.css 2013-05-28 02:32:41.312339000 +0600 +++ ubuntu-themes/Radiance/gtk-3.0/gtk-widgets-assets.css 2013-05-31 21:59:39.109902325 +0600 @@ -383,16 +383,22 @@ }*/ .primary-toolbar .menu .check, +.menubar.toolbar .menu .check, +.header-bar .menu .check, .menu .check { background-image: url("assets/check-menuitem-unselected.png"); } .primary-toolbar .menu .radio, +.menubar.toolbar .menu .radio, +.header-bar .menu .radio, .menu .radio { background-image: url("assets/check-menuitem-unselected.png"); } .primary-toolbar .menu .check:active, +.menubar.toolbar .menu .check:active, +.header-bar .menu .check:active, .toolbar .menu .check:active:hover, .menu .check:active, .menu .check:active:hover { @@ -400,6 +406,8 @@ } .primary-toolbar .menu .check:active:insensitive, +.menubar.toolbar .menu .check:active:insensitive, +.header-bar .menu .check:active:insensitive, .toolbar .menu .check:active:hover:insensitive, .menu .check:active:insensitive, .menu .check:active:hover:insensitive { @@ -407,6 +415,8 @@ } .primary-toolbar .menu .radio:active, +.menubar.toolbar .menu .radio:active, +.header-bar .menu .radio:active, .toolbar .menu .radio:active:hover, .menu .radio:active, .menu .radio:active:hover { @@ -414,6 +424,8 @@ } .primary-toolbar .menu .radio:active:insensitive, +.menubar.toolbar .menu .radio:active:insensitive, +.header-bar .menu .radio:active:insensitive, .toolbar .menu .radio:active:hover:insensitive, .menu .radio:active:insensitive, .menu .radio:active:hover:insensitive { diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets-backdrop.css ubuntu-themes/Radiance/gtk-3.0/gtk-widgets-backdrop.css --- ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets-backdrop.css 2013-05-28 02:32:41.312339000 +0600 +++ ubuntu-themes/Radiance/gtk-3.0/gtk-widgets-backdrop.css 2013-05-31 21:59:39.109902325 +0600 @@ -250,7 +250,17 @@ .primary-toolbar .linked .button:backdrop, .primary-toolbar .linked .button:active:backdrop, .primary-toolbar .linked .button:active:hover:backdrop, -.primary-toolbar .linked .button:insensitive:backdrop { +.primary-toolbar .linked .button:insensitive:backdrop, +.menubar.toolbar .linked .entry:backdrop, +.menubar.toolbar .linked .button:backdrop, +.menubar.toolbar .linked .button:active:backdrop, +.menubar.toolbar .linked .button:active:hover:backdrop, +.menubar.toolbar .linked .button:insensitive:backdrop, +.header-bar .linked .entry:backdrop, +.header-bar .linked .button:backdrop, +.header-bar .linked .button:active:backdrop, +.header-bar .linked .button:active:hover:backdrop, +.header-bar .linked .button:insensitive:backdrop { border-width: 1px; border-right-width: 0; @@ -269,7 +279,17 @@ .primary-toolbar .linked .button:first-child:backdrop, .primary-toolbar .linked .button:active:first-child:backdrop, .primary-toolbar .linked .button:active:hover:first-child:backdrop, -.primary-toolbar .linked .button:insensitive:first-child:backdrop { +.primary-toolbar .linked .button:insensitive:first-child:backdrop, +.menubar.toolbar .linked .entry:first-child:backdrop, +.menubar.toolbar .linked .button:first-child:backdrop, +.menubar.toolbar .linked .button:active:first-child:backdrop, +.menubar.toolbar .linked .button:active:hover:first-child:backdrop, +.menubar.toolbar .linked .button:insensitive:first-child:backdrop, +.header-bar .linked .entry:first-child:backdrop, +.header-bar .linked .button:first-child:backdrop, +.header-bar .linked .button:active:first-child:backdrop, +.header-bar .linked .button:active:hover:first-child:backdrop, +.header-bar .linked .button:insensitive:first-child:backdrop { border-width: 1px; border-right-width: 0; @@ -290,7 +310,17 @@ .primary-toolbar .linked .button:last-child:backdrop, .primary-toolbar .linked .button:active:last-child:backdrop, .primary-toolbar .linked .button:active:hover:last-child:backdrop, -.primary-toolbar .linked .button:insensitive:last-child:backdrop { +.primary-toolbar .linked .button:insensitive:last-child:backdrop, +.menubar.toolbar .linked .entry:last-child:backdrop, +.menubar.toolbar .linked .button:last-child:backdrop, +.menubar.toolbar .linked .button:active:last-child:backdrop, +.menubar.toolbar .linked .button:active:hover:last-child:backdrop, +.menubar.toolbar .linked .button:insensitive:last-child:backdrop, +.header-bar .linked .entry:last-child:backdrop, +.header-bar .linked .button:last-child:backdrop, +.header-bar .linked .button:active:last-child:backdrop, +.header-bar .linked .button:active:hover:last-child:backdrop, +.header-bar .linked .button:insensitive:last-child:backdrop { border-width: 1px; border-radius: 3px; @@ -310,7 +340,17 @@ .primary-toolbar .linked .button:only-child:backdrop, .primary-toolbar .linked .button:active:only-child:backdrop, .primary-toolbar .linked .button:active:hover:only-child:backdrop, -.primary-toolbar .linked .button:insensitive:only-child:backdrop { +.primary-toolbar .linked .button:insensitive:only-child:backdrop, +.menubar.toolbar .linked .entry:only-child:backdrop, +.menubar.toolbar .linked .button:only-child:backdrop, +.menubar.toolbar .linked .button:active:only-child:backdrop, +.menubar.toolbar .linked .button:active:hover:only-child:backdrop, +.menubar.toolbar .linked .button:insensitive:only-child:backdrop, +.header-bar .linked .entry:only-child:backdrop, +.header-bar .linked .button:only-child:backdrop, +.header-bar .linked .button:active:only-child:backdrop, +.header-bar .linked .button:active:hover:only-child:backdrop, +.header-bar .linked .button:insensitive:only-child:backdrop { border-width: 1px; border-radius: 3px; @@ -592,6 +632,10 @@ .primary-toolbar .entry.progressbar:backdrop, .primary-toolbar .entry.progressbar:backdrop, +.menubar.toolbar .entry.progressbar:backdrop, +.menubar.toolbar .entry.progressbar:backdrop, +.header-bar .entry.progressbar:backdrop, +.header-bar .entry.progressbar:backdrop, .entry.progressbar:backdrop { } @@ -839,7 +883,9 @@ } .menubar .menuitem.separator:backdrop, -.primary-toolbar .menuitem.separator:backdrop { +.primary-toolbar .menuitem.separator:backdrop, +.menubar.toolbar .menuitem.separator:backdrop, +.header-bar .menuitem.separator:backdrop { } /*********** @@ -897,7 +943,11 @@ ***********/ .menu.spinner:backdrop, .primary-toolbar .spinner:backdrop, -.primary-toolbar .spinner:backdrop { +.primary-toolbar .spinner:backdrop, +.menubar.toolbar .spinner:backdrop, +.menubar.toolbar .spinner:backdrop, +.header-bar .spinner:backdrop, +.header-bar .spinner:backdrop { color: @backdrop_selected_bg_color; } @@ -1003,7 +1053,11 @@ /* primary-toolbar */ .primary-toolbar:backdrop, .primary-toolbar .toolbar:backdrop, -.primary-toolbar.toolbar:backdrop { +.primary-toolbar.toolbar:backdrop, +.menubar.toolbar .toolbar:backdrop, +.menubar.toolbar.toolbar:backdrop, +.header-bar .toolbar:backdrop, +.header-bar.toolbar:backdrop { background-color: @dark_bg_color; background-image: none; border-bottom-color: shade (@dark_bg_color, 0.94); @@ -1019,13 +1073,21 @@ -unico-inner-stroke-width: 0; } -.primary-toolbar :insensitive:backdrop { +.primary-toolbar :insensitive:backdrop, +.menubar.toolbar :insensitive:backdrop, +.header-bar :insensitive:backdrop { text-shadow: 0 -1px shade (@dark_bg_color, 0.82); } .primary-toolbar GtkComboBox:backdrop, .primary-toolbar .button *:backdrop, -.primary-toolbar .button:backdrop { +.primary-toolbar .button:backdrop, +.menubar.toolbar GtkComboBox:backdrop, +.menubar.toolbar .button *:backdrop, +.menubar.toolbar .button:backdrop, +.header-bar GtkComboBox:backdrop, +.header-bar .button *:backdrop, +.header-bar .button:backdrop { background-color: @transparent; background-image: none; border-color: @transparent; @@ -1050,7 +1112,9 @@ -unico-outer-stroke-width: 0; } -.primary-toolbar .button *:hover:backdrop { +.primary-toolbar .button *:hover:backdrop, +.menubar.toolbar .button *:hover:backdrop, +.header-bar .button *:hover:backdrop { color: shade (shade (#a39e9a, 0.86), 1.1); } @@ -1058,7 +1122,17 @@ .primary-toolbar .raised.button:backdrop, .primary-toolbar .button:hover:backdrop, .primary-toolbar .button:active:backdrop, -.primary-toolbar .button:insensitive:backdrop { +.primary-toolbar .button:insensitive:backdrop, +.menubar.toolbar .raised .button:backdrop, +.menubar.toolbar .raised.button:backdrop, +.menubar.toolbar .button:hover:backdrop, +.menubar.toolbar .button:active:backdrop, +.menubar.toolbar .button:insensitive:backdrop, +.header-bar .raised .button:backdrop, +.header-bar .raised.button:backdrop, +.header-bar .button:hover:backdrop, +.header-bar .button:active:backdrop, +.header-bar .button:insensitive:backdrop { border-width: 1px; /* This breaks Gtk+ 3.5.x, lp #1015497. */ @@ -1076,7 +1150,9 @@ -unico-outer-stroke-width: 1px; } -.primary-toolbar GtkComboBox.combobox-entry .button:backdrop { +.primary-toolbar GtkComboBox.combobox-entry .button:backdrop, +.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop, +.header-bar GtkComboBox.combobox-entry .button:backdrop { -unico-inner-stroke-width: 1px; -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.01)), @@ -1086,7 +1162,15 @@ .primary-toolbar GtkComboBox.combobox-entry .button:backdrop, .primary-toolbar .raised .button:backdrop, .primary-toolbar .raised.button:backdrop, -.primary-toolbar .button:hover:backdrop { +.primary-toolbar .button:hover:backdrop, +.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop, +.menubar.toolbar .raised .button:backdrop, +.menubar.toolbar .raised.button:backdrop, +.menubar.toolbar .button:hover:backdrop, +.header-bar GtkComboBox.combobox-entry .button:backdrop, +.header-bar .raised .button:backdrop, +.header-bar .raised.button:backdrop, +.header-bar .button:hover:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.06)), to (shade (@dark_bg_color, 0.98))); @@ -1100,7 +1184,9 @@ to (shade (@dark_bg_color, 1.02))); } -.primary-toolbar .button:active:backdrop { +.primary-toolbar .button:active:backdrop, +.menubar.toolbar .button:active:backdrop, +.header-bar .button:active:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.9)), to (shade (@dark_bg_color, 0.95))); @@ -1115,7 +1201,9 @@ to (shade (@dark_bg_color, 0.93))) } -.primary-toolbar .button:active:hover:backdrop { +.primary-toolbar .button:active:hover:backdrop, +.menubar.toolbar .button:active:hover:backdrop, +.header-bar .button:active:hover:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.95)), to (shade (@dark_bg_color, 1.0))); @@ -1129,7 +1217,11 @@ } .primary-toolbar .button:active:insensitive:backdrop, -.primary-toolbar .button:insensitive:backdrop { +.primary-toolbar .button:insensitive:backdrop, +.menubar.toolbar .button:active:insensitive:backdrop, +.menubar.toolbar .button:insensitive:backdrop, +.header-bar .button:active:insensitive:backdrop, +.header-bar .button:insensitive:backdrop { text-shadow: none; -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, @@ -1141,7 +1233,9 @@ to (shade (@dark_bg_color, 1.06))); } -.primary-toolbar .button:insensitive:backdrop { +.primary-toolbar .button:insensitive:backdrop, +.menubar.toolbar .button:insensitive:backdrop, +.header-bar .button:insensitive:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.01)), to (shade (@dark_bg_color, 0.99))); @@ -1151,7 +1245,9 @@ to (shade (@dark_bg_color, 1.04))); } -.primary-toolbar .button:active:insensitive:backdrop { +.primary-toolbar .button:active:insensitive:backdrop, +.menubar.toolbar .button:active:insensitive:backdrop, +.header-bar .button:active:insensitive:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.94)), to (shade (@dark_bg_color, 1.02))); @@ -1163,7 +1259,13 @@ .primary-toolbar .entry:backdrop, .primary-toolbar .entry:active:backdrop, -.primary-toolbar .entry:focused:backdrop { +.primary-toolbar .entry:focused:backdrop, +.menubar.toolbar .entry:backdrop, +.menubar.toolbar .entry:active:backdrop, +.menubar.toolbar .entry:focused:backdrop, +.header-bar .entry:backdrop, +.header-bar .entry:active:backdrop, +.header-bar .entry:focused:backdrop { border-radius: 3px; color: @text_color; @@ -1174,7 +1276,9 @@ to (shade (@dark_bg_color, 1.06))); } -.primary-toolbar .entry:backdrop { +.primary-toolbar .entry:backdrop, +.menubar.toolbar .entry:backdrop, +.header-bar .entry:backdrop { -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.75)), to (shade (@dark_bg_color, 0.95))); @@ -1183,14 +1287,18 @@ to (alpha (shade (@bg_color, 0.05), 0.01))); } -.primary-toolbar .entry:insensitive:backdrop { +.primary-toolbar .entry:insensitive:backdrop, +.menubar.toolbar .entry:insensitive:backdrop, +.header-bar .entry:insensitive:backdrop { -unico-outer-stroke-width: 1px; -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.01)), to (shade (@dark_bg_color, 1.06))); } -.primary-toolbar .entry:focused:backdrop { +.primary-toolbar .entry:focused:backdrop, +.menubar.toolbar .entry:focused:backdrop, +.header-bar .entry:focused:backdrop { -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, from (shade (@backdrop_selected_bg_color, 0.75)), to (shade (@backdrop_selected_bg_color, 0.8))); @@ -1200,7 +1308,13 @@ .primary-toolbar GtkSeparatorToolItem:backdrop, .primary-toolbar .separator:backdrop, -.primary-toolbar .separator:insensitive:backdrop { +.primary-toolbar .separator:insensitive:backdrop, +.menubar.toolbar GtkSeparatorToolItem:backdrop, +.menubar.toolbar .separator:backdrop, +.menubar.toolbar .separator:insensitive:backdrop, +.header-bar GtkSeparatorToolItem:backdrop, +.header-bar .separator:backdrop, +.header-bar .separator:insensitive:backdrop { border-color: shade (@dark_bg_color, 0.94); border-style: solid; diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets-borders.css ubuntu-themes/Radiance/gtk-3.0/gtk-widgets-borders.css --- ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets-borders.css 2013-05-28 02:32:41.312339000 +0600 +++ ubuntu-themes/Radiance/gtk-3.0/gtk-widgets-borders.css 2013-05-31 21:59:39.109902325 +0600 @@ -110,27 +110,39 @@ border-image: url("assets/button-default-focused-hover.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button { +.primary-toolbar .button, +.menubar.toolbar .button, +.header-bar .button { border-image: url("assets/button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:focused { +.primary-toolbar .button:focused, +.menubar.toolbar .button:focused, +.header-bar .button:focused { border-image: url("assets/button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:active { +.primary-toolbar .button:active, +.menubar.toolbar .button:active, +.header-bar .button:active { border-image: url("assets/button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:active:focused { +.primary-toolbar .button:active:focused, +.menubar.toolbar .button:active:focused, +.header-bar .button:active:focused { border-image: url("assets/button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:backdrop { +.primary-toolbar .button:backdrop, +.menubar.toolbar .button:backdrop, +.header-bar .button:backdrop { border-image: url("assets/backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:active:backdrop { +.primary-toolbar .button:active:backdrop, +.menubar.toolbar .button:active:backdrop, +.header-bar .button:active:backdrop { border-image: url("assets/backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } @@ -176,16 +188,24 @@ border-image: url("assets/backdrop-entry-disabled.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .entry { +.primary-toolbar .entry, +.menubar.toolbar .entry, +.header-bar .entry { border-image: url("assets/entry-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .entry:focus { +.primary-toolbar .entry:focus, +.menubar.toolbar .entry:focus, +.header-bar .entry:focus { border-image: url("assets/entry-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } .primary-toolbar .entry.progressbar, .primary-toolbar .entry.progressbar, +.menubar.toolbar .entry.progressbar, +.menubar.toolbar .entry.progressbar, +.header-bar .entry.progressbar, +.header-bar .entry.progressbar, .entry.progressbar { border-radius: 8px; border-width: 0; @@ -232,16 +252,45 @@ border-image: url("assets/combobox-button-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch; } +.primary-toolbar GtkComboBox.combobox-entry .button, +.primary-toolbar GtkComboBox.combobox-entry .button:focus:insensitive, +.menubar.toolbar GtkComboBox.combobox-entry .button, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus:insensitive, +.header-bar GtkComboBox.combobox-entry .button, +.header-bar GtkComboBox.combobox-entry .button:focus:insensitive { + border-image: url("assets/combobox-button-toolbar.png") 10 12 10 1 / 10px 12px 10px 1px stretch; +} + +.primary-toolbar GtkComboBox.combobox-entry .button:focus, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus, +.header-bar GtkComboBox.combobox-entry .button:focus { + border-image: url("assets/combobox-button-toolbar-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch; +} + +.primary-toolbar GtkComboBox.combobox-entry .button:focus:active:focus, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus:active:focus, +.header-bar GtkComboBox.combobox-entry .button:focus:active:focus { + border-image: url("assets/combobox-button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch; +} + .primary-toolbar GtkComboBox.combobox-entry .entry:first-child, -.primary-toolbar GtkComboBox.combobox-entry .button:first-child { +.primary-toolbar GtkComboBox.combobox-entry .button:first-child, +.menubar.toolbar GtkComboBox.combobox-entry .entry:first-child, +.menubar.toolbar GtkComboBox.combobox-entry .button:first-child, +.header-bar GtkComboBox.combobox-entry .entry:first-child, +.header-bar GtkComboBox.combobox-entry .button:first-child { border-image-width: 10px 0 10px 12px; border-radius: 8px 0 0 8px; border-right-width: 0; } .primary-toolbar GtkComboBox.combobox-entry .entry:last-child, -.primary-toolbar GtkComboBox.combobox-entry .button:last-child { - border-image-width: 10px 12px 10px 0; +.primary-toolbar GtkComboBox.combobox-entry .button:last-child, +.menubar.toolbar GtkComboBox.combobox-entry .entry:last-child, +.menubar.toolbar GtkComboBox.combobox-entry .button:last-child, +.header-bar GtkComboBox.combobox-entry .entry:last-child, +.header-bar GtkComboBox.combobox-entry .button:last-child { + border-image-width: 10px 12px 10px 1px; border-radius: 0 8px 8px 0; border-left-width: 0; } @@ -265,6 +314,22 @@ .primary-toolbar .raised .button:active, .primary-toolbar .button.raised:insensitive, .primary-toolbar .raised .button:insensitive, +.menubar.toolbar .entry, +.menubar.toolbar GtkComboBox.combobox-entry .entry, +.menubar.toolbar GtkComboBox.combobox-entry .button, +.menubar.toolbar .button:active, +.menubar.toolbar .button.raised:active, +.menubar.toolbar .raised .button:active, +.menubar.toolbar .button.raised:insensitive, +.menubar.toolbar .raised .button:insensitive, +.header-bar .entry, +.header-bar GtkComboBox.combobox-entry .entry, +.header-bar GtkComboBox.combobox-entry .button, +.header-bar .button:active, +.header-bar .button.raised:active, +.header-bar .raised .button:active, +.header-bar .button.raised:insensitive, +.header-bar .raised .button:insensitive, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar .button:insensitive, .inline-toolbar.toolbar GtkToolButton .button:active, @@ -272,7 +337,15 @@ .primary-toolbar GtkSwitch.trough, .primary-toolbar GtkSwitch.trough:insensitive, .primary-toolbar GtkComboBox .button:active, -.primary-toolbar GtkComboBox .button:insensitive { +.primary-toolbar GtkComboBox .button:insensitive, +.menubar.toolbar GtkSwitch.trough, +.header-bar GtkSwitch.trough, +.menubar.toolbar GtkSwitch.trough:insensitive, +.header-bar GtkSwitch.trough:insensitive, +.menubar.toolbar GtkComboBox .button:active, +.header-bar GtkComboBox .button:active, +.menubar.toolbar GtkComboBox .button:insensitive, +.header-bar GtkComboBox .button:insensitive { } /* primary toolbar - focused element borders */ @@ -284,16 +357,40 @@ .primary-toolbar .raised .button:focus:active, .primary-toolbar .button.raised.default:active, .primary-toolbar .raised .button.default:active, +.menubar.toolbar .entry:focus, +.menubar.toolbar .button:active:focus, +.menubar.toolbar GtkComboBox.combobox-entry .entry:focus, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus, +.menubar.toolbar .button.raised:focus:active, +.menubar.toolbar .raised .button:focus:active, +.menubar.toolbar .button.raised.default:active, +.menubar.toolbar .raised .button.default:active, +.header-bar .entry:focus, +.header-bar .button:active:focus, +.header-bar GtkComboBox.combobox-entry .entry:focus, +.header-bar GtkComboBox.combobox-entry .button:focus, +.header-bar .button.raised:focus:active, +.header-bar .raised .button:focus:active, +.header-bar .button.raised.default:active, +.header-bar .raised .button.default:active, .inline-toolbar.toolbar .button:focus:active, .inline-toolbar.toolbar .button.default:active, -.primary-toolbar GtkComboBox .button:active:focus { +.primary-toolbar GtkComboBox .button:active:focus, +.menubar.toolbar GtkComboBox .button:active:focus, +.header-bar GtkComboBox .button:active:focus { } /* primary toolbar - generic button borders */ .primary-toolbar .button.raised, .primary-toolbar .raised .button, +.menubar.toolbar .button.raised, +.menubar.toolbar .raised .button, +.header-bar .button.raised, +.header-bar .raised .button, .inline-toolbar.toolbar .button, -.primary-toolbar GtkComboBox .button { +.primary-toolbar GtkComboBox .button, +.menubar.toolbar GtkComboBox .button, +.header-bar GtkComboBox .button { } /* primary toolbar - focused button borders */ @@ -301,9 +398,19 @@ .primary-toolbar .button.raised.default, .primary-toolbar .raised .button:focus, .primary-toolbar .raised .button.default, +.menubar.toolbar .button.raised:focus, +.menubar.toolbar .button.raised.default, +.menubar.toolbar .raised .button:focus, +.menubar.toolbar .raised .button.default, +.header-bar .button.raised:focus, +.header-bar .button.raised.default, +.header-bar .raised .button:focus, +.header-bar .raised .button.default, .inline-toolbar.toolbar .button:focus, .inline-toolbar.toolbar .button.default, -.primary-toolbar GtkComboBox .button:focus { +.primary-toolbar GtkComboBox .button:focus, +.menubar.toolbar GtkComboBox .button:focus, +.header-bar GtkComboBox .button:focus { } /* column-headers borders */ @@ -398,11 +505,15 @@ border-image: url("assets/switch-trough-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar GtkSwitch.trough { +.primary-toolbar GtkSwitch.trough, +.menubar.toolbar GtkSwitch.trough, +.header-bar GtkSwitch.trough { border-image: url("assets/switch-trough-toolbar-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar GtkSwitch.trough:active { +.primary-toolbar GtkSwitch.trough:active, +.menubar.toolbar GtkSwitch.trough:active, +.header-bar GtkSwitch.trough:active { border-image: url("assets/switch-trough-toolbar-on.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets-borders-radiance.css ubuntu-themes/Radiance/gtk-3.0/gtk-widgets-borders-radiance.css --- ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets-borders-radiance.css 2013-05-28 02:32:41.312339000 +0600 +++ ubuntu-themes/Radiance/gtk-3.0/gtk-widgets-borders-radiance.css 2013-05-31 21:59:39.109902325 +0600 @@ -1,35 +1,72 @@ -.primary-toolbar .button { +.primary-toolbar .button, +.menubar.toolbar .button, +.header-bar .button { border-image: url("assets/radiance-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:focused { +.primary-toolbar .button:focused, +.menubar.toolbar .button:focused, +.header-bar .button:focused { border-image: url("assets/radiance-button-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:active { +.primary-toolbar .button:active, +.menubar.toolbar .button:active, +.header-bar .button:active { border-image: url("assets/radiance-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:active:focused { +.primary-toolbar .button:active:focused, +.menubar.toolbar .button:active:focused, +.header-bar .button:active:focused { border-image: url("assets/radiance-button-toolbar-active-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:backdrop { +.primary-toolbar .button:backdrop, +.menubar.toolbar .button:backdrop, +.header-bar .button:backdrop { border-image: url("assets/radiance-backdrop-button-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .button:active:backdrop { +.primary-toolbar .button:active:backdrop, +.menubar.toolbar .button:active:backdrop, +.header-bar .button:active:backdrop { border-image: url("assets/radiance-backdrop-button-toolbar-active.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .entry { +.primary-toolbar .entry, +.menubar.toolbar .entry, +.header-bar .entry { border-image: url("assets/radiance-entry-toolbar.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } -.primary-toolbar .entry:focus { +.primary-toolbar .entry:focus, +.menubar.toolbar .entry:focus, +.header-bar .entry:focus { border-image: url("assets/radiance-entry-toolbar-focused.png") 10 12 10 12 / 10px 12px 10px 12px stretch; } +.primary-toolbar GtkComboBox.combobox-entry .button, +.primary-toolbar GtkComboBox.combobox-entry .button:focus:insensitive, +.menubar.toolbar GtkComboBox.combobox-entry .button, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus:insensitive, +.header-bar GtkComboBox.combobox-entry .button, +.header-bar GtkComboBox.combobox-entry .button:focus:insensitive { + border-image: url("assets/radiance-combobox-button-toolbar.png") 10 12 10 1 / 10px 12px 10px 1px stretch; +} + +.primary-toolbar GtkComboBox.combobox-entry .button:focus, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus, +.header-bar GtkComboBox.combobox-entry .button:focus { + border-image: url("assets/radiance-combobox-button-toolbar-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch; +} + +.primary-toolbar GtkComboBox.combobox-entry .button:focus:active:focus, +.menubar.toolbar GtkComboBox.combobox-entry .button:focus:active:focus, +.header-bar GtkComboBox.combobox-entry .button:focus:active:focus { + border-image: url("assets/radiance-combobox-button-toolbar-pressed-focused.png") 10 12 10 1 / 10px 12px 10px 1px stretch; +} + .menubar.menuitem:hover, .menubar .menuitem:hover { border-image: url("assets/radiance-menubaritem.png") 8 10 1 10 / 8px 10px 1px 10px stretch; diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets.css ubuntu-themes/Radiance/gtk-3.0/gtk-widgets.css --- ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets.css 2013-05-28 02:32:41.312339000 +0600 +++ ubuntu-themes/Radiance/gtk-3.0/gtk-widgets.css 2013-05-31 21:59:39.113902325 +0600 @@ -272,7 +272,17 @@ .primary-toolbar .linked .button, .primary-toolbar .linked .button:active, .primary-toolbar .linked .button:active:hover, -.primary-toolbar .linked .button:insensitive { +.primary-toolbar .linked .button:insensitive, +.menubar.toolbar .linked .entry, +.menubar.toolbar .linked .button, +.menubar.toolbar .linked .button:active, +.menubar.toolbar .linked .button:active:hover, +.menubar.toolbar .linked .button:insensitive, +.header-bar .linked .entry, +.header-bar .linked .button, +.header-bar .linked .button:active, +.header-bar .linked .button:active:hover, +.header-bar .linked .button:insensitive { border-width: 1px; border-right-width: 0; @@ -400,44 +410,86 @@ /* Set up shadows and hilights for button visual separation */ .primary-toolbar .linked .button, .primary-toolbar .button.raised.linked, -.primary-toolbar .raised.linked .button { +.primary-toolbar .raised.linked .button, +.menubar.toolbar .linked .button, +.menubar.toolbar .button.raised.linked, +.menubar.toolbar .raised.linked .button, +.header-bar .linked .button, +.header-bar .button.raised.linked, +.header-bar .raised.linked .button { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4), inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:first-child, .primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .raised.linked .button:first-child { +.primary-toolbar .raised.linked .button:first-child, +.menubar.toolbar .linked .button:first-child, +.menubar.toolbar .button.raised.linked:first-child, +.menubar.toolbar .raised.linked .button:first-child, +.header-bar .linked .button:first-child, +.header-bar .button.raised.linked:first-child, +.header-bar .raised.linked .button:first-child { box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:last-child, .primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .raised.linked .button:last-child { +.primary-toolbar .raised.linked .button:last-child, +.menubar.toolbar .linked .button:last-child, +.menubar.toolbar .button.raised.linked:last-child, +.menubar.toolbar .raised.linked .button:last-child, +.header-bar .linked .button:last-child, +.header-bar .button.raised.linked:last-child, +.header-bar .raised.linked .button:last-child { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.4) } .primary-toolbar .linked .button:active, .primary-toolbar .button.raised.linked:active, -.primary-toolbar .raised.linked .button:active { +.primary-toolbar .raised.linked .button:active, +.menubar.toolbar .linked .button:active, +.menubar.toolbar .button.raised.linked:active, +.menubar.toolbar .raised.linked .button:active, +.header-bar .linked .button:active, +.header-bar .button.raised.linked:active, +.header-bar .raised.linked .button:active { box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:insensitive, .primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button:insensitive { +.primary-toolbar .raised.linked .button:insensitive, +.menubar.toolbar .linked .button:insensitive, +.menubar.toolbar .button.raised.linked:insensitive, +.menubar.toolbar .raised.linked .button:insensitive, +.header-bar .linked .button:insensitive, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button:insensitive { box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:backdrop:last-child, .primary-toolbar .button.raised.linked:backdrop:last-child, -.primary-toolbar .raised.linked .button:backdrop:last-child { +.primary-toolbar .raised.linked .button:backdrop:last-child, +.menubar.toolbar .linked .button:backdrop:last-child, +.menubar.toolbar .button.raised.linked:backdrop:last-child, +.menubar.toolbar .raised.linked .button:backdrop:last-child, +.header-bar .linked .button:backdrop:last-child, +.header-bar .button.raised.linked:backdrop:last-child, +.header-bar .raised.linked .button:backdrop:last-child { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.2); } /*.primary-toolbar .linked .button:insensitive:backdrop, .primary-toolbar .button.raised.linked:insensitive:backdrop, -.primary-toolbar .raised.linked .button:insensitive:backdrop { +.primary-toolbar .raised.linked .button:insensitive:backdrop, +.menubar.toolbar .linked .button:insensitive:backdrop, +.menubar.toolbar .button.raised.linked:insensitive:backdrop, +.menubar.toolbar .raised.linked .button:insensitive:backdrop, +.header-bar .linked .button:insensitive:backdrop, +.header-bar .button.raised.linked:insensitive:backdrop, +.header-bar .raised.linked .button:insensitive:backdrop { box-shadow: inset -1px 0 @unfocused_insensitive_borders; }*/ @@ -447,7 +499,17 @@ .primary-toolbar .linked .button:only-child, .primary-toolbar .linked .button:active:only-child, .primary-toolbar .linked .button:active:hover:only-child, -.primary-toolbar .linked .button:insensitive:only-child { +.primary-toolbar .linked .button:insensitive:only-child, +.menubar.toolbar .linked .entry:only-child, +.menubar.toolbar .linked .button:only-child, +.menubar.toolbar .linked .button:active:only-child, +.menubar.toolbar .linked .button:active:hover:only-child, +.menubar.toolbar .linked .button:insensitive:only-child, +.header-bar .linked .entry:only-child, +.header-bar .linked .button:only-child, +.header-bar .linked .button:active:only-child, +.header-bar .linked .button:active:hover:only-child, +.header-bar .linked .button:insensitive:only-child { border-radius: 8px; box-shadow: none; } @@ -646,6 +708,9 @@ * entry * *********/ GtkComboBox.combobox-entry .button, +.primary-toolbar GtkComboBox.combobox-entry .button, +.menubar.toolbar GtkComboBox.combobox-entry .button, +.header-bar GtkComboBox.combobox-entry .button, .entry { -GtkWidget-focus-line-width: 0; @@ -658,6 +723,9 @@ } GtkComboBox.combobox-entry .button:backdrop, +.primary-toolbar GtkComboBox.combobox-entry .button:backdrop, +.menubar.toolbar GtkComboBox.combobox-entry .button:backdrop, +.header-bar GtkComboBox.combobox-entry .button:backdrop, .entry:backdrop { background-image: -gtk-gradient (linear, left top, left bottom, from (mix (shade (@base_color, 0.96), @bg_color, 0.5)), @@ -676,6 +744,9 @@ } GtkComboBox.combobox-entry .button:insensitive, +.primary-toolbar GtkComboBox.combobox-entry .button:insensitive, +.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive, +.header-bar GtkComboBox.combobox-entry .button:insensitive, .entry:insensitive { background-color: #f5f5f5; background-image: none; @@ -684,6 +755,9 @@ } GtkComboBox.combobox-entry .button:insensitive:backdrop, +.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop, +.menubar.toolbar GtkComboBox.combobox-entry .button:insensitive:backdrop, +.header-bar GtkComboBox.combobox-entry .button:insensitive:backdrop, .entry:insensitive:backdrop { background-color: mix (#f5f5f5, @bg_color, 0.5); @@ -692,6 +766,10 @@ .primary-toolbar .entry.progressbar, .primary-toolbar .entry.progressbar, +.menubar.toolbar .entry.progressbar, +.menubar.toolbar .entry.progressbar, +.header-bar .entry.progressbar, +.header-bar .entry.progressbar, .entry.progressbar { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@selected_bg_color, 0.8)), @@ -850,8 +928,12 @@ ********/ GtkTreeMenu.menu, .toolbar .primary-toolbar .menu, +.toolbar .menubar.toolbar .menu, +.toolbar .header-bar .menu, GtkMenuToolButton.menu, .primary-toolbar .button .menu, +.menubar.toolbar .button .menu, +.header-bar .button .menu, .menu { background-image: none; background-color: shade (@dark_bg_color, 1.08); @@ -902,7 +984,17 @@ .primary-toolbar .menu.button:active, .primary-toolbar .menu.button:active:insensitive, .primary-toolbar .menu.button:insensitive, -.primary-toolbar .menu.button */ +.primary-toolbar .menu.button, +.menubar.toolbar .menu.button:hover, +.menubar.toolbar .menu.button:active, +.menubar.toolbar .menu.button:active:insensitive, +.menubar.toolbar .menu.button:insensitive, +.menubar.toolbar .menu.button, +.header-bar .menu.button:hover, +.header-bar .menu.button:active, +.header-bar .menu.button:active:insensitive, +.header-bar .menu.button:insensitive, +.header-bar .menu.button */ { background-color: shade (@dark_bg_color, 1.08); background-image: none; @@ -1015,10 +1107,18 @@ GtkTreeMenu.menu .menuitem *:insensitive, .toolbar .primary-toolbar .menu .menuitem:insensitive, .toolbar .primary-toolbar .menu .menuitem *:insensitive, +.toolbar .menubar.toolbar .menu .menuitem:insensitive, +.toolbar .menubar.toolbar .menu .menuitem *:insensitive, +.toolbar .header-bar .menu .menuitem:insensitive, +.toolbar .header-bar .menu .menuitem *:insensitive, GtkMenuToolButton.menu .menuitem:insensitive, GtkMenuToolButton.menu .menuitem *:insensitive, .primary-toolbar .button .menu .menuitem:insensitive, .primary-toolbar .button .menu .menuitem *:insensitive, +.menubar.toolbar .button .menu .menuitem:insensitive, +.menubar.toolbar .button .menu .menuitem *:insensitive, +.header-bar .button .menu .menuitem:insensitive, +.header-bar .button .menu .menuitem *:insensitive, .menuitem:insensitive, .menuitem *:insensitive { color: mix (@dark_fg_color, @dark_bg_color, 0.5); @@ -1070,6 +1170,10 @@ .primary-toolbar GtkScale.trough, .primary-toolbar GtkScale.trough:backdrop, +.menubar.toolbar GtkScale.trough, +.menubar.toolbar GtkScale.trough:backdrop, +.header-bar GtkScale.trough, +.header-bar GtkScale.trough:backdrop, .menuitem GtkScale.trough { background-color: @dark_bg_color; background-image: none; @@ -1572,8 +1676,12 @@ GtkTreeMenu .menuitem.separator, .toolbar .primary-toolbar .menuitem.separator, +.toolbar .menubar.toolbar .menuitem.separator, +.toolbar .header-bar .menuitem.separator, GtkMenuToolButton .menuitem.separator, .primary-toolbar .button .menuitem.separator, +.menubar.toolbar .button .menuitem.separator, +.header-bar .button .menuitem.separator, .menuitem.separator { border-color: shade (@dark_bg_color, 0.99); border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5); @@ -1754,7 +1862,11 @@ .menu.spinner, .primary-toolbar .spinner, -.primary-toolbar .spinner { +.primary-toolbar .spinner, +.menubar.toolbar .spinner, +.menubar.toolbar .spinner, +.header-bar .spinner, +.header-bar .spinner { color: @selected_bg_color; } @@ -1846,7 +1958,9 @@ /* primary-toolbar */ .primary-toolbar, .primary-toolbar .toolbar, -.primary-toolbar.toolbar { +.primary-toolbar.toolbar, +.menubar.toolbar, +.header-bar { -GtkWidget-window-dragging: true; background-image: -gtk-gradient (linear, left top, left bottom, @@ -1864,7 +1978,10 @@ } .primary-toolbar .toolbar:backdrop, -.primary-toolbar.toolbar:backdrop { +.primary-toolbar.toolbar:backdrop, +.menubar.toolbar .toolbar:backdrop, +.menubar.toolbar.toolbar:backdrop, +.header-bar:backdrop { background-image: none; background-color: @dark_bg_color; box-shadow: none; @@ -1874,12 +1991,18 @@ color: @backdrop_dark_fg_color; } -.primary-toolbar :insensitive { +.primary-toolbar :insensitive, +.menubar.toolbar .toolbar :insensitive, +.header-bar :insensitive { text-shadow: 0 -1px shade (@dark_bg_color, 0.7); } .primary-toolbar GtkComboBox, -.primary-toolbar .button { +.primary-toolbar .button, +.menubar.toolbar GtkComboBox, +.menubar.toolbar .button, +.header-bar GtkComboBox, +.header-bar .button { background-color: transparent; background-image: none; border-color: transparent; @@ -1892,7 +2015,11 @@ } .primary-toolbar GtkComboBox:backdrop, -.primary-toolbar .button:backdrop { +.primary-toolbar .button:backdrop, +.menubar.toolbar GtkComboBox:backdrop, +.menubar.toolbar .button:backdrop, +.header-bar GtkComboBox:backdrop, +.header-bar .button:backdrop { color: @backdrop_dark_fg_color; text-shadow: 0 -1px shade (@dark_bg_color, 0.9); } @@ -1901,7 +2028,17 @@ .primary-toolbar .raised.button, .primary-toolbar .button:hover, .primary-toolbar .button:active, -.primary-toolbar .button:insensitive { +.primary-toolbar .button:insensitive, +.menubar.toolbar .raised .button, +.menubar.toolbar .raised.button, +.menubar.toolbar .button:hover, +.menubar.toolbar .button:active, +.menubar.toolbar .button:insensitive, +.header-bar .raised .button, +.header-bar .raised.button, +.header-bar .button:hover, +.header-bar .button:active, +.header-bar .button:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.2)), to (shade (@dark_bg_color, 1.1))); @@ -1912,19 +2049,41 @@ .primary-toolbar .raised.button:focus, .primary-toolbar .button:hover:focus, .primary-toolbar .button:active:focus, -.primary-toolbar .button:insensitive:focus { +.primary-toolbar .button:insensitive:focus, +.menubar.toolbar .raised .button:focus, +.menubar.toolbar .raised.button:focus, +.menubar.toolbar .button:hover:focus, +.menubar.toolbar .button:active:focus, +.menubar.toolbar .button:insensitive:focus, +.header-bar .raised .button:focus, +.header-bar .raised.button:focus, +.header-bar .button:hover:focus, +.header-bar .button:active:focus, +.header-bar .button:insensitive:focus { } -.primary-toolbar GtkComboBox.combobox-entry .button { +.primary-toolbar GtkComboBox.combobox-entry .button, +.menubar.toolbar GtkComboBox.combobox-entry .button, +.header-bar GtkComboBox.combobox-entry .button { } .primary-toolbar GtkComboBox.combobox-entry .button, .primary-toolbar .raised .button, .primary-toolbar .raised.button, -.primary-toolbar .button:hover { +.primary-toolbar .button:hover, +.menubar.toolbar GtkComboBox.combobox-entry .button, +.menubar.toolbar .raised .button, +.menubar.toolbar .raised.button, +.menubar.toolbar .button:hover, +.header-bar GtkComboBox.combobox-entry .button, +.header-bar .raised .button, +.header-bar .raised.button, +.header-bar .button:hover { } -.primary-toolbar .button:active { +.primary-toolbar .button:active, +.menubar.toolbar .button:active, +.header-bar .button:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.9)), to (shade (@dark_bg_color, 0.95))); @@ -1932,24 +2091,34 @@ text-shadow: 0 -1px shade (@dark_bg_color, 0.6); } -.primary-toolbar .button:active:hover { +.primary-toolbar .button:active:hover, +.menubar.toolbar .button:active:hover, +.header-bar .button:active:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.95)), to (shade (@dark_bg_color, 1.0))); } .primary-toolbar .button:active:insensitive, -.primary-toolbar .button:insensitive { +.primary-toolbar .button:insensitive, +.menubar.toolbar .button:active:insensitive, +.menubar.toolbar .button:insensitive, +.header-bar .button:active:insensitive, +.header-bar .button:insensitive { text-shadow: none; } -.primary-toolbar .button:insensitive { +.primary-toolbar .button:insensitive, +.menubar.toolbar .button:insensitive, +.header-bar .button:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.01)), to (shade (@dark_bg_color, 0.99))); } -.primary-toolbar .button:active:insensitive { +.primary-toolbar .button:active:insensitive, +.menubar.toolbar .button:active:insensitive, +.header-bar .button:active:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.94)), to (shade (@dark_bg_color, 1.02))); @@ -1957,7 +2126,13 @@ .primary-toolbar .entry, .primary-toolbar .entry:active, -.primary-toolbar .entry:focused { +.primary-toolbar .entry:focused, +.menubar.toolbar .entry, +.menubar.toolbar .entry:active, +.menubar.toolbar .entry:focused, +.header-bar .entry, +.header-bar .entry:active, +.header-bar .entry:focused { border-radius: 9px; /* background-color: @dark_bg_color; @@ -1968,7 +2143,13 @@ .primary-toolbar GtkSeparatorToolItem, .primary-toolbar .separator, -.primary-toolbar .separator:insensitive { +.primary-toolbar .separator:insensitive, +.menubar.toolbar GtkSeparatorToolItem, +.menubar.toolbar .separator, +.menubar.toolbar .separator:insensitive, +.header-bar GtkSeparatorToolItem, +.header-bar .separator, +.header-bar .separator:insensitive { border-color: alpha (shade (@dark_bg_color, 0.94), 0.35); border-bottom-color: alpha (shade (@dark_bg_color, 1.26), 0.5); border-right-color: alpha (shade (@dark_bg_color, 1.26), 0.5); @@ -2017,6 +2198,42 @@ .primary-toolbar .raised.linked .button:focus:active, .primary-toolbar .raised.linked .button:insensitive, .primary-toolbar .raised.linked .button:backdrop, +.menubar.toolbar .linked .button, +.menubar.toolbar .linked .button:active, +.menubar.toolbar .linked .button:focus, +.menubar.toolbar .linked .button:focus:active, +.menubar.toolbar .linked .button:hover, +.menubar.toolbar .linked .button:hover:active, +.menubar.toolbar .linked .button:insensitive, +.menubar.toolbar .linked .button:backdrop, +.menubar.toolbar .linked .entry, +.menubar.toolbar .linked .entry:active, +.menubar.toolbar .linked .entry:focused, +.menubar.toolbar .linked .entry:focused:active, +.menubar.toolbar .linked .entry:insensitive, +.menubar.toolbar .raised.linked .button, +.menubar.toolbar .raised.linked .button:active, +.menubar.toolbar .raised.linked .button:focus, +.menubar.toolbar .raised.linked .button:focus:active, +.menubar.toolbar .raised.linked .button:insensitive, +.menubar.toolbar .raised.linked .button:backdrop, +.header-bar .linked .button, +.header-bar .linked .button:active, +.header-bar .linked .button:focus, +.header-bar .linked .button:focus:active, +.header-bar .linked .button:insensitive, +.header-bar .linked .button:backdrop, +.header-bar .linked .entry, +.header-bar .linked .entry:active, +.header-bar .linked .entry:focused, +.header-bar .linked .entry:focused:active, +.header-bar .linked .entry:insensitive, +.header-bar .raised.linked .button, +.header-bar .raised.linked .button:active, +.header-bar .raised.linked .button:focus, +.header-bar .raised.linked .button:focus:active, +.header-bar .raised.linked .button:insensitive, +.header-bar .raised.linked .button:backdrop, .inline-toolbar.toolbar .button, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar .button:focus, @@ -2050,6 +2267,40 @@ .primary-toolbar .raised.linked .button:focus:active:first-child, .primary-toolbar .raised.linked .button:insensitive:first-child, .primary-toolbar .raised.linked .button:backdrop:first-child, +.menubar.toolbar .linked .button:first-child, +.menubar.toolbar .linked .button:active:first-child, +.menubar.toolbar .linked .button:focus:first-child, +.menubar.toolbar .linked .button:focus:active:first-child, +.menubar.toolbar .linked .button:insensitive:first-child, +.menubar.toolbar .linked .button:backdrop:first-child, +.menubar.toolbar .linked .entry:first-child, +.menubar.toolbar .linked .entry:active:first-child, +.menubar.toolbar .linked .entry:focused:first-child, +.menubar.toolbar .linked .entry:focused:active:first-child, +.menubar.toolbar .linked .entry:insensitive:first-child, +.menubar.toolbar .raised.linked .button:first-child, +.menubar.toolbar .raised.linked .button:active:first-child, +.menubar.toolbar .raised.linked .button:focus:first-child, +.menubar.toolbar .raised.linked .button:focus:active:first-child, +.menubar.toolbar .raised.linked .button:insensitive:first-child, +.menubar.toolbar .raised.linked .button:backdrop:first-child, +.header-bar .linked .linked .button:first-child, +.header-bar .linked .button:active:first-child, +.header-bar .linked .button:focus:first-child, +.header-bar .linked .button:focus:active:first-child, +.header-bar .linked .button:insensitive:first-child, +.header-bar .linked .button:backdrop:first-child, +.header-bar .linked .entry:first-child, +.header-bar .linked .entry:active:first-child, +.header-bar .linked .entry:focused:first-child, +.header-bar .linked .entry:focused:active:first-child, +.header-bar .linked .entry:insensitive:first-child, +.header-bar .raised.linked .button:first-child, +.header-bar .raised.linked .button:active:first-child, +.header-bar .raised.linked .button:focus:first-child, +.header-bar .raised.linked .button:focus:active:first-child, +.header-bar .raised.linked .button:insensitive:first-child, +.header-bar .raised.linked .button:backdrop:first-child, .inline-toolbar.toolbar .button:first-child, .inline-toolbar.toolbar .button:active:first-child, .inline-toolbar.toolbar .button:focus:first-child, @@ -2085,6 +2336,40 @@ .primary-toolbar .raised.linked .button:focus:active:last-child, .primary-toolbar .raised.linked .button:insensitive:last-child, .primary-toolbar .raised.linked .button:backdrop:last-child, +.menubar.toolbar .linked .button:last-child, +.menubar.toolbar .linked .button:active:last-child, +.menubar.toolbar .linked .button:focus:last-child, +.menubar.toolbar .linked .button:focus:active:last-child, +.menubar.toolbar .linked .button:insensitive:last-child, +.menubar.toolbar .linked .button:backdrop:last-child, +.menubar.toolbar .linked .entry:last-child, +.menubar.toolbar .linked .entry.active:last-child, +.menubar.toolbar .linked .entry:focused:last-child, +.menubar.toolbar .linked .entry:focused:active:last-child, +.menubar.toolbar .linked .entry:insensitive:last-child, +.menubar.toolbar .raised.linked .button:last-child, +.menubar.toolbar .raised.linked .button:active:last-child, +.menubar.toolbar .raised.linked .button:focus:last-child, +.menubar.toolbar .raised.linked .button:focus:active:last-child, +.menubar.toolbar .raised.linked .button:insensitive:last-child, +.menubar.toolbar .raised.linked .button:backdrop:last-child, +.header-bar .linked .button:last-child, +.header-bar .linked .button:active:last-child, +.header-bar .linked .button:focus:last-child, +.header-bar .linked .button:focus:active:last-child, +.header-bar .linked .button:insensitive:last-child, +.header-bar .linked .button:backdrop:last-child, +.header-bar .linked .entry:last-child, +.header-bar .linked .entry.active:last-child, +.header-bar .linked .entry:focused:last-child, +.header-bar .linked .entry:focused:active:last-child, +.header-bar .linked .entry:insensitive:last-child, +.header-bar .raised.linked .button:last-child, +.header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:focus:last-child, +.header-bar .raised.linked .button:focus:active:last-child, +.header-bar .raised.linked .button:insensitive:last-child, +.header-bar .raised.linked .button:backdrop:last-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:active:last-child, .inline-toolbar.toolbar .button:focus:last-child, @@ -2123,6 +2408,34 @@ .primary-toolbar.toolbar GtkToolButton:only-child .button:insensitive, .primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop, .primary-toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive, +.menubar.toolbar.toolbar .button:only-child, +.menubar.toolbar.toolbar .button:active:only-child, +.menubar.toolbar.toolbar .button:focus:only-child, +.menubar.toolbar.toolbar .button:focus:active:only-child, +.menubar.toolbar.toolbar .button:insensitive:only-child, +.menubar.toolbar.toolbar .button:backdrop:only-child, +.menubar.toolbar.toolbar .button:backdrop:insensitive:only-child, +.menubar.toolbar.toolbar GtkToolButton:only-child .button, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:active, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:focus, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:focus:active, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:insensitive, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:backdrop, +.menubar.toolbar.toolbar GtkToolButton:only-child .button:backdrop:insensitive, +.header-bar .button:only-child, +.header-bar .button:active:only-child, +.header-bar .button:focus:only-child, +.header-bar .button:focus:active:only-child, +.header-bar .button:insensitive:only-child, +.header-bar .button:backdrop:only-child, +.header-bar .button:backdrop:insensitive:only-child, +.header-bar GtkToolButton:only-child .button, +.header-bar GtkToolButton:only-child .button:active, +.header-bar GtkToolButton:only-child .button:focus, +.header-bar GtkToolButton:only-child .button:focus:active, +.header-bar GtkToolButton:only-child .button:insensitive, +.header-bar GtkToolButton:only-child .button:backdrop, +.header-bar GtkToolButton:only-child .button:backdrop:insensitive, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:active:only-child, .inline-toolbar.toolbar .button:focus:only-child, diff -Naur ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets-radiance.css ubuntu-themes/Radiance/gtk-3.0/gtk-widgets-radiance.css --- ubuntu-themes.orig/Radiance/gtk-3.0/gtk-widgets-radiance.css 2013-05-28 02:32:41.312339000 +0600 +++ ubuntu-themes/Radiance/gtk-3.0/gtk-widgets-radiance.css 2013-05-31 21:59:39.113902325 +0600 @@ -1,38 +1,74 @@ /* Set up shadows and hilights for button visual separation */ .primary-toolbar .linked .button, .primary-toolbar .button.raised.linked, -.primary-toolbar .raised.linked .button { +.primary-toolbar .raised.linked .button, +.menubar.toolbar .linked .button, +.menubar.toolbar .button.raised.linked, +.menubar.toolbar .raised.linked .button, +.header-bar .linked .button, +.header-bar .button.raised.linked, +.header-bar .button.raised.linked .button { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1), inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:first-child, .primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .raised.linked .button:first-child { +.primary-toolbar .raised.linked .button:first-child, +.menubar.toolbar .linked .button:first-child, +.menubar.toolbar .button.raised.linked:first-child, +.menubar.toolbar .raised.linked .button:first-child, +.header-bar .linked .button:first-child, +.header-bar .button.raised.linked:first-child, +.header-bar .raised.linked .button:first-child { box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:last-child, .primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .raised.linked .button:last-child { +.primary-toolbar .raised.linked .button:last-child, +.menubar.toolbar .linked .button:last-child, +.menubar.toolbar .button.raised.linked:last-child, +.menubar.toolbar .raised.linked .button:last-child, +.header-bar .linked .button:last-child, +.header-bar .button.raised.linked:last-child, +.header-bar .raised.linked .button:last-child { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1) } .primary-toolbar .linked .button:active, .primary-toolbar .button.raised.linked:active, -.primary-toolbar .raised.linked .button:active { +.primary-toolbar .raised.linked .button:active, +.menubar.toolbar .linked .button:active, +.menubar.toolbar .button.raised.linked:active, +.menubar.toolbar .raised.linked .button:active, +.header-bar .linked .button:active, +.header-bar .button.raised.linked:active, +.header-bar .raised.linked .button:active { box-shadow: inset 1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:insensitive, .primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button:insensitive { +.primary-toolbar .raised.linked .button:insensitive, +.menubar.toolbar .linked .button:insensitive, +.menubar.toolbar .button.raised.linked:insensitive, +.menubar.toolbar .raised.linked .button:insensitive, +.header-bar .linked .button:insensitive, +.header-bar .button.raised.linked:insensitive, +.header-bar .raised.linked .button:insensitive { box-shadow: inset -1px 0 shade (@dark_bg_color, 0.9); } .primary-toolbar .linked .button:backdrop:last-child, .primary-toolbar .button.raised.linked:backdrop:last-child, -.primary-toolbar .raised.linked .button:backdrop:last-child { +.primary-toolbar .raised.linked .button:backdrop:last-child, +.menubar.toolbar .linked .button:backdrop:last-child, +.menubar.toolbar .button.raised.linked:backdrop:last-child, +.menubar.toolbar .raised.linked .button:backdrop:last-child, +.header-bar .linked .button:backdrop:last-child, +.header-bar .button.raised.linked:backdrop:last-child, +.header-bar .raised.linked .button:backdrop:last-child { box-shadow: inset 1px 0 shade (@dark_bg_color, 1.1); } @@ -62,7 +98,9 @@ /* primary-toolbar */ .primary-toolbar, .primary-toolbar .toolbar, -.primary-toolbar.toolbar { +.primary-toolbar.toolbar, +.menubar.toolbar, +.header-bar { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 0.96)), to (shade (@dark_bg_color, 1.1))); @@ -72,13 +110,21 @@ text-shadow: 0 1px shade (@dark_bg_color, 1.1); } -.primary-toolbar :insensitive { +.primary-toolbar :insensitive, +.menubar.toolbar :insensitive, +.header-bar :insensitive { text-shadow: 0 1px shade (@dark_bg_color, 1.1); } .primary-toolbar GtkComboBox, .primary-toolbar .button *, -.primary-toolbar .button { +.primary-toolbar .button, +.menubar.toolbar GtkComboBox, +.menubar.toolbar .button *, +.menubar.toolbar .button, +.header-bar GtkComboBox, +.header-bar .button *, +.header-bar .button { text-shadow: 0 1px alpha (shade (@dark_bg_color, 1.25), 0.32); } @@ -86,7 +132,17 @@ .primary-toolbar .raised.button, .primary-toolbar .button:hover, .primary-toolbar .button:active, -.primary-toolbar .button:insensitive { +.primary-toolbar .button:insensitive, +.menubar.toolbar .raised .button, +.menubar.toolbar .raised.button, +.menubar.toolbar .button:hover, +.menubar.toolbar .button:active, +.menubar.toolbar .button:insensitive, +.header-bar .raised .button, +.header-bar .raised.button, +.header-bar .button:hover, +.header-bar .button:active, +.header-bar .button:insensitive { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@dark_bg_color, 1.03)), to (shade (@dark_bg_color, 0.96)));