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

Commit 01ca26c

Browse files
committed
Merge pull request #9560 from adobe/larz/v1-ui-audit
Brackets V1 UI Polish
2 parents 54edbd0 + ad5735a commit 01ca26c

6 files changed

Lines changed: 42 additions & 17 deletions

File tree

src/extensions/default/RecentProjects/styles/styles.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#project-dropdown-toggle {
4848
display: inline-block;
4949
/* adjust margins to keep position #project-title position stable after extension is loaded */
50-
margin: -3px 0px -2px -6px;
50+
margin: -3px 5px -2px -6px;
5151
overflow: hidden;
5252
padding: 0 5px;
5353
white-space: nowrap;

src/styles/brackets.less

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -323,19 +323,9 @@ a, img {
323323
position: relative;
324324

325325
/* Placeholder shown when there is no editor open */
326-
.not-editor {
327-
height: 100%;
328-
.vbox;
329-
.box-pack(center);
330-
.box-align(center);
331-
background: @bc-menu-bg url('images/no_content_bg.svg') no-repeat center 45%;
332-
333-
.dark & {
334-
background: @dark-bc-menu-bg url('images/no_content_bg_dark.svg') no-repeat center 45%;
335-
}
336-
}
337326

338327
.view-pane {
328+
opacity: 0.7; // quieten inactive pane
339329
display: block;
340330
margin: 0;
341331
overflow: hidden;
@@ -491,19 +481,19 @@ a, img {
491481
box-sizing: border-box;
492482
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
493483
padding: 5px 10px;
494-
color: @bc-text-thin-quiet;
495484
background-color: @background;
496485
white-space: nowrap;
497486
overflow: hidden;
498487
text-overflow: ellipsis;
499488

500489
.dark & {
501-
color: @dark-bc-text-quiet;
502490
background-color: #1d1f21; // not using a variable on purpose.
503491
border-bottom-color: rgba(255, 255, 255, 0.05);
504492
}
505493
}
506494
.active-pane {
495+
opacity: 1;
496+
507497
.pane-header {
508498
color: @bc-menu-text;
509499

@@ -514,6 +504,19 @@ a, img {
514504
}
515505
}
516506

507+
// moved this out of #editor-holder because we need to lower the specificity so theme authors can override the background color
508+
.not-editor {
509+
height: 100%;
510+
.vbox;
511+
.box-pack(center);
512+
.box-align(center);
513+
background: #f8f8f8 url('images/no_content_bg.svg') no-repeat center 45%;
514+
515+
.dark & {
516+
background: #1d1f21 url('images/no_content_bg_dark.svg') no-repeat center 45%;
517+
}
518+
}
519+
517520
// Split View Separator Styles
518521
.split-vertical #second-pane {
519522
border-left: 1px solid rgba(0, 0, 0, 0.17);
@@ -716,6 +719,12 @@ a, img {
716719
text-shadow: none;
717720
overflow: hidden;
718721

722+
> span {
723+
background: @bc-sidebar-bg;
724+
position: relative;
725+
z-index: 9;
726+
}
727+
719728
> div {
720729
background-color: @dark-bc-sidebar-bg;
721730
opacity: 1;
@@ -791,6 +800,14 @@ a, img {
791800
font-size: 13px;
792801
color: @project-panel-text-2;
793802
overflow: hidden;
803+
804+
.btn-alt-quiet {
805+
background-color: #47484b;
806+
807+
// relative positioning plus z-index make sure that the splitview button flows under the left aligned buttons in the project pane when there are no working set files
808+
position: relative;
809+
z-index: 9;
810+
}
794811
}
795812

796813
.open-files-container {

src/styles/brackets_patterns_override.less

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ a {
4343
}
4444

4545
a:hover {
46+
color: @bc-text-link;
4647
text-decoration: underline;
48+
49+
.dark & {
50+
color: @dark-bc-text-link;
51+
}
4752
}
4853

4954
a:focus {
@@ -281,6 +286,10 @@ a:focus {
281286
-webkit-transform-origin: 0 0;
282287
border: none;
283288
border-radius: @bc-border-radius;
289+
290+
.dark & {
291+
border: 1px solid rgba(255, 255, 255, 0.09) !important;
292+
}
284293
}
285294

286295
@-webkit-keyframes dropdown {
Lines changed: 0 additions & 1 deletion
Loading
Lines changed: 0 additions & 1 deletion
Loading

src/styles/jsTreeTheme.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ li.jstree-closed > ul { display:none; }
7373

7474
.jstree-brackets li {
7575
vertical-align: baseline;
76-
a {
76+
a,
77+
a:hover {
7778
color: @project-panel-text-1;
7879
font-size: 13px;
7980
cursor: default;

0 commit comments

Comments
 (0)