Merge branch 'master' of github.mv.usa.alcatel.com:amercada/Cappuccino

cappuccino · Jan 24, 2013 · e096277 · e096277
2 parents 90df913 + c1dc40c
commit e096277
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -1558,6 +1558,7 @@ var themedButtonValues = nil,
         [@"message-text-alignment",             CPJustifiedTextAlignment],
         [@"message-text-color",                 [CPColor blackColor]],
         [@"message-text-font",                  messageFont],
+        [@"modal-window-button-margin-x",       -15],
         [@"suppression-button-text-color",      [CPColor blackColor]],
         [@"suppression-button-text-font",       suppressionButtonFont],
         [@"size",                               size],
@@ -2125,7 +2126,7 @@ var themedButtonValues = nil,
         closeButtonImageInactive =          PatternImage(@"window-standard-close-button-inactive.png", 16, 16),
         closeButtonImageHighlighted =       PatternImage(@"window-standard-button-highlighted.png", 16, 16),
         unsavedButtonImage =                PatternImage(@"window-standard-button-unsaved.png", 16, 16),
-        unsavedButtonImageInactive =                PatternImage(@"window-standard-button-unsaved-inactive.png", 16, 16),
+        unsavedButtonImageInactive =        PatternImage(@"window-standard-button-unsaved-inactive.png", 16, 16),
         unsavedButtonImageHighlighted =     PatternImage(@"window-standard-close-button-unsaved-highlighted.png", 16, 16),
         minimizeButtonImage =               PatternImage(@"window-standard-minimize-button.png", 16, 16),
         minimizeButtonImageHighlighted =    PatternImage(@"window-standard-minimize-button-highlighted.png", 16, 16),