Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Fixed the border around the languages button and the scrollbar fillers #8521

Merged
merged 2 commits into from
Jul 23, 2014
Merged

Fixed the border around the languages button and the scrollbar fillers #8521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4acead6
Fixed the border around the languages button and the scrollbar fillers
TomMalbran Jul 22, 2014
af91ac1
Fixes line highlight when there are no line-number
TomMalbran Jul 23, 2014
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
2 changes: 1 addition & 1 deletion src/extensions/default/DarkTheme/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
.CodeMirror-focused .CodeMirror-activeline-background {
background: #2f2f2f;
}
.show-line-padding .CodeMirror-focused .CodeMirror-activeline-background {
&.show-line-padding .CodeMirror-focused .CodeMirror-activeline-background {
box-shadow: inset 15px 0 0 0 #000;
}

Expand Down
4 changes: 4 additions & 0 deletions src/styles/brackets.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ a, img {
vertical-align: top;
width: auto;
cursor: pointer;
border-radius: 0;
box-shadow: none;
text-shadow: none;

&:focus {
outline: 0;
}
Expand Down
5 changes: 5 additions & 0 deletions src/styles/brackets_theme_default.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@

/* Custom scrollbar colors */
&.platform-win {
.CodeMirror-scrollbar-filler,
.CodeMirror-gutter-filler {
background-color: rgb(15, 15, 15);
}
Expand All @@ -196,6 +197,10 @@
}

&.platform-linux {
.CodeMirror-scrollbar-filler,
.CodeMirror-gutter-filler {
background-color: #1d1f21;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it intentional that the linux and windows colors are different?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. The color for linux is the same as the background color. Without it, it is displayed using the light bg. It works in the same way in the light theme.

To test it in windows I just replace platform-linux with platform-win and comment the windows styles.

}
::-webkit-scrollbar-thumb {
box-shadow: 0 0 0 4px rgba(255, 255, 255, 0.24) inset;
}
Expand Down