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

Commit 26de829

Browse files
committed
Refactored sidebar quiet dark buttons because we have more than one now (plus Brackets Git extension can also benefit from this).
1 parent 140372a commit 26de829

6 files changed

Lines changed: 19 additions & 29 deletions

File tree

src/extensions/default/RecentProjects/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ define(function (require, exports, module) {
458458

459459
AppInit.htmlReady(function () {
460460
$("#project-title")
461-
.wrap("<div id='project-dropdown-toggle'></div>")
461+
.wrap("<div id='project-dropdown-toggle' class='btn-alt-quiet'></div>")
462462
.after("<span class='dropdown-arrow'></span>");
463463

464464
var cmenuAdapter = {

src/extensions/default/RecentProjects/styles/styles.css

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
#project-dropdown {
2-
border-radius: 3px;
3-
box-shadow: 0 3px 9px rgba(0, 0, 0, .3);
4-
border: none;
5-
}
61
.dropdown-arrow {
72
display: inline-block;
83
width: 7px;
@@ -30,7 +25,6 @@
3025
}
3126

3227
#project-dropdown-toggle {
33-
border: 1px solid transparent;
3428
display: inline-block;
3529
/* adjust margins to keep position #project-title position stable after extension is loaded */
3630
margin: -3px 0px -2px -6px;
@@ -45,21 +39,6 @@
4539
line-height: 21px;
4640
}
4741

48-
#project-dropdown-toggle:hover {
49-
border-radius: 3px;
50-
border: 1px solid #2d2f31;
51-
box-shadow: inset 0 1px 0 rgba(255,255,255,0.09);
52-
text-decoration: none;
53-
}
54-
55-
#project-dropdown-toggle:active {
56-
background: #404141;
57-
border-radius: 3px;
58-
border: 1px solid #2d2f31;
59-
box-shadow: inset 0 1px 1px rgba(0,0,0,0.23);
60-
text-decoration: none;
61-
}
62-
6342
#project-dropdown-toggle:hover .dropdown-arrow {
6443
background-image: url("down-arrow.svg");
6544
}

src/htmlContent/main-view.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<div class="main-view">
4343
<div id="sidebar" class="sidebar panel quiet-scrollbars horz-resizable right-resizer collapsible" data-minsize="0" data-forceleft=".content">
4444
<div id="working-set-header">{{WORKING_FILES}}
45-
<div id="working-set-option-btn"></div>
45+
<div id="working-set-option-btn" class="btn-alt-quiet"></div>
4646
</div>
4747
<div id="open-files-container">
4848
<!-- This will contain runtime-generated <li>'s for each file in the working set -->

src/styles/brackets.less

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -527,19 +527,13 @@ a, img {
527527
position: absolute;
528528
right: 4px;
529529
top: 7px;
530-
border: 1px solid transparent;
531530
padding: 4px 6px;
532531
.sprite-icon(0, 0, 13px, 13px, "images/topcoat-settings-13.svg");
533532
background-position:center;
534533
opacity: 0.8;
535534
}
536535

537536
#working-set-option-btn:hover {
538-
539-
border-radius: 3px;
540-
border: 1px solid #2d2f31;
541-
box-shadow: inset 0 1px 0 rgba(255,255,255,0.15);
542-
text-decoration: none;
543537
opacity: 1;
544538
}
545539

src/styles/brackets_colors.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,12 @@
8383
@tc-gray-component-focused-border: #2893ef;
8484
@tc-gray-component-error-border: #fa689d;
8585
@tc-gray-component-triangle: #878787;
86+
@tc-alt-component-border: #2d2f31;
8687

8788
@tc-button-background: #e5e9e9;
8889
@tc-button-highlight: inset 0 1px 0 #f3f3f3;
8990
@tc-button-down-background: #d3d7d7;
91+
@tc-button-alt-down-background: #404141;
9092
@tc-button-down-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
9193
@tc-inline-border-radius: 2px;
9294
@tc-control-border-radius: 3px;

src/styles/brackets_patterns_override.less

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,6 +1144,21 @@ input[type="color"],
11441144
}
11451145
}
11461146

1147+
.btn-alt-quiet {
1148+
border: 1px solid transparent;
1149+
border-radius: @tc-control-border-radius;
1150+
text-decoration: none;
1151+
&:hover {
1152+
border: 1px solid @tc-alt-component-border;
1153+
box-shadow: inset 0 1px 0 @tc-sidebar-selection-highlight;
1154+
}
1155+
&:active {
1156+
background: @tc-button-alt-down-background;
1157+
border: 1px solid @tc-alt-component-border;
1158+
box-shadow: @tc-call-to-action-down-shadow;
1159+
}
1160+
}
1161+
11471162
.btn-mini {
11481163
padding: 2px 6px;
11491164
font-size: 11px;

0 commit comments

Comments
 (0)