Skip to content

Commit

Permalink
fix: Redesigned scrollbars
Browse files Browse the repository at this point in the history
  • Loading branch information
equinusocio committed Oct 20, 2016
1 parent afe682c commit 49a13f8
Show file tree
Hide file tree
Showing 40 changed files with 205 additions and 204 deletions.
51 changes: 26 additions & 25 deletions Material-Theme-Darker.sublime-theme
Original file line number Diff line number Diff line change
Expand Up @@ -914,37 +914,37 @@

// Normal Vertical scrollbar track inside overlay panel

{
"class": "scroll_bar_control",
"parents": [{"class": "overlay_control"}],
"layer0.tint": [38, 50, 56, 0],
"layer0.opacity": 1.0,
"layer0.inner_margin": [0, 6],
"blur": false
},
// {
// "class": "scroll_bar_control",
// "parents": [{"class": "overlay_control"}],
// "layer0.tint": [38, 50, 56, 0],
// "layer0.opacity": 1.0,
// "layer0.inner_margin": [0, 6],
// "blur": false
// },

// Normal horizontal scrollbar track

{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/darker/normal_bar_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [6, 0],
"blur": false
},
{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/darker/normal_bar_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [6, 0],
"blur": false
},

// Normal horizontal scrollbar track inside overlay panel

{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"parents": [{"class": "overlay_control"}],
"layer0.tint": [38, 50, 56, 0],
"layer0.opacity": 0.0,
"layer0.inner_margin": [0, 2],
"blur": false
},
// {
// "class": "scroll_bar_control",
// "attributes": ["horizontal"],
// "parents": [{"class": "overlay_control"}],
// "layer0.tint": [38, 50, 56, 0],
// "layer0.opacity": 0.0,
// "layer0.inner_margin": [0, 2],
// "blur": false
// },

// Scrollbars corner

Expand Down Expand Up @@ -1052,6 +1052,7 @@
"blur": true
},


/* @MINIMAP
* Minimap settings and behavioring
========================================================================= */
Expand Down
50 changes: 25 additions & 25 deletions Material-Theme-Lighter.sublime-theme
Original file line number Diff line number Diff line change
Expand Up @@ -923,37 +923,37 @@

// Normal Vertical scrollbar track inside overlay panel

{
"class": "scroll_bar_control",
"parents": [{"class": "overlay_control"}],
"layer0.tint": [250, 250, 250, 0],
"layer0.opacity": 1.0,
"layer0.inner_margin": [0, 6],
"blur": false
},
// {
// "class": "scroll_bar_control",
// "parents": [{"class": "overlay_control"}],
// "layer0.tint": [250, 250, 250, 0],
// "layer0.opacity": 1.0,
// "layer0.inner_margin": [0, 6],
// "blur": false
// },

// Normal horizontal scrollbar track

{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/lighter/normal_bar_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [6, 0],
"blur": false
},
{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/lighter/normal_bar_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [6, 0],
"blur": false
},

// Normal horizontal scrollbar track inside overlay panel

{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"parents": [{"class": "overlay_control"}],
"layer0.tint": [250, 250, 250, 0],
"layer0.opacity": 0.0,
"layer0.inner_margin": [0, 2],
"blur": false
},
// {
// "class": "scroll_bar_control",
// "attributes": ["horizontal"],
// "parents": [{"class": "overlay_control"}],
// "layer0.tint": [250, 250, 250, 0],
// "layer0.opacity": 0.0,
// "layer0.inner_margin": [0, 2],
// "blur": false
// },

// Scrollbars corner

Expand Down
54 changes: 27 additions & 27 deletions Material-Theme-Palenight.sublime-theme
Original file line number Diff line number Diff line change
Expand Up @@ -928,39 +928,39 @@
"blur": false
},

// Normal Vertical scrollbar track inside overlay panel
// // Normal Vertical scrollbar track inside overlay panel

{
"class": "scroll_bar_control",
"parents": [{"class": "overlay_control"}],
"layer0.tint": [41, 45, 62, 0],
"layer0.opacity": 1.0,
"layer0.inner_margin": [0, 6],
"blur": false
},
// {
// "class": "scroll_bar_control",
// "parents": [{"class": "overlay_control"}],
// "layer0.tint": [41, 45, 62, 0],
// "layer0.opacity": 1.0,
// "layer0.inner_margin": [0, 6],
// "blur": false
// },

// Normal horizontal scrollbar track

{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/palenight/normal_bar_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [6, 0],
"blur": false
},
{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/palenight/normal_bar_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [6, 0],
"blur": false
},

// Normal horizontal scrollbar track inside overlay panel

{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"parents": [{"class": "overlay_control"}],
"layer0.tint": [41, 45, 62, 0],
"layer0.opacity": 0.0,
"layer0.inner_margin": [0, 2],
"blur": false
},
// {
// "class": "scroll_bar_control",
// "attributes": ["horizontal"],
// "parents": [{"class": "overlay_control"}],
// "layer0.tint": [41, 45, 62, 0],
// "layer0.opacity": 0.0,
// "layer0.inner_margin": [0, 2],
// "blur": false
// },

