Merge lp://qastaging/~l3on/ubuntu-themes/gnome-shell-fixes into lp://qastaging/ubuntu-themes

Proposed by Leo Iannacone
Status: Needs review
Proposed branch: lp://qastaging/~l3on/ubuntu-themes/gnome-shell-fixes
Merge into: lp://qastaging/ubuntu-themes
Diff against target: 6151 lines (+1939/-874)
23 files modified
Ambiance/gtk-3.0/apps/gnome-applications.css (+30/-10)
Ambiance/gtk-3.0/apps/gnome-panel.css (+5/-1)
Ambiance/gtk-3.0/apps/gnome-terminal.css (+4/-2)
Ambiance/gtk-3.0/apps/nautilus.css (+6/-2)
Ambiance/gtk-3.0/apps/unity-greeter.css (+8/-2)
Ambiance/gtk-3.0/apps/unity.css (+21/-14)
Ambiance/gtk-3.0/gtk-main.css (+4/-0)
Ambiance/gtk-3.0/gtk-widgets-assets.css (+225/-34)
Ambiance/gtk-3.0/gtk-widgets-borders.css (+71/-24)
Ambiance/gtk-3.0/gtk-widgets.css (+530/-217)
Ambiance/metacity-1/metacity-theme-1.xml (+21/-137)
Radiance/gtk-3.0/apps/gnome-panel.css (+5/-1)
Radiance/gtk-3.0/apps/nautilus.css (+6/-2)
Radiance/gtk-3.0/apps/unity.css (+10/-2)
Radiance/gtk-3.0/gtk-main.css (+4/-0)
Radiance/gtk-3.0/gtk-widgets-assets-radiance.css (+15/-5)
Radiance/gtk-3.0/gtk-widgets-assets.css (+222/-35)
Radiance/gtk-3.0/gtk-widgets-backdrop.css (+105/-12)
Radiance/gtk-3.0/gtk-widgets-borders-radiance.css (+16/-4)
Radiance/gtk-3.0/gtk-widgets-borders.css (+71/-24)
Radiance/gtk-3.0/gtk-widgets-radiance.css (+13/-1)
Radiance/gtk-3.0/gtk-widgets.css (+529/-215)
Radiance/metacity-1/metacity-theme-1.xml (+18/-130)
To merge this branch: bzr merge lp://qastaging/~l3on/ubuntu-themes/gnome-shell-fixes
Reviewer Review Type Date Requested Status
Alberts Muktupāvels (community) Needs Fixing
Lars Karlitski Pending
Ubuntu Artwork Packagers Pending
Review via email: mp+214003@code.qastaging.launchpad.net

Description of the change

Hi all,

in gnome-shell applications using gtk3 windows (like nautilus, gnome-tweak-tools and many more)
are not resizeable.

A bug report is here: https://bugs.launchpad.net/ubuntu-themes/+bug/1263317

It seems adding some margin on .window-frame fixes resize issue.

I have also added a shadow on gtk-3 windows and a border-radius (with padding) on headbars.

To post a comment you must log in.
378. By Leo Iannacone

added shadow and border radius to gtk-3 windows

379. By Leo Iannacone

padding a bit on headbar

380. By Leo Iannacone

no need to have border-radius on titlebar just on header-bar, increased border-radius on window-frame, needed to cover backgorund-color

381. By Leo Iannacone

lighter shadow on window backgrop

382. By Leo Iannacone

use for window-frame shadows same values of unity. exported those colors in gtk-main

383. By Leo Iannacone

set same style between unity and header-bar

384. By Leo Iannacone

do not use frame - use window-frame instead

385. By Leo Iannacone

titlebar as header-bar with same style of unity

386. By Leo Iannacone

added titlebar also in widgets definitions

387. By Leo Iannacone

[ Michal Hruby ]
* Fixes issue where when using suru theme - icons present in ubuntu-
  mobile aren't found when trying to use them on the desktop.
[ Michał Sawicz ]
* Mark packages Multi-Arch: foreign to fix cross-building.
[ Lars Uebernickel ]
* Fixes required by the 3.12 update Unify notebook borders and
  paddings to get rid of the border around tab bars (on notebooks and
  stand-alone, such as in gedit and gnome-terminal). Also, style
  header bars similarly to window title bars, but take care that
  header bars that are used as tool bars keep the same look as tool
  bars.
[ Matthieu James ]
* New icons for the messaging menu (the names remain the same). New
  symbolic icons corresponding to different types of file (that can be
  download from the browser). New generic website icon. Fix a
  misspelled icon name (transfer indicator) (LP: #1289465)
[ Matthieu James ]
* Added a sample JSON file to build lists of icons and modified app
  icons according to the standardized colour palette. (LP: #1289465)
[ Robert Ancell ]
* Make ubuntu-mobile inherit from the Humanity / gnome themes. In the
  Unity 8 desktop session some applications refer to icons in these
  themes and this causes Unity 8 not to show an icon for them.
[ Lars Uebernickel ]
* Add preliminary support for popovers Add borders and shadow for the
  .popover class. Also set the background color for the .background
  class instead of on GtkWindow directly, because GtkPopover sets
  .background as well. (LP: #1329792)
[ Tim Peeters ]
* New back icon in ubuntu-mobile theme (LP: #1317519)
[ William Hua ]
* Refresh indicator-keyboard icons to include some missing layouts
  like Moldavian, Marathi (KaGaPa phonetic), and Sanskrit (KaGaPa
  phonetic). (LP: #1299402)

388. By Leo Iannacone

[ Matthieu James ]
* Added new icons for bluetooth devices and collapse/expand view (LP:
  #1289465)
[ Matthieu James ]
* Added new icons for bluetooth devices (LP: #1289465)

389. By Leo Iannacone

fix double comment closing

390. By Leo Iannacone

add semi-suport to gedit document sidebar

391. By Leo Iannacone

padding on gedit sidebar rows

392. By Leo Iannacone

button spacing set to 0 for dialog windows

393. By Leo Iannacone

add support to Radiance

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

I've given to this a first look and it seems very good...
However, in order to match the unity defined shadows you should use this:

.window-frame {
    border-radius: 10px 10px 0 0;
    box-shadow: 2px 10px 30px @window_shadow;

    /* this is used for the resize cursor area */
    margin: 10px;
}

.window-frame:backdrop {
    box-shadow: 2px 10px 25px @window_shadow_inactive;
}

Then, we've a problem... At least in unity: what in unity is a toolbar, using this theme becomes an headerbar and thus here it looks like we've two headers, which is something we can't go with.

So, I'm not sure weather it's the case of fixing nautilus or adding some special theming for Nautilus. I've noticed that using the Adwaita theme this problem doesn't happen here.

Revision history for this message
Leo Iannacone (l3on) wrote :

> I've given to this a first look and it seems very good...

Great!

> However, in order to match the unity defined shadows you should use this:
>
> .window-frame {
> border-radius: 10px 10px 0 0;
> box-shadow: 2px 10px 30px @window_shadow;
>
> /* this is used for the resize cursor area */
> margin: 10px;
> }
>
> .window-frame:backdrop {
> box-shadow: 2px 10px 25px @window_shadow_inactive;
> }

I tried, but I got an unexpected result. It seems blur effect used by GTK is not the same used by Unity. So, if you set the same values (@window_shadow*) you get different result.
It was true when I worked on windows, and I guess it's still so.

> Then, we've a problem... At least in unity: what in unity is a toolbar, using
> this theme becomes an headerbar and thus here it looks like we've two headers,
> which is something we can't go with.
> So, I'm not sure weather it's the case of fixing nautilus or adding some
> special theming for Nautilus.

Yes. You are right.
But the problem here is in Nautilus itself. The patch applied in the software (if I am not wrong) checks if current session is Unity, and if so, encloses the gtk-headerbar in a simple container.
The result is: you have a headerbar, supposed to be the "top-of-the-window", but displayed inside of it.
So, in this case, we have to review that patch (precisely: nautilus/debian/patches/ubuntu_show_titlebar.patch).

> I've noticed that using the Adwaita theme this
> problem doesn't happen here.
Only because in Adwaita headerbar and the other widgets use (more or less) the same colors.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

> > However, in order to match the unity defined shadows you should use this:
> >
> > .window-frame {
> > border-radius: 10px 10px 0 0;
> > box-shadow: 2px 10px 30px @window_shadow;
> >
> > /* this is used for the resize cursor area */
> > margin: 10px;
> > }
> >
> > .window-frame:backdrop {
> > box-shadow: 2px 10px 25px @window_shadow_inactive;
> > }
>
> I tried, but I got an unexpected result. It seems blur effect used by GTK is
> not the same used by Unity. So, if you set the same values (@window_shadow*)
> you get different result.
> It was true when I worked on windows, and I guess it's still so.

Yeah, that's true. However using the values above I get exactly the same results (well, more or less :)), so I think you can safely use that I think.

> Yes. You are right.
> But the problem here is in Nautilus itself. The patch applied in the software
> (if I am not wrong) checks if current session is Unity, and if so, encloses
> the gtk-headerbar in a simple container.
> The result is: you have a headerbar, supposed to be the "top-of-the-window",
> but displayed inside of it.
> So, in this case, we have to review that patch (precisely:
> nautilus/debian/patches/ubuntu_show_titlebar.patch).

Right... Do you have time to check that or should I go?

Revision history for this message
Leo Iannacone (l3on) wrote :

> > I tried, but I got an unexpected result. It seems blur effect used by GTK is
> > not the same used by Unity. So, if you set the same values (@window_shadow*)
> > you get different result.
> > It was true when I worked on windows, and I guess it's still so.
>
> Yeah, that's true. However using the values above I get exactly the same
> results (well, more or less :)), so I think you can safely use that I think.

Ok, I will set that value.

About nautilus:
> > So, in this case, we have to review that patch (precisely:
> > nautilus/debian/patches/ubuntu_show_titlebar.patch).
>
> Right... Do you have time to check that or should I go?

I tried to remove '.header-bar' class from Nautilus toolbar. It just does not work, since you want "a dark bar" there, instead the result is:
http://i.imgur.com/bq8dXRb.png

So, I think the ways to fix this can be approximately two:
 1. Providing a theme hack to Nautilus, overriding the default style of ".header-bar"
 2. Otherwise, push into nautilus (and maybe more apps?) a ".header-bar.no-titlebar" style_class and then work on directly on css -> .no-titlebar

394. By Leo Iannacone

use same shadow values of Unity

395. By Leo Iannacone

[ Lars Uebernickel ]
* Ambiance/Radiance: style popover menus correctly
[ Charles Kerr ]
* Revert the suru theme's message indicators back to the earlier
  'envelope' look. (LP: #1367817)

396. By Leo Iannacone

fix GtkListBox rows styles - were displayed as buttons

397. By Leo Iannacone

[ Lars Uebernickel ]
* Mark Ambiance and Radiance to use overlay scrollbars
* gtk3 theme: fix gedit's search bar
* Gtk theme: expose public colors with Adwaita's naming scheme

398. By Leo Iannacone

remove trough from metacity - more similiar to unity

399. By Leo Iannacone

bigger title bar

400. By Leo Iannacone

metacity: time to go borderless

401. By Leo Iannacone

metacity: Ambiance - draw title following unity choices

402. By Leo Iannacone

fix typo

403. By Leo Iannacone

treat any :checked selector as :active

404. By Leo Iannacone

metacity: title height and button spacing like in unity

405. By Leo Iannacone

revert title vertical pad to 10 - fit default titlebar font and size in ubuntu-settings package

406. By Leo Iannacone

Fix typos

407. By Leo Iannacone

title bar margin left and right set to 7px - as unity does

408. By Leo Iannacone

experimental transition effect with buttons

409. By Leo Iannacone

Fix row-buttons:backdrop:hover

410. By Leo Iannacone

Add support to button.flat

411. By Leo Iannacone

check and radio buttons in Gtk 3.14 want assets as -gtk-icon-source rather than a background-image

412. By Leo Iannacone

fix spinner - code from Adwaita 3.14

413. By Leo Iannacone

better support to link buttons

414. By Leo Iannacone

better support to linked buttons

415. By Leo Iannacone

a bit of .app-notification style

416. By Leo Iannacone

only link buttons needs this

417. By Leo Iannacone

reset transition over popover menuitem

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

We need to move forward with this as currently gnome-panel theming is broken (since the last update).

Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

Text conflict in Ambiance/gtk-3.0/gtk-widgets-assets.css
Text conflict in Ambiance/gtk-3.0/gtk-widgets-borders.css
Text conflict in Ambiance/gtk-3.0/gtk-widgets.css
Text conflict in Radiance/gtk-3.0/gtk-widgets-assets.css
Text conflict in Radiance/gtk-3.0/gtk-widgets-borders-radiance.css
Text conflict in Radiance/gtk-3.0/gtk-widgets-borders.css
Text conflict in Radiance/gtk-3.0/gtk-widgets.css

review: Needs Fixing

Unmerged revisions

417. By Leo Iannacone

reset transition over popover menuitem

416. By Leo Iannacone

only link buttons needs this

415. By Leo Iannacone

a bit of .app-notification style

414. By Leo Iannacone

better support to linked buttons

413. By Leo Iannacone

better support to link buttons

412. By Leo Iannacone

fix spinner - code from Adwaita 3.14

411. By Leo Iannacone

check and radio buttons in Gtk 3.14 want assets as -gtk-icon-source rather than a background-image

410. By Leo Iannacone

Add support to button.flat

409. By Leo Iannacone

Fix row-buttons:backdrop:hover

408. By Leo Iannacone

experimental transition effect with buttons

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches