Skip to content

Commit

Permalink
feat: Revisited contrast mode and code refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
equinusocio committed Sep 28, 2016
1 parent f96b101 commit ffd375f
Show file tree
Hide file tree
Showing 14 changed files with 112 additions and 369 deletions.
2 changes: 1 addition & 1 deletion .src/themes/Material-Theme-Darker.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
//=include "darker/widgets.json"
//=include "darker/buttons.json"
//=include "commons/accent.json"
//=include "darker/options.json"
//=include "commons/options.json"
//
]
2 changes: 1 addition & 1 deletion .src/themes/Material-Theme-Lighter.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
//=include "lighter/widgets.json"
//=include "lighter/buttons.json"
//=include "commons/accent.json"
//=include "lighter/options.json"
//=include "commons/options.json"
//
]
2 changes: 1 addition & 1 deletion .src/themes/Material-Theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
//=include "default/widgets.json"
//=include "default/buttons.json"
//=include "commons/accent.json"
//=include "default/options.json"
//=include "commons/options.json"
//
]
23 changes: 13 additions & 10 deletions .src/themes/lighter/options.json → .src/themes/commons/options.json
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/* @ THEME OPTIONS
* Options override
========================================================================= */
// @ THEME OPTIONS
// Options override
// =========================================================================

// Tabs size Settings

Expand Down Expand Up @@ -50,6 +50,7 @@
"content_margin": [0, 0]
},


// Folder animation

{
Expand Down Expand Up @@ -244,13 +245,12 @@
"layer1.opacity": 0.0
},

// Status bar panel

// Status bar panel
{
"class": "panel_control",
"settings": ["material_theme_panel_separator"],
"layer1.texture": "Material Theme/assets/commons/panel_separator.png",
"layer1.opacity": 0.1,
"layer1.opacity": 0.2,
"layer1.inner_margin": [2, 2, 2, 2],
},

Expand All @@ -259,20 +259,23 @@
{
"class": "sidebar_container",
"settings": ["material_theme_contrast_mode"],
"layer0.tint": [240, 240, 240]
"layer1.opacity": 0.2
},

{
"class": "sidebar_tree",
"settings": ["material_theme_contrast_mode"],
"layer0.tint": [240, 240, 240]
"layer1.opacity": 0.2
},

{
"class": "status_bar",
"settings": ["material_theme_contrast_mode"],
"layer1.tint": [240, 240, 240]
"layer1.opacity": 0.2
},

// Compact mode
// Compact mode

{
"class": "sidebar_tree",
"settings": ["material_theme_compact_sidebar"],
Expand Down
288 changes: 0 additions & 288 deletions .src/themes/darker/options.json

This file was deleted.

8 changes: 6 additions & 2 deletions .src/themes/darker/sidebar.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"layer0.opacity": 1.0,
"layer0.draw_center": false,
"layer0.inner_margin": [0, 24, 12, 24],
"content_margin": [0, 12, 0, 0]
"content_margin": [0, 12, 0, 0],
"layer1.tint": [0,0,0],
"layer1.opacity": 0.0
},
{
"class": "sidebar_tree",
Expand All @@ -18,7 +20,9 @@
"indent_offset": 0,
"indent_top_level": false,
"layer0.tint": [33, 33, 33],
"layer0.opacity": 1.0
"layer0.opacity": 1.0,
"layer1.tint": [0,0,0],
"layer1.opacity": 0.0
},

{
Expand Down
Loading

0 comments on commit ffd375f

Please sign in to comment.