diff --git a/AppKit/CPSlider.j b/AppKit/CPSlider.j
index d74122c7a..63104618b 100644
--- a/AppKit/CPSlider.j
+++ b/AppKit/CPSlider.j
@@ -178,7 +178,7 @@ CPCircularSlider = 1;
if ([self hasThemeState:CPThemeStateCircular])
{
var angle = 3*PI_2 - (1.0 - [self doubleValue] - _minValue) / (_maxValue - _minValue) * PI2,
- radius = CGRectGetWidth(trackRect) / 2.0 - 6.0;
+ radius = CGRectGetWidth(trackRect) / 2.0 - 8.0;
knobRect.origin.x = radius * COS(angle) + CGRectGetMidX(trackRect) - 3.0;
knobRect.origin.y = radius * SIN(angle) + CGRectGetMidY(trackRect) - 2.0;
diff --git a/AppKit/CPWindow/_CPStandardWindowView.j b/AppKit/CPWindow/_CPStandardWindowView.j
index bea97d8a8..38c44f353 100644
--- a/AppKit/CPWindow/_CPStandardWindowView.j
+++ b/AppKit/CPWindow/_CPStandardWindowView.j
@@ -117,7 +117,7 @@ var STANDARD_GRADIENT_HEIGHT = 41.0;
+ (CPColor)bodyBackgroundColor
{
if (!_CPStandardWindowViewBodyBackgroundColor)
- _CPStandardWindowViewBodyBackgroundColor = [CPColor whiteColor];//
+ _CPStandardWindowViewBodyBackgroundColor = [CPColor colorWithWhite:0.96 alpha:1.0];
return _CPStandardWindowViewBodyBackgroundColor;
}
diff --git a/AppKit/Themes/Aristo/Resources/CircularSliderBezel.png b/AppKit/Themes/Aristo/Resources/CircularSliderBezel.png
index fca36e39e..56e8d061d 100644
Binary files a/AppKit/Themes/Aristo/Resources/CircularSliderBezel.png and b/AppKit/Themes/Aristo/Resources/CircularSliderBezel.png differ
diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 4e00f026b..4e896255d 100644
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -467,8 +467,8 @@
+ (CPSlider)themedCircularSlider
{
- var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 32.0, 32.0)],
- trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"circularSliderBezel.png" size:CGSizeMake(32.0, 32.0)]);
+ var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)],
+ trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"circularSliderBezel.png" size:CGSizeMake(34.0, 34.0)]);
[slider setSliderType:CPCircularSlider];
[slider setValue:trackColor forThemeAttribute:@"track-color" inState:CPThemeStateCircular];
diff --git a/External/Rakefile b/External/Rakefile
index 206559362..0272cabf9 100644
--- a/External/Rakefile
+++ b/External/Rakefile
@@ -23,7 +23,7 @@ end
task :update_submodules do
if executable_exists? "git"
- system %{cd .. && git submodule update --init}
+ system %{cd .. && git submodule init && git submodule update}
else
puts "Git not installed"
rake abort
diff --git a/Rakefile b/Rakefile
index 2ae19fb41..68724d3ed 100644
--- a/Rakefile
+++ b/Rakefile
@@ -102,7 +102,7 @@ end
task :submodules do
if executable_exists? "git"
- system %{cd .. && git submodule update --init}
+ system %{git submodule init && git submodule update}
else
puts "Git not installed"
rake abort
diff --git a/Tools/capp/Templates/Application/index-debug.html b/Tools/capp/Templates/Application/index-debug.html
index d941b006a..510d4096f 100644
--- a/Tools/capp/Templates/Application/index-debug.html
+++ b/Tools/capp/Templates/Application/index-debug.html
@@ -14,6 +14,8 @@
-->
+
+
Hello World