diff --git a/Flatland Dark.sublime-theme b/Flatland Dark.sublime-theme index a6c63d6..ea2b06d 100755 --- a/Flatland Dark.sublime-theme +++ b/Flatland Dark.sublime-theme @@ -8,6 +8,7 @@ "layer0.texture": "Theme - Flatland/Flatland Dark/tabset-background.png", "layer0.inner_margin": [10, 0], "layer0.opacity": 1.0, + "layer0.tint": [0, 31, 39], "content_margin": [0, 4, 0, 0], "tab_overlap": 6, "tab_width": 160, @@ -29,7 +30,8 @@ // Inactive tab settings "layer0.texture": "Theme - Flatland/Flatland Dark/tab-inactive.png", "layer0.inner_margin": [20, 4], - "layer0.opacity": 1.0, + "layer0.opacity": 0.9, + "layer0.tint": [0, 180, 200], // Active tab setting "layer1.texture": "Theme - Flatland/Flatland Dark/tab-active.png", "layer1.inner_margin": [20, 4], @@ -49,14 +51,14 @@ // Hover tab state "class": "tab_control", "attributes": ["hover"], - "layer2.opacity": 1.0 + "layer2.opacity": 0.5 }, { // Active tab state "class": "tab_control", "attributes": ["selected"], - "layer0.opacity": 0.0, - "layer1.opacity": 1.0, + "layer0.opacity": 1.0, + "layer1.opacity": 0.4, "layer2.opacity": 0.0 }, // Tab labels @@ -64,7 +66,7 @@ "class": "tab_label", "fade": false, "fg": [144, 146, 147], - "font.bold" : false, + "font.bold" : true, "font.size" : 11 }, { @@ -86,7 +88,7 @@ "content_margin": [0, 0], // Tab close default settings "layer0.texture": "Theme - Flatland/Flatland Dark/tab-close.png", - "layer0.opacity": 1.0, + "layer0.opacity": 0.5, "layer0.inner_margin": [0, 0], // Tab close hover settings "layer1.texture": "Theme - Flatland/Flatland Dark/tab-close-hover.png", @@ -103,7 +105,7 @@ "class": "tab_close_button", "attributes": ["hover"], "layer0.opacity": 0.0, - "layer1.opacity": 1.0 + "layer1.opacity": 0.7 }, // Tab dirty button { @@ -318,7 +320,7 @@ { "class": "sheet_container_control", - "layer0.tint": [38,41,44], + "layer0.tint": [4, 32, 41], "layer0.opacity": 1.0 }, @@ -337,7 +339,7 @@ { "class": "minimap_control", - "viewport_color": [61, 142, 243, 20] + "viewport_color": [161, 142, 253, 50] }, // @@ -394,22 +396,39 @@ "class": "tool_tip_label_control", "color": [0, 0, 0] }, + { + "class": "color_console", + "layer0.texture": "", + "layer0.opacity": 0.0, + "layer0.inner_margin": [2, 2], + "content_margin": [8, 8, 8, 8] + }, // // STATUS BAR // + // Status bar container { "class": "status_bar", "layer0.texture": "Theme - Flatland/Flatland Dark/status-bar-background.png", "layer0.opacity": 1.0, "layer0.inner_margin": [2, 2], - "content_margin": [14, 4, 4, 4] + "content_margin": [8, 8, 8, 8] }, + // Status bar button { "class": "status_button", "min_size": [100, 0] }, + // Status bar label + { + "class": "label_control", + "parents": [{"class": "status_bar"}], + "color": [150, 150, 150], + "shadow_color": [25, 25, 25], + "shadow_offset": [0, -1] + }, // // SIDEBAR @@ -431,7 +450,7 @@ "indent": 14, "indent_offset": 20, "indent_top_level": false, - "layer0.tint": [49, 52, 55], + "layer0.tint": [0, 31, 39], "layer0.opacity": 1.0, "dark_content": false }, @@ -484,7 +503,7 @@ // Sidebar heading { "class": "sidebar_heading", - "color": [148, 149, 151], + "color": [24, 136, 210], "font.bold": true, "shadow_color": [148, 149, 151], "shadow_offset": [0, 0] @@ -492,7 +511,7 @@ // Sidebar entry { "class": "sidebar_label", - "color": [212, 212, 213], + "color": [153, 178, 184], "shadow_offset": [0, 0] }, // Sidebar folder entry @@ -656,11 +675,16 @@ // STANDARD TEXT BUTTONS // + // General labels + { + "class": "label_control", + "color": [153, 178, 184] + }, // Standard buttons (used for Find / Replace panel) { "class": "button_control", - "content_margin": [4, 6, 4, 5], - "min_size": [69, 0], + "content_margin": [8, 8, 8, 8], + "min_size": [72, 0], // Default button state "layer0.texture": "Theme - Flatland/Flatland Dark/btn-large.png", "layer0.opacity": 1.0, @@ -668,13 +692,14 @@ // Pressed button setup "layer1.texture": "Theme - Flatland/Flatland Dark/btn-large-on.png", "layer1.opacity": 0.0, + "layer1.tint": [0, 72, 91], "layer1.inner_margin": [6, 6] }, { // Pressed button state "class": "button_control", "attributes": ["pressed", "hover"], - "layer1.opacity": 1.0 + "layer1.opacity": 0.7 }, // @@ -687,7 +712,7 @@ "layer0.texture": "Theme - Flatland/Flatland Dark/text-field.png", "layer0.opacity": 1.0, "layer0.inner_margin": [10,10,10,10], - "content_margin": [4, 5, 15, 4] + "content_margin": [8, 5, 5, 5] }, // @@ -699,6 +724,7 @@ "class": "panel_control", "layer0.texture": "Theme - Flatland/Flatland Dark/panel-background.png", "layer0.inner_margin": [2, 2, 2, 5], + "layer0.tint": [0, 32, 140], "layer0.opacity": 1.0 }, // Quick panel background @@ -733,7 +759,8 @@ "class": "quick_panel_row", "layer0.texture": "Theme - Flatland/Flatland Dark/quick-panel-row.png", "layer0.inner_margin": [2, 2, 2, 2], - "layer0.opacity": 1.0 + "layer0.opacity": 1.0, + "layer0.tint": [100, 200, 220] }, { "class": "quick_panel_row", @@ -742,14 +769,14 @@ }, { "class": "quick_panel_label", - "fg": [144, 146, 147], + "fg": [147, 179, 185], "match_fg": [36, 150, 233, 255], "selected_fg": [255, 255, 255, 255], //selected foreground "selected_match_fg": [37, 40, 43, 255] }, { "class": "quick_panel_path_label", - "fg": [104, 106, 107, 255], + "fg": [49, 115, 199], "match_fg": [16, 130, 213, 255], "selected_fg": [215, 215, 215, 255], "selected_match_fg": [57, 60, 63, 255] @@ -820,7 +847,7 @@ "class": "icon_button_control", "layer0.texture": "Theme - Flatland/Flatland Dark/btn-group-middle.png", "layer0.opacity": 1.0, - "content_margin": [4, 4,4,5] + "content_margin": [4,4,4,4] }, // Button group left { @@ -828,7 +855,7 @@ "attributes": ["left"], "layer0.texture": "Theme - Flatland/Flatland Dark/btn-group-left.png", "layer0.opacity": 1.0, - "content_margin": [8,4,5,5] + "content_margin": [4,4,4,4] }, // Button group right { @@ -836,7 +863,7 @@ "attributes": ["right"], "layer0.texture": "Theme - Flatland/Flatland Dark/btn-group-right.png", "layer0.opacity": 1.0, - "content_margin": [4,4,8,5] + "content_margin": [4,4,4,4] }, // Button single { @@ -844,7 +871,7 @@ "attributes": ["left", "right"], "layer0.texture": "Theme - Flatland/Flatland Dark/btn-single.png", "layer0.opacity": 1.0, - "content_margin": [8,4,8,5] + "content_margin": [12,4,12,4] }, // @@ -856,7 +883,7 @@ "class": "icon_regex", "layer0.texture": "Theme - Flatland/Flatland Dark/icon-regex-off.png", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": [11, 11] }, { "class": "icon_regex", @@ -868,7 +895,7 @@ "class": "icon_case", "layer0.texture": "Theme - Flatland/Flatland Dark/icon-case-off.png", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": [11, 11] }, { "class": "icon_case", @@ -880,7 +907,7 @@ "class": "icon_whole_word", "layer0.texture": "Theme - Flatland/Flatland Dark/icon-word-off.png", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": [11, 11] }, { "class": "icon_whole_word", @@ -897,7 +924,7 @@ "class": "icon_context", "layer0.texture": "Theme - Flatland/Flatland Dark/icon-context-off.png", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": [11, 11] }, { "class": "icon_context", @@ -909,7 +936,7 @@ "class": "icon_use_buffer", "layer0.texture": "Theme - Flatland/Flatland Dark/icon-buffer-off.png", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": [11, 11] }, { "class": "icon_use_buffer", @@ -926,7 +953,7 @@ "class": "icon_reverse", "layer0.texture": "Theme - Flatland/Flatland Dark/icon-reverse-off.png", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": [11, 11] }, { "class": "icon_reverse", @@ -938,7 +965,7 @@ "class": "icon_wrap", "layer0.texture": "Theme - Flatland/Flatland Dark/icon-wrap-off.png", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": [11, 11] }, { "class": "icon_wrap", @@ -950,7 +977,7 @@ "class": "icon_in_selection", "layer0.texture": "Theme - Flatland/Flatland Dark/icon-selection-off.png", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": [11, 11] }, { "class": "icon_in_selection", @@ -967,7 +994,7 @@ "class": "icon_preserve_case", "layer0.texture": "Theme - Flatland/Flatland Dark/icon-preserve-off.png", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": [11, 11] }, { "class": "icon_preserve_case", @@ -984,7 +1011,7 @@ "class": "icon_highlight", "layer0.texture": "Theme - Flatland/Flatland Dark/icon-highlight-off.png", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": [11, 11] }, { "class": "icon_highlight", @@ -992,4 +1019,4 @@ "layer0.texture": "Theme - Flatland/Flatland Dark/icon-highlight-on.png" } -] +] \ No newline at end of file diff --git a/Flatland Dark.tmTheme b/Flatland Dark.tmTheme index de72a26..9e5b393 100644 --- a/Flatland Dark.tmTheme +++ b/Flatland Dark.tmTheme @@ -42,7 +42,7 @@ activeGuide #73797b60 - + diff --git a/Flatland Dark/Widget - Flatland Dark.stTheme b/Flatland Dark/Widget - Flatland Dark.stTheme index 32b8e37..7de5b39 100644 --- a/Flatland Dark/Widget - Flatland Dark.stTheme +++ b/Flatland Dark/Widget - Flatland Dark.stTheme @@ -14,7 +14,7 @@ settings background - #313437 + #08323E caret #FFFFFF foreground diff --git a/Flatland Dark/btn-group-left.png b/Flatland Dark/btn-group-left.png index c383d47..aac7bbf 100644 Binary files a/Flatland Dark/btn-group-left.png and b/Flatland Dark/btn-group-left.png differ diff --git a/Flatland Dark/btn-group-middle.png b/Flatland Dark/btn-group-middle.png index 2a774f3..2e2f30b 100644 Binary files a/Flatland Dark/btn-group-middle.png and b/Flatland Dark/btn-group-middle.png differ diff --git a/Flatland Dark/btn-group-right.png b/Flatland Dark/btn-group-right.png index 3529e39..5c0b894 100644 Binary files a/Flatland Dark/btn-group-right.png and b/Flatland Dark/btn-group-right.png differ diff --git a/Flatland Dark/btn-large-on.png b/Flatland Dark/btn-large-on.png index 27ab9a0..c4a9b98 100644 Binary files a/Flatland Dark/btn-large-on.png and b/Flatland Dark/btn-large-on.png differ diff --git a/Flatland Dark/btn-large.png b/Flatland Dark/btn-large.png index 844b257..adac620 100644 Binary files a/Flatland Dark/btn-large.png and b/Flatland Dark/btn-large.png differ diff --git a/Flatland Dark/btn-single.png b/Flatland Dark/btn-single.png index 435c495..f9a335d 100644 Binary files a/Flatland Dark/btn-single.png and b/Flatland Dark/btn-single.png differ diff --git a/Flatland Dark/overlay-bg.png b/Flatland Dark/overlay-bg.png index 9ef8bf2..10167d4 100644 Binary files a/Flatland Dark/overlay-bg.png and b/Flatland Dark/overlay-bg.png differ diff --git a/Flatland Dark/panel-background.png b/Flatland Dark/panel-background.png index a775691..6ece89b 100644 Binary files a/Flatland Dark/panel-background.png and b/Flatland Dark/panel-background.png differ diff --git a/Flatland Dark/quick-panel-row.png b/Flatland Dark/quick-panel-row.png index f313f7f..b19dd38 100644 Binary files a/Flatland Dark/quick-panel-row.png and b/Flatland Dark/quick-panel-row.png differ diff --git a/Flatland Dark/status-bar-background.png b/Flatland Dark/status-bar-background.png index af561c5..b7cdfad 100644 Binary files a/Flatland Dark/status-bar-background.png and b/Flatland Dark/status-bar-background.png differ diff --git a/Flatland Dark/text-field.png b/Flatland Dark/text-field.png index 3926811..252d08a 100644 Binary files a/Flatland Dark/text-field.png and b/Flatland Dark/text-field.png differ diff --git a/Flatland Dark/text-field@2x.png b/Flatland Dark/text-field@2x.png index cf8c38d..f06b057 100644 Binary files a/Flatland Dark/text-field@2x.png and b/Flatland Dark/text-field@2x.png differ diff --git a/README.md b/README.md index 2388f91..fe87013 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Flatland is a simple theme and accompanying color scheme for Sublime Text 2 & 3. ## Design -![Screen Shot!](https://raw.github.com/thinkpixellab/flatland/master/screenshots.png) +![Screen Shot!](https://github.com/grayghostvisuals/flatland/blob/ui-update/screenshots.png) ## Installation diff --git a/screenshots.png b/screenshots.png index 9f3cafd..dbcae2b 100644 Binary files a/screenshots.png and b/screenshots.png differ