Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions src/editor/EditorStatusBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,5 @@ define(function (require, exports, module) {
LanguageManager.on("languageAdded languageModified", _populateLanguageDropdown);
_onActiveEditorChange(null, EditorManager.getActiveEditor(), null);
StatusBar.show();
$("#status-menu").attr("title", Strings.STATUSBAR_SHOW_PANELS);
$(".git-status-icon").attr("title", Strings.STATUSBAR_SHOW_GIT);
});
});
15 changes: 3 additions & 12 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -860,14 +860,9 @@
</div>
<div id="status-bar" class="statusbar no-focus">
<div id="status-phoenix">
<div id="status-menu" class="forced-hidden">
<i class="fa-solid fa-chevron-up"></i>
</div>
<div class="status-tab forced-hidden">
<i class="fa-solid fa-terminal"></i>
</div>
<div class="status-tab forced-hidden git-status-icon">
<i class="fa-solid fa-code-branch"></i>
<div id="status-info" class="info" >
<div id="status-cursor"></div>
<div id="status-file"></div>
</div>
</div>
<div id="status-indicators" class="indicators">
Expand All @@ -880,10 +875,6 @@
<div id="status-language"></div>
<div id="status-encoding"></div>
<div id="status-overwrite"></div>
<div id="status-info" class="info" >
<div id="status-cursor"></div>
<div id="status-file"></div>
</div>
<div id="status-tasks" class="forced-hidden global-indicator">
<div class="spinner spin"></div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions src/nls/root/strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,6 @@ define({
"STATUSBAR_TASKS_PAUSE": "Pause",
"STATUSBAR_TASKS_STOP": "Stop",
"STATUSBAR_TASKS_RESTART": "Restart",
"STATUSBAR_SHOW_PANELS": "Show Panels",
"STATUSBAR_SHOW_GIT": "Git Panel",

// CodeInspection: errors/warnings
"ERRORS_NO_FILE": "No File Open",
Expand Down
49 changes: 36 additions & 13 deletions src/styles/brackets.less
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ a, img {
/* dropdown button styling */
.btn-status-bar {
border: 0;
background-color: inherit;
background-color: unset;
color: inherit;
font: inherit;
height: inherit;
Expand Down Expand Up @@ -406,23 +406,31 @@ a, img {
border-right: 1px solid @bc-panel-border;

.dark & {
border-left: unset;
border-right: 1px solid @dark-bc-panel-separator;
}
float: left;
padding: unset;
width: 35px;
text-align: center;
}
> div:hover{
background-color: @bc-status-btn-hover;
.dark & {
background-color: @dark-bc-status-btn-hover;
}
cursor: pointer;
}
> div:only-child {
border-right: unset;
}
}


#status-menu:hover, .status-tab:hover{
background-color: @bc-status-btn-hover;
.dark & {
background-color: @dark-bc-status-btn-hover;
#status-indicators {
> div:hover{
background-color: @bc-status-btn-hover;
.dark & {
background-color: @dark-bc-status-btn-hover;
}
cursor: pointer;
}
cursor: pointer;
}

#status-indent > * {
Expand Down Expand Up @@ -472,7 +480,6 @@ a, img {
}

#status-overwrite {
transition: background-color 3s;
background-color: rgba(255, 255, 255, 0);
color: @bc-text;
cursor: pointer;
Expand Down Expand Up @@ -621,8 +628,24 @@ a, img {
}

#status-overwrite.flash {
transition: background-color 1s;
background-color: rgb(120, 178, 242);
animation: brightenFade 2s ease-in-out;
}

@keyframes brightenFade {
0% {
background-color: transparent;
}
15% {
background-color: rgb(120, 178, 242);
color: black;
}
30% {
background-color: rgb(120, 178, 242);
color: black;
}
100% {
background-color: transparent;
}
}


Expand Down
2 changes: 1 addition & 1 deletion src/styles/brackets_core_ui_variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
@dark-bc-panel-bg-text-highlight: #000;
@dark-bc-panel-border: #000;
@dark-bc-panel-separator: #343434;
@dark-bc-status-btn-hover: rgba(255, 255, 255, 0.05);
@dark-bc-status-btn-hover: rgba(255, 255, 255, 0.04);

// Default Button
@dark-bc-btn-bg: #3f3f3f;
Expand Down
6 changes: 3 additions & 3 deletions src/styles/brackets_patterns_override.less
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ a:focus {

.selected-button{
background-color: @plugin-panel-bg !important;
margin-left: 2px !important;
margin-right: 0px !important;
margin-left: 3px !important;
margin-right: 0 !important;
}

.buttons,
Expand Down Expand Up @@ -325,7 +325,7 @@ a:focus {
text-overflow: ellipsis;
}

.buttons {
.buttons, .bottom-buttons {
margin: @toolbar-top-gap-px 0 0 4px;

span, a {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/images/discuss-icon.svg
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 src/styles/images/share-fill.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading