Merge lp://staging/~unity-team/light-themes/light-themes.add_dialog_style into lp://staging/~ubuntu-art-pkg/light-themes/trunk
| Status: | Rejected |
|---|---|
| Rejected by: | Andrea Cimitan |
| Proposed branch: | lp://staging/~unity-team/light-themes/light-themes.add_dialog_style |
| Merge into: | lp://staging/~ubuntu-art-pkg/light-themes/trunk |
| Diff against target: |
20535 lines (+20088/-0) (has conflicts) 34 files modified
.bzr-builddeb/default.conf (+2/-0) Ambiance-CSD/gtk-2.0/gtkrc (+1067/-0) Ambiance-CSD/index.theme (+12/-0) Ambiance/gtk-2.0/apps/banshee.rc (+23/-0) Ambiance/gtk-2.0/apps/chromium.rc (+39/-0) Ambiance/gtk-2.0/apps/ff.rc (+30/-0) Ambiance/gtk-2.0/apps/gedit.rc (+35/-0) Ambiance/gtk-2.0/apps/gnome-panel.rc (+118/-0) Ambiance/gtk-2.0/apps/gnome-terminal.rc (+52/-0) Ambiance/gtk-2.0/apps/nautilus.rc (+11/-0) Ambiance/gtk-2.0/apps/ubuntuone.rc (+49/-0) Ambiance/gtk-2.0/gtkrc (+717/-0) Ambiance/index.theme (+12/-0) Ambiance/metacity-1/metacity-theme-1.xml (+672/-0) Radiance/gtk-2.0/apps/banshee.rc (+23/-0) Radiance/gtk-2.0/apps/chromium.rc (+39/-0) Radiance/gtk-2.0/apps/ff.rc (+30/-0) Radiance/gtk-2.0/apps/gedit.rc (+35/-0) Radiance/gtk-2.0/apps/gnome-panel.rc (+121/-0) Radiance/gtk-2.0/apps/gnome-terminal.rc (+42/-0) Radiance/gtk-2.0/apps/nautilus.rc (+11/-0) Radiance/gtk-2.0/gtkrc (+686/-0) Radiance/index.theme (+12/-0) Radiance/metacity-1/metacity-theme-1.xml (+674/-0) debian/changelog (+406/-0) debian/compat (+1/-0) debian/control (+24/-0) debian/copyright (+279/-0) debian/gconf-defaults (+1/-0) debian/install (+1/-0) debian/rules (+8/-0) debian/source/format (+1/-0) src/final_win_deco_buttons.svg (+5905/-0) src/maverick_win_deco_buttons.svg (+8950/-0) Conflict adding file Ambiance-CSD. Moved existing file to Ambiance-CSD.moved. Conflict adding file Ambiance. Moved existing file to Ambiance.moved. Conflict adding file Radiance. Moved existing file to Radiance.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file src. Moved existing file to src.moved. |
| To merge this branch: | bzr merge lp://staging/~unity-team/light-themes/light-themes.add_dialog_style |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Paul Sladen (community) | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
Adds dialog styling
| Paul Sladen (sladen) wrote | # |
Unmerged revisions
- 34. By Sam Spilsbury
-
Add assets for dialog style
- 33. By Sam Spilsbury
-
Add modal dialog style
- 32. By James Schriver
-
[James Schriver]
* Ambiance/Radiance/ apps/gedit. rc
- Add gedit specific theming bits fixes (LP: #740864)
- Minor gedit specific theming tweaks
* Ambiance/gtk-2.0/ gtkrc
- Adjust dark settings to fix me-menu (LP: #664794)[Andrea Cimitan]
* Ambiance/Radiance/ gtk-2.0/ gtkrc
- Tweaked colors for overlay-scrollbars (LP: #767524)
* Ambiance/Radiance/ gtk-3.0/
- Directories removed (unused) - 31. By James Schriver
-
[James Schriver]
* Ambiance/metacity- 1/metacity- theme-1. xml
- Darken frame and bottom edge fix for (LP:740579)
* Radiance/apps/chromium. rc
- Fix incognito theming in Radiance (LP: #697854)
* Radiance/metacity/ metacity- theme-1. xml
- Revert fix borderless overlap (LP: #733504) as this is a fix
for "0" pixel borders" - 30. By Paul Sladen
-
[Andrea Cimitan]
* Ambiance/Radiance/ gtk-2.0/ gtkrc
- Fix inconsistent menu item distances (LP: #659866)
* Ambiance/apps/gnome- terminal. rc
- Add dark-terminal theming to tweak resize grip
* Ambiance/Radiance/ apps/chromium. rc
- Add specific chromium theming bits (LP: #697854)[Daniel Foré]
* Ambiance/gtk-2.0/ apps/ubuntuone. rc
- Further tweaks following on from (LP: #715717)
- May need further adjusting to cope with widgetname adjustments
in the application itself.[James Schriver]
* Radiance/metacity/ metacity- theme-1. xml
- Fix borderless overlap (LP: #733504)*
- Update <info> meta-data; version, and incorrect Radiance *name*.
- Downcase some hexadecimal colours[Paul Sladen]
* This release is known not to be perfect but is an iterative
improvement on the previous and should get a new base-line. - 29. By Paul Sladen
-
{Amb,Rad}
iance/metacity- 1/metacity- theme-1. xml
Revert borders to 1px (blandness, and issues with
Metacity and Unity-2D). (LP: #733431, #733233) - 28. By Paul Sladen
-
[Neil J. Patel]
* {Amb,Rad}iance/metacity- 1/metacity- theme-1. xml
Make borders = 0
- Invisible grip size = 5
- Shadow = 45.0 radius and 0.75 opacity (LP: #733233) - 27. By Ken VanDine
-
* Ambiance/
gtk-2.0/ gtkrc
- Removed style for IdoMessageDialog
* Radiance/gtk-2.0/ gtkrc
- Removed style for IdoMessageDialog - 26. By Paul Sladen
-
[Daniel Foré]
apps/ubuntuone.rc: Move the Ubuntu One-specific themeing for when
running under light-themes into the theme. This impoves the
look of the Ubuntu One clients when running under other themes.
(LP: #715717) - 25. By Ken VanDine
-
* Ambiance/
gtk-2.0/ gtkrc, Radiance/ gtk-2.0/ gtkrc
- Set style for IdoMessageDialog used by incoming call notifications
in empathy
Mmmm, 22,000 lines of diff looks a bit big. Can we make it smaller without the conflict? :-)