Skip to content

Commit 9629bbc

Browse files
committed
chore: move line:ch status to left of statusbar. move git icon out of statusbar
We decided to use bottom of right toolbar to toggle bottom panels. Icons on status bar was not preferred by users we surveyed. statusbar real estate was also less, so would have needed to hide icons or provided drop ups with confusing ux if we placed icons on statusbar. Changed colors of icons to match other toolbar icons. layout fixes for toolbar selected icons.
1 parent 2bda86a commit 9629bbc

File tree

8 files changed

+45
-35
lines changed

8 files changed

+45
-35
lines changed

src/editor/EditorStatusBar.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,5 @@ define(function (require, exports, module) {
630630
LanguageManager.on("languageAdded languageModified", _populateLanguageDropdown);
631631
_onActiveEditorChange(null, EditorManager.getActiveEditor(), null);
632632
StatusBar.show();
633-
$("#status-menu").attr("title", Strings.STATUSBAR_SHOW_PANELS);
634-
$(".git-status-icon").attr("title", Strings.STATUSBAR_SHOW_GIT);
635633
});
636634
});

src/index.html

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -860,14 +860,9 @@
860860
</div>
861861
<div id="status-bar" class="statusbar no-focus">
862862
<div id="status-phoenix">
863-
<div id="status-menu" class="forced-hidden">
864-
<i class="fa-solid fa-chevron-up"></i>
865-
</div>
866-
<div class="status-tab forced-hidden">
867-
<i class="fa-solid fa-terminal"></i>
868-
</div>
869-
<div class="status-tab forced-hidden git-status-icon">
870-
<i class="fa-solid fa-code-branch"></i>
863+
<div id="status-info" class="info" >
864+
<div id="status-cursor"></div>
865+
<div id="status-file"></div>
871866
</div>
872867
</div>
873868
<div id="status-indicators" class="indicators">
@@ -880,10 +875,6 @@
880875
<div id="status-language"></div>
881876
<div id="status-encoding"></div>
882877
<div id="status-overwrite"></div>
883-
<div id="status-info" class="info" >
884-
<div id="status-cursor"></div>
885-
<div id="status-file"></div>
886-
</div>
887878
<div id="status-tasks" class="forced-hidden global-indicator">
888879
<div class="spinner spin"></div>
889880
</div>

src/nls/root/strings.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,6 @@ define({
425425
"STATUSBAR_TASKS_PAUSE": "Pause",
426426
"STATUSBAR_TASKS_STOP": "Stop",
427427
"STATUSBAR_TASKS_RESTART": "Restart",
428-
"STATUSBAR_SHOW_PANELS": "Show Panels",
429-
"STATUSBAR_SHOW_GIT": "Git Panel",
430428

431429
// CodeInspection: errors/warnings
432430
"ERRORS_NO_FILE": "No File Open",

src/styles/brackets.less

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ a, img {
368368
/* dropdown button styling */
369369
.btn-status-bar {
370370
border: 0;
371-
background-color: inherit;
371+
background-color: unset;
372372
color: inherit;
373373
font: inherit;
374374
height: inherit;
@@ -406,23 +406,31 @@ a, img {
406406
border-right: 1px solid @bc-panel-border;
407407

408408
.dark & {
409-
border-left: unset;
410409
border-right: 1px solid @dark-bc-panel-separator;
411410
}
412411
float: left;
413-
padding: unset;
414-
width: 35px;
415412
text-align: center;
416413
}
414+
> div:hover{
415+
background-color: @bc-status-btn-hover;
416+
.dark & {
417+
background-color: @dark-bc-status-btn-hover;
418+
}
419+
cursor: pointer;
420+
}
421+
> div:only-child {
422+
border-right: unset;
423+
}
417424
}
418425

419-
420-
#status-menu:hover, .status-tab:hover{
421-
background-color: @bc-status-btn-hover;
422-
.dark & {
423-
background-color: @dark-bc-status-btn-hover;
426+
#status-indicators {
427+
> div:hover{
428+
background-color: @bc-status-btn-hover;
429+
.dark & {
430+
background-color: @dark-bc-status-btn-hover;
431+
}
432+
cursor: pointer;
424433
}
425-
cursor: pointer;
426434
}
427435

428436
#status-indent > * {
@@ -472,7 +480,6 @@ a, img {
472480
}
473481

474482
#status-overwrite {
475-
transition: background-color 3s;
476483
background-color: rgba(255, 255, 255, 0);
477484
color: @bc-text;
478485
cursor: pointer;
@@ -621,8 +628,24 @@ a, img {
621628
}
622629

623630
#status-overwrite.flash {
624-
transition: background-color 1s;
625-
background-color: rgb(120, 178, 242);
631+
animation: brightenFade 2s ease-in-out;
632+
}
633+
634+
@keyframes brightenFade {
635+
0% {
636+
background-color: transparent;
637+
}
638+
15% {
639+
background-color: rgb(120, 178, 242);
640+
color: black;
641+
}
642+
30% {
643+
background-color: rgb(120, 178, 242);
644+
color: black;
645+
}
646+
100% {
647+
background-color: transparent;
648+
}
626649
}
627650

628651

src/styles/brackets_core_ui_variables.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
@dark-bc-panel-bg-text-highlight: #000;
225225
@dark-bc-panel-border: #000;
226226
@dark-bc-panel-separator: #343434;
227-
@dark-bc-status-btn-hover: rgba(255, 255, 255, 0.05);
227+
@dark-bc-status-btn-hover: rgba(255, 255, 255, 0.04);
228228

229229
// Default Button
230230
@dark-bc-btn-bg: #3f3f3f;

src/styles/brackets_patterns_override.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ a:focus {
247247

248248
.selected-button{
249249
background-color: @plugin-panel-bg !important;
250-
margin-left: 2px !important;
251-
margin-right: 0px !important;
250+
margin-left: 3px !important;
251+
margin-right: 0 !important;
252252
}
253253

254254
.buttons,
@@ -325,7 +325,7 @@ a:focus {
325325
text-overflow: ellipsis;
326326
}
327327

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

331331
span, a {

src/styles/images/discuss-icon.svg

Lines changed: 1 addition & 1 deletion
Loading

src/styles/images/share-fill.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)