Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ui Update and Design Fixes #123

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Ui Update and Design Fixes #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d9bdce8
enhancment of sidebar, finder and tabs
grayghostvisuals Jul 26, 2015
ab34d8e
background change for standard buttons
grayghostvisuals Jul 27, 2015
6dd4b5b
color adjustment
grayghostvisuals Jul 27, 2015
1f7de98
panel updates for new ui
grayghostvisuals Jul 27, 2015
0c7af12
mini map viewport_color tweak
grayghostvisuals Jul 27, 2015
ee4b70f
proportion enlarged
grayghostvisuals Jul 27, 2015
c99ff64
adjustment for input
grayghostvisuals Jul 27, 2015
a234cb6
update temporary screenshots
grayghostvisuals Jul 27, 2015
46346af
temporary screenshot link
grayghostvisuals Jul 27, 2015
ee6c459
transparent bg
grayghostvisuals Jul 27, 2015
ae8da89
extend bottom transparency
grayghostvisuals Jul 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 62 additions & 35 deletions Flatland Dark.sublime-theme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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],
Expand All @@ -49,22 +51,22 @@
// 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
{
"class": "tab_label",
"fade": false,
"fg": [144, 146, 147],
"font.bold" : false,
"font.bold" : true,
"font.size" : 11
},
{
Expand All @@ -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",
Expand All @@ -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
{
Expand Down Expand Up @@ -318,7 +320,7 @@

{
"class": "sheet_container_control",
"layer0.tint": [38,41,44],
"layer0.tint": [4, 32, 41],
"layer0.opacity": 1.0
},

Expand All @@ -337,7 +339,7 @@

{
"class": "minimap_control",
"viewport_color": [61, 142, 243, 20]
"viewport_color": [161, 142, 253, 50]
},

//
Expand Down Expand Up @@ -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
Expand All @@ -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
},
Expand Down Expand Up @@ -484,15 +503,15 @@
// 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]
},
// Sidebar entry
{
"class": "sidebar_label",
"color": [212, 212, 213],
"color": [153, 178, 184],
"shadow_offset": [0, 0]
},
// Sidebar folder entry
Expand Down Expand Up @@ -656,25 +675,31 @@
// 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,
"layer0.inner_margin": [6, 6],
// 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
},

//
Expand All @@ -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]
},

//
Expand All @@ -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
Expand Down Expand Up @@ -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",
Expand All @@ -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]
Expand Down Expand Up @@ -820,31 +847,31 @@
"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
{
"class": "icon_button_control",
"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
{
"class": "icon_button_control",
"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
{
"class": "icon_button_control",
"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]
},

//
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -984,12 +1011,12 @@
"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",
"parents": [{"class": "icon_button_control", "attributes": ["selected"]}],
"layer0.texture": "Theme - Flatland/Flatland Dark/icon-highlight-on.png"
}

]
]
2 changes: 1 addition & 1 deletion Flatland Dark.tmTheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<key>activeGuide</key>
<string>#73797b60</string>

</dict>
</dict>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion Flatland Dark/Widget - Flatland Dark.stTheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<key>settings</key>
<dict>
<key>background</key>
<string>#313437</string>
<string>#08323E</string>
<key>caret</key>
<string>#FFFFFF</string>
<key>foreground</key>
Expand Down
Binary file modified Flatland Dark/btn-group-left.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/btn-group-middle.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/btn-group-right.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/btn-large-on.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/btn-large.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/btn-single.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/overlay-bg.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/panel-background.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/quick-panel-row.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/status-bar-background.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/text-field.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Flatland Dark/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified screenshots.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.