// Scrollbars corner

Expand Down Expand Up @@ -992,7 +992,7 @@
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/palenight/thumb_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [10, 0],
"layer0.inner_margin": [10, 10],
"content_margin": [16, 6],
"blur": false
},
Expand Down
50 changes: 25 additions & 25 deletions Material-Theme.sublime-theme
Original file line number Diff line number Diff line change
Expand Up @@ -929,37 +929,37 @@

// Normal Vertical scrollbar track inside overlay panel

{
"class": "scroll_bar_control",
"parents": [{"class": "overlay_control"}],
"layer0.tint": [38, 50, 56, 0],
"layer0.opacity": 1.0,
"layer0.inner_margin": [0, 6],
"blur": false
},
// {
// "class": "scroll_bar_control",
// "parents": [{"class": "overlay_control"}],
// "layer0.tint": [38, 50, 56, 0],
// "layer0.opacity": 1.0,
// "layer0.inner_margin": [0, 6],
// "blur": false
// },

// Normal horizontal scrollbar track

{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/default/normal_bar_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [6, 0],
"blur": false
},
{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/default/normal_bar_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [6, 0],
"blur": false
},

// Normal horizontal scrollbar track inside overlay panel

{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"parents": [{"class": "overlay_control"}],
"layer0.tint": [38, 50, 56, 0],
"layer0.opacity": 0.0,
"layer0.inner_margin": [0, 2],
"blur": false
},
// {
// "class": "scroll_bar_control",
// "attributes": ["horizontal"],
// "parents": [{"class": "overlay_control"}],
// "layer0.tint": [38, 50, 56, 0],
// "layer0.opacity": 0.0,
// "layer0.inner_margin": [0, 2],
// "blur": false
// },

// Scrollbars corner

Expand Down
Binary file modified assets/darker/normal_bar_horizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/darker/[email protected]
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 assets/darker/normal_bar_vertical.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/darker/[email protected]
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 assets/darker/thumb_horizontal.png
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 assets/darker/[email protected]
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 assets/darker/thumb_vertical.png
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 assets/darker/[email protected]
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 assets/default/normal_bar_horizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/default/[email protected]
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 assets/default/normal_bar_vertical.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/default/[email protected]
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 assets/default/thumb_horizontal.png
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 assets/default/[email protected]
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 assets/default/thumb_vertical.png
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 assets/default/[email protected]
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 assets/lighter/normal_bar_horizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lighter/[email protected]
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 assets/lighter/normal_bar_vertical.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lighter/[email protected]
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 assets/lighter/thumb_horizontal.png
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 assets/lighter/[email protected]
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 assets/lighter/thumb_vertical.png
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 assets/lighter/[email protected]
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 assets/palenight/normal_bar_horizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/palenight/[email protected]
Binary file modified assets/palenight/normal_bar_vertical.png
Binary file added assets/palenight/[email protected]
Binary file modified assets/palenight/thumb_horizontal.png
Binary file modified assets/palenight/[email protected]
Binary file modified assets/palenight/thumb_vertical.png
Binary file modified assets/palenight/[email protected]
52 changes: 26 additions & 26 deletions sources/themes/darker/scrollbars.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,37 @@

// Normal Vertical scrollbar track inside overlay panel

{
"class": "scroll_bar_control",
"parents": [{"class": "overlay_control"}],
"layer0.tint": [38, 50, 56, 0],
"layer0.opacity": 1.0,
"layer0.inner_margin": [0, 6],
"blur": false
},
// {
// "class": "scroll_bar_control",
// "parents": [{"class": "overlay_control"}],
// "layer0.tint": [38, 50, 56, 0],
// "layer0.opacity": 1.0,
// "layer0.inner_margin": [0, 6],
// "blur": false
// },

// Normal horizontal scrollbar track

{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/darker/normal_bar_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [6, 0],
"blur": false
},
{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"layer0.texture": "Material Theme/assets/darker/normal_bar_horizontal.png",
"layer0.opacity": 1.0,
"layer0.inner_margin": [6, 0],
"blur": false
},

// Normal horizontal scrollbar track inside overlay panel

{
"class": "scroll_bar_control",
"attributes": ["horizontal"],
"parents": [{"class": "overlay_control"}],
"layer0.tint": [38, 50, 56, 0],
"layer0.opacity": 0.0,
"layer0.inner_margin": [0, 2],
"blur": false
},
// {
// "class": "scroll_bar_control",
// "attributes": ["horizontal"],
// "parents": [{"class": "overlay_control"}],
// "layer0.tint": [38, 50, 56, 0],
// "layer0.opacity": 0.0,
// "layer0.inner_margin": [0, 2],
// "blur": false
// },

// Scrollbars corner

Expand Down Expand Up @@ -151,4 +151,4 @@
"layer1.inner_margin": [8, 1, 8, 1],
"content_margin": [16, 6],
"blur": true
},
},
Loading

0 comments on commit 49a13f8

Please sign in to comment.