Skip to content

Commit

Permalink
[[Synced from revision 518]]
Browse files Browse the repository at this point in the history
[Simplicity]
-- Palettes. Fixed many border button colors to cause less cross-element conflict.
-- Now uses Operator font as default.
-- Header text locked to a centered 17px height and reduced to 13 size for more consistent fontset scaling/positioning.
-- Fixed AutoWidth issue with ControlLabel (causing some elements to not cover the full area).
-- Active tabs now correctly maintain their right highlight line color.
-- Added Mecanim Transition styles.
  • Loading branch information
JadenKorn committed Aug 2, 2016
1 parent a360e9a commit e36d0a5
Show file tree
Hide file tree
Showing 36 changed files with 709 additions and 142 deletions.
3 changes: 0 additions & 3 deletions Codebase/Systems/Interface/Themes/Editor/ThemeSkinset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ public void ApplyMain(Theme theme){
Utility.GetUnityType("SceneRenderModeWindow.Styles").SetVariable("sSeparator",skin.Get("sv_iconselector_sep"));
Utility.GetUnityType("GameView.Styles").SetVariable("gizmoButtonStyle",skin.Get("GV Gizmo DropDown"));
typeof(SceneView).SetVariable<GUIStyle>("s_DropDownStyle",skin.Get("GV Gizmo DropDown"));
var console = Utility.GetUnityType("ConsoleWindow.Constants");
console.SetVariable("ms_Loaded",false);
console.CallMethod("Init");
var hostView = Utility.GetUnityType("HostView");
if(palette.Has("Cursor")){skin.settings.cursorColor = palette.Get("Cursor");}
if(palette.Has("Selection")){skin.settings.selectionColor = palette.Get("Selection");}
Expand Down
2 changes: 1 addition & 1 deletion Codebase/Systems/Interface/Themes/Editor/ThemeSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public enum HoverResponse{None=1,Slow,Moderate,Instant};
[InitializeOnLoad][NotSerialized]
public partial class Theme{
public static Theme active;
public static string revision = "3 [r514]";
public static string revision = "3 [r518]";
public static int themeIndex;
public static int paletteIndex;
public static int fontsetIndex;
Expand Down
2 changes: 1 addition & 1 deletion Themes/Palettes/Basic/Silversky.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #818181
Border : #C4C6CC
BorderActive : #818181
BorderButton : #81818115
BorderButton : #C4C6CC
BorderIcons : #81818166
Highlight : #D0D3DB
HighlightActive : #818181
Expand Down
10 changes: 5 additions & 5 deletions Themes/Palettes/Themed/3.11.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #000080
Border : #C0C0C0
BorderActive : #000080
BorderButton : #FFFFFF00
BorderButton : #C0C0C0
BorderIcons : #000000BE
Highlight : #C0C0C0
HighlightActive : #000080
Expand All @@ -31,10 +31,10 @@
TextError : #B32727
TextHeader : #000000
(Other)
Frame : #FFFFFF : TextBorderActive : 0.4
Frame : #666666 : TextBorderActive : 0.4
Window : #FFFFFF : Main
Details : #C0C0C0 : Border
Cursor : #C0C0C0 : Highlight
Selection : #C0C0C0 : MainButton : 0.5
Curve : #C0C0C0 : Highlight : 1.5
CurveBackground : #C0C0C0 : Border : 0.5
Selection : #606060 : MainButton : 0.5
Curve : #FFFFFF : Highlight : 1.5
CurveBackground : #606060 : Border : 0.5
6 changes: 3 additions & 3 deletions Themes/Palettes/Themed/Alien.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #00C0FF
Border : #D3D6DD
BorderActive : #00C0FF
BorderButton : #C0BFC4
BorderButton : #D3D6DD : Border
BorderIcons : #313237
Highlight : #121315
HighlightActive : #313237
Expand Down Expand Up @@ -36,5 +36,5 @@
Details : #4E4E4E65 : Header
Cursor : #121315 : Highlight
Selection : #D3D6DD : Border
Curve : #121315 : Highlight : 1.5
CurveBackground : #D3D6DD : Border : 0.5
Curve : #1B1C1F : Highlight : 1.5
CurveBackground : #696B6E : Border : 0.5
8 changes: 4 additions & 4 deletions Themes/Palettes/Themed/Amped.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #C8B383
Border : #2A2A3F
BorderActive : #161622
BorderButton : #00D91300
BorderButton : #2A2A3F : Border
BorderIcons : #FFFFFFA0
Highlight : #555577
HighlightActive : #000080
Expand Down Expand Up @@ -35,6 +35,6 @@
Window : #131314 : Main
Details : #2A2A3F : Border
Cursor : #C8B383 : MainIcons
Selection : #C8B383 : MainIcons : 0.5
Curve : #555577 : Highlight : 1.5
CurveBackground : #2A2A3F : Border : 0.5
Selection : #645941 : MainIcons : 0.5
Curve : #7F7FB2 : Highlight : 1.5
CurveBackground : #15151F : Border : 0.5
8 changes: 4 additions & 4 deletions Themes/Palettes/Themed/Beaches.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #C43131
Border : #A7DBD8
BorderActive : #C43131
BorderButton : #FFFFFF00
BorderButton : #FFFFFF4E
BorderIcons : #00000083
Highlight : #5EBCCF
HighlightActive : #C43131
Expand Down Expand Up @@ -35,6 +35,6 @@
Window : #E0E4CC : Main
Details : #A7DBD8 : Border
Cursor : #5EBCCF : Highlight
Selection : #5EBCCF : Highlight : 0.5
Curve : #5EBCCF : Highlight : 1.5
CurveBackground : #A7DBD8 : Border : 0.5
Selection : #2F5E67 : Highlight : 0.5
Curve : #8DFFFF : Highlight : 1.5
CurveBackground : #536D6C : Border : 0.5
10 changes: 5 additions & 5 deletions Themes/Palettes/Themed/Lisa.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #FFFB00
Border : #DA4F93
BorderActive : #A5E430
BorderButton : #EA86C16A
BorderButton : #DA4F93 : Border
BorderIcons : #FEFC5D
Highlight : #FEFC5D
HighlightActive : #E56A31
Expand Down Expand Up @@ -34,7 +34,7 @@
Frame : #A5E430 : BorderActive
Window : #1F96CA : Main
Details : #DA4F93 : Border
Cursor : #FEFC5D : Highlight : 0
Selection : #E56A31 : HighlightActive : 0.5
Curve : #FEFC5D : Highlight : 1.5
CurveBackground : #DA4F93 : Border : 0.5
Cursor : #000000 : Highlight : 0
Selection : #723518 : HighlightActive : 0.5
Curve : #FFFF8B : Highlight : 1.5
CurveBackground : #6D2749 : Border : 0.5
8 changes: 4 additions & 4 deletions Themes/Palettes/Themed/Scream.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #FFFFFF
Border : #A49054
BorderActive : #000000
BorderButton : #6C5B3200
BorderButton : #A49054 : Border
BorderIcons : #FFFFFF60
Highlight : #FCDC84
HighlightActive : #000000
Expand Down Expand Up @@ -35,6 +35,6 @@
Window : #494038 : Main
Details : #A49054 : Border
Cursor : #FCDC84 : Highlight
Selection : #FCDC84 : Highlight : 0.5
Curve : #FCDC84 : Highlight : 1.5
CurveBackground : #A49054 : Border : 0.5
Selection : #7E6E42 : Highlight : 0.5
Curve : #FFFFC6 : Highlight : 1.5
CurveBackground : #52482A : Border : 0.5
8 changes: 4 additions & 4 deletions Themes/Palettes/Themed/SuperN.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #55338D
Border : #CDCCD1
BorderActive : #805AB6
BorderButton : #C0BFC4
BorderButton : #CDCCD1 : Border
BorderIcons : #805AB6
Highlight : #805AB6
HighlightActive : #727276
Expand Down Expand Up @@ -35,6 +35,6 @@
Window : #C0BFC0 : Main
Details : #CDCCD1 : Border
Cursor : #805AB6 : Highlight
Selection : #805AB6 : Highlight : 0.5
Curve : #805AB6 : Highlight : 1.5
CurveBackground : #CDCCD1 : Border : 0.5
Selection : #402D5B : Highlight : 0.5
Curve : #C087FF : Highlight : 1.5
CurveBackground : #666668 : Border : 0.5
6 changes: 3 additions & 3 deletions Themes/Palettes/Themed/SymbOS.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #630100
Border : #630100
BorderActive : #000000
BorderButton : #F7F76300
BorderButton : #630100 : Border
BorderIcons : #F7F763E1
Highlight : #B36100
HighlightActive : #000000
Expand Down Expand Up @@ -36,5 +36,5 @@
Details : #FFFFFF37 : Header
Cursor : #B36100 : Highlight
Selection : #B36100 : Highlight
Curve : #B36100 : Highlight : 1.5
CurveBackground : #630100 : Border : 0.5
Curve : #FF9100 : Highlight : 1.5
CurveBackground : #310000 : Border : 0.5
4 changes: 2 additions & 2 deletions Themes/Palettes/Themed/Terminal.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #00FF16
Border : #000000
BorderActive : #00FF16
BorderButton : #00D91300
BorderButton : #00D91338
BorderIcons : #00FF16
Highlight : #003A05
HighlightActive : #00FF16
Expand Down Expand Up @@ -36,5 +36,5 @@
Details : #000000 : Border
Cursor : #003A05 : Highlight
Selection : #FFFF00 : TextWarning
Curve : #003A05 : Highlight : 1.5
Curve : #005707 : Highlight : 1.5
CurveBackground : #000000 : Border : 0.5
2 changes: 1 addition & 1 deletion Themes/Palettes/Themed/XP.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #094A9F
Border : #1869D3
BorderActive : #198E19
BorderButton : #FFFFFF00
BorderButton : #1869D3 : Border
BorderIcons : #FFFFFF83
Highlight : #EFEDDF
HighlightActive : #198E19
Expand Down
2 changes: 1 addition & 1 deletion Themes/Palettes/Themed/Zest.unitypalette
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
MainIcons : #FFFFFF
Border : #259073
BorderActive : #000000
BorderButton : #FFFFFF1B
BorderButton : #259073 : Border
BorderIcons : #FFFFFF60
Highlight : #7FDA89
HighlightActive : #000000
Expand Down
2 changes: 1 addition & 1 deletion Themes/Simplicity.unitytheme
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ CustomizablePalette = True
CustomizableFontset = True
CustomizableIconset = True
Palette = Zone
Fontset = 8bitOperator
Fontset = Operator
Iconset = Simplicity
Skinset = Simplicity
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 59 additions & 0 deletions Themes/Skinsets/Simplicity/Background/ColorHighlight50.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e36d0a5

Please sign in to comment.