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

Commit 41f6d66

Browse files
committed
Merge branch 'master' of https://github.com/adobe/brackets into Code-folding-issue-12456
2 parents 07fca23 + 0858f84 commit 41f6d66

5 files changed

Lines changed: 63 additions & 53 deletions

File tree

src/styles/brackets.less

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ a, img {
220220

221221
#status-language {
222222
border-right: 1px solid @bc-panel-border;
223-
padding: 0px;
224-
margin: 0px;
223+
padding: 0;
224+
margin: 0;
225225

226226
.dark & {
227227
border-right: 1px solid @dark-bc-panel-separator;
@@ -347,10 +347,10 @@ a, img {
347347
.image-view {
348348
overflow: hidden;
349349
position: absolute;
350-
top: 0px;
351-
right: 0px;
352-
bottom: 0px;
353-
left: 0px;
350+
top: 0;
351+
right: 0;
352+
bottom: 0;
353+
left: 0;
354354
text-align: center;
355355
.image-centering {
356356
display: inline-block;
@@ -503,7 +503,7 @@ a, img {
503503
&-flipview-btn {
504504
position: relative;
505505
display: none;
506-
top: 0px;
506+
top: 0;
507507
padding-top: 2px;
508508
padding-right: 4px;
509509
padding-left: 4px;
@@ -840,6 +840,7 @@ a, img {
840840
-webkit-transform: translateZ(0); // forces GPU mode for better filter rendering on retina
841841
transform: translateZ(0); // future proofing
842842
-webkit-filter: drop-shadow(0 1px 0 rgba(0,0,0,0.36));
843+
filter: drop-shadow(0 1px 0 rgba(0,0,0,0.36));
843844
z-index: 1;
844845
}
845846

@@ -905,7 +906,7 @@ a, img {
905906

906907
.open-files-container {
907908
.box-flex(0);
908-
padding: 0px;
909+
padding: 0;
909910
max-height: 200px; // TODO (Issue #276): it would be nicer to have this be 50%, but that doesn't seem to work
910911

911912

@@ -1059,22 +1060,30 @@ a, img {
10591060
.jstree-brackets .jstree-no-dots .jstree-open > ins {
10601061
background-position: 7px -8px;
10611062
-webkit-transform: translateZ(0) rotate(90deg);
1062-
-webkit-transition: -webkit-transform 190ms cubic-bezier(.01, .91, 0, .99);
1063+
transform: translateZ(0) rotate(90deg);
1064+
transition: -webkit-transform 190ms cubic-bezier(.01, .91, 0, .99);
1065+
transition: transform 190ms cubic-bezier(.01, .91, 0, .99);
10631066
-webkit-filter: drop-shadow(1px 0 1px @bc-shadow);
1067+
filter: drop-shadow(1px 0 1px @bc-shadow);
10641068

10651069
.dark & {
1066-
-webkit-filter: drop-shadow(1px 0 1px @dark-bc-shadow);
1070+
-webkit-filter: drop-shadow(1px 0 1px @dark-bc-shadow);
1071+
filter: drop-shadow(1px 0 1px @dark-bc-shadow);
10671072
}
10681073
}
10691074

10701075
.jstree-brackets .jstree-no-dots .jstree-closed > ins {
10711076
background-position: 7px -8px;
10721077
-webkit-transform: translateZ(0); /* Need this to make sure that the svg isn't blurry on retina. */
1073-
-webkit-transition: -webkit-transform 90ms cubic-bezier(.01, .91, 0, .99);
1078+
transform: translateZ(0);
1079+
transition: -webkit-transform 90ms cubic-bezier(.01, .91, 0, .99);
1080+
transition: transform 90ms cubic-bezier(.01, .91, 0, .99);
10741081
-webkit-filter: drop-shadow(1px 0 1px @bc-shadow);
1082+
filter: drop-shadow(1px 0 1px @bc-shadow);
10751083

10761084
.dark & {
1077-
-webkit-filter: drop-shadow(1px 0 1px @dark-bc-shadow);
1085+
-webkit-filter: drop-shadow(1px 0 1px @dark-bc-shadow);
1086+
filter: drop-shadow(1px 0 1px @dark-bc-shadow);
10781087
}
10791088
}
10801089

@@ -1123,7 +1132,7 @@ a, img {
11231132
/* Styles for inline editors */
11241133

11251134
.inline-text-editor {
1126-
line-height: 0px;
1135+
line-height: 0;
11271136
}
11281137

11291138
.inline-widget {
@@ -1203,13 +1212,13 @@ a, img {
12031212
}
12041213

12051214
.shadow.top {
1206-
top: 0px;
1207-
background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0));
1215+
top: 0;
1216+
background-image: linear-gradient(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0));
12081217
}
12091218

12101219
.shadow.bottom {
1211-
bottom: 0px;
1212-
background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.1));
1220+
bottom: 0;
1221+
background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.1));
12131222
}
12141223

12151224
.CodeMirror-scroll {
@@ -1303,15 +1312,15 @@ a, img {
13031312

13041313
ul {
13051314
margin: 0;
1306-
padding: 10px 0px 10px 5px;
1315+
padding: 10px 0 10px 5px;
13071316
list-style: none;
13081317
}
13091318

13101319
li {
13111320
color: @bc-text-emphasized;
13121321
margin: 0;
13131322
overflow: hidden;
1314-
padding: 2px 0px 2px 15px;
1323+
padding: 2px 0 2px 15px;
13151324
text-overflow: ellipsis;
13161325
white-space: nowrap;
13171326

@@ -1469,6 +1478,7 @@ a, img {
14691478
// Unfortunately, the way jsTree sprites are aligned within their 18px boxes doesn't look good in
14701479
// other contexts, so we need some tweaks here instead of straight multiples of @jstree-sprite-size
14711480
-webkit-transform: translateZ(0) rotate(90deg);
1481+
transform: translateZ(0) rotate(90deg);
14721482
}
14731483
}
14741484

@@ -1486,7 +1496,9 @@ a, img {
14861496
padding: 5px 4px 4px 14px;
14871497

14881498
-webkit-transform: translate(0, 0); // Prefix still required.
1499+
transform: translate(0, 0);
14891500
transition: -webkit-transform 66ms cubic-bezier(0, 0.62, 0.04, 0.99);
1501+
transition: transform 66ms cubic-bezier(0, 0.62, 0.04, 0.99);
14901502
z-index: @z-index-brackets-modalbar;
14911503

14921504
.dark & {
@@ -1669,19 +1681,19 @@ a, img {
16691681
}
16701682
#replace-all.solo {
16711683
border-left: none;
1672-
margin-left: 0px;
1684+
margin-left: 0;
16731685
}
16741686

16751687
// Make find field snug with options buttons
16761688
// & replace snug with replace commands
16771689
#find-what, #replace-with {
1678-
margin-right: 0px;
1690+
margin-right: 0;
16791691
border-top-right-radius: 0;
16801692
border-bottom-right-radius: 0;
16811693
}
16821694
#find-case-sensitive, #replace-yes {
16831695
border-left: none;
1684-
margin-left: 0px;
1696+
margin-left: 0;
16851697
border-radius: 0;
16861698
}
16871699
}
@@ -2024,14 +2036,14 @@ textarea.exclusions-editor {
20242036
}
20252037

20262038
@-webkit-keyframes spinner-rotateplane {
2027-
0% { -webkit-transform: perspective(120px) }
2028-
50% { -webkit-transform: perspective(120px) rotateY(180deg) }
2029-
100% { -webkit-transform: perspective(120px) rotateY(180deg) rotateX(180deg) }
2039+
0% { -webkit-transform: perspective(120px); }
2040+
50% { -webkit-transform: perspective(120px) rotateY(180deg); }
2041+
100% { -webkit-transform: perspective(120px) rotateY(180deg) rotateX(180deg); }
20302042
}
20312043
@keyframes spinner-rotateplane {
2032-
0% { -webkit-transform: perspective(120px) rotateX(0deg) rotateY(0deg); transform: perspective(120px) rotateX(0deg) rotateY(0deg); }
2033-
50% { -webkit-transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg); transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg); }
2034-
100% { -webkit-transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg); transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg); }
2044+
0% { transform: perspective(120px) rotateX(0deg) rotateY(0deg); }
2045+
50% { transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg); }
2046+
100% { transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg); }
20352047
}
20362048

20372049

@@ -2153,7 +2165,7 @@ label input {
21532165
}
21542166
}
21552167
&.animateOpen {
2156-
-webkit-transition: -webkit-transform 125ms;
2168+
transition: -webkit-transform 125ms;
21572169
transition: transform 125ms;
21582170
-webkit-transform: scale(1);
21592171
transform: scale(1);
@@ -2162,7 +2174,7 @@ label input {
21622174
// Make the animation use the GPU--especially important for retina.
21632175
-webkit-transform: translateZ(0);
21642176
transform: translateZ(0);
2165-
-webkit-transition: opacity 500ms 5s ease-in, -webkit-transform 500ms 5s;
2177+
transition: opacity 500ms 5s ease-in, -webkit-transform 500ms 5s;
21662178
transition: opacity 500ms 5s ease-in, transform 500ms 5s;
21672179
opacity: 0.0;
21682180
}

src/styles/brackets_codemirror_override.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
padding: 0 @code-padding 0 0;
2727

2828
> * {
29-
text-indent: 0px;
29+
text-indent: 0;
3030
}
3131
}
3232

src/styles/brackets_mixins.less

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,10 @@
2424
/* Helpers for working with flex layouts */
2525
/* see: https://developer.mozilla.org/en-US/docs/Web/CSS/flex */
2626
.flex-box(@direction: row) {
27-
display: -webkit-flex;
28-
-webkit-flex-direction: @direction;
2927
display: flex;
3028
flex-direction: @direction;
3129
}
3230
.flex-item(@grow: 0, @shrink: 1, @basis: auto) {
33-
-webkit-flex: @grow @shrink @basis;
3431
flex: @grow @shrink @basis;
3532
}
3633

@@ -70,8 +67,6 @@
7067

7168
/* Helpful for percentage-sizing items that have border/padding */
7269
.sane-box-model {
73-
-webkit-box-sizing: border-box;
74-
-moz-box-sizing: border-box;
7570
box-sizing: border-box;
7671
}
7772

src/styles/brackets_patterns_override.less

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ a:focus {
7373
background: @project-panel-base-color;
7474
color: #bbb;
7575
letter-spacing: .01em;
76-
text-shadow: 0px 1px 2px @bc-shadow-large;
76+
text-shadow: 0 1px 2px @bc-shadow-large;
7777

7878
.dark & {
79-
text-shadow: 0px 1px 2px @dark-bc-shadow-large;
79+
text-shadow: 0 1px 2px @dark-bc-shadow-large;
8080
}
8181
}
8282

@@ -88,10 +88,10 @@ a:focus {
8888
z-index: @z-index-brackets-drag-ghost;
8989
background-color: transparent;
9090

91-
text-shadow: 0px 1px 2px @bc-shadow-large;
91+
text-shadow: 0 1px 2px @bc-shadow-large;
9292

9393
.dark & {
94-
text-shadow: 0px 1px 2px @dark-bc-shadow-large;
94+
text-shadow: 0 1px 2px @dark-bc-shadow-large;
9595
}
9696
}
9797

@@ -156,6 +156,7 @@ a:focus {
156156
max-height: 90vh;
157157
overflow-y: auto;
158158
-webkit-animation: none;
159+
animation: none;
159160
}
160161
}
161162
.title {
@@ -179,7 +180,7 @@ a:focus {
179180
box-sizing: border-box;
180181

181182
background: @main-toolbar-background-color;
182-
padding: 7px 0px;
183+
padding: 7px 0;
183184

184185
// Ensure icons are vertically stacked & horizontally centered
185186
.vbox;
@@ -199,7 +200,7 @@ a:focus {
199200
background-repeat: no-repeat;
200201
display: block;
201202
height: 24px;
202-
margin: 7px 0px 0px 3px;
203+
margin: 7px 0 0 3px;
203204
width: 24px;
204205
}
205206

@@ -259,8 +260,6 @@ a:focus {
259260

260261
white-space: nowrap;
261262
overflow: hidden;
262-
-ms-text-overflow: ellipsis;
263-
-o-text-overflow: ellipsis;
264263
text-overflow: ellipsis;
265264
}
266265

@@ -284,6 +283,7 @@ a:focus {
284283
.dropdown-menu {
285284
.animation(dropdown, 90ms, cubic-bezier(0, .97, .2, .99));
286285
-webkit-transform-origin: 0 0;
286+
transform-origin: 0 0;
287287
border: none;
288288
border-radius: @bc-border-radius;
289289

@@ -305,6 +305,7 @@ a:focus {
305305

306306
.codehint-menu.open .dropdown-menu {
307307
-webkit-animation: none;
308+
animation: none;
308309
}
309310

310311
.toolbar .nav, .context-menu, .codehint-menu {
@@ -373,6 +374,7 @@ a:focus {
373374
// This technique won't work on all browsers; see comments in #4593 for alternative options.
374375
width: -webkit-max-content;
375376
width: -moz-max-content;
377+
width: max-content;
376378

377379
background-color: @bc-menu-bg;
378380
.border-radius(0 0 3px 3px);
@@ -392,7 +394,7 @@ a:focus {
392394

393395
// Slightly less padding on left to account for checkmark.
394396
// More padding on top than bottom to center font within its bg highlight better.
395-
padding: 2px 10px 0px 6px;
397+
padding: 2px 10px 0 6px;
396398

397399
color: @bc-menu-text;
398400
text-shadow: none;
@@ -502,7 +504,7 @@ a:focus {
502504
a {
503505
// Less padding than on menus. More padding on top than bottom
504506
// to center font within its bg highlight better.
505-
padding: 2px 20px 0px 0px;
507+
padding: 2px 20px 0 0;
506508

507509
// Don't show highlighting on hover for code hints...
508510
&:hover {
@@ -571,8 +573,8 @@ a:focus {
571573
.btn-dropdown::after {
572574
content: "";
573575
display: block;
574-
height: 0px;
575-
width: 0px;
576+
height: 0;
577+
width: 0;
576578
position: absolute;
577579
right: 7px;
578580
top: 11px;
@@ -678,6 +680,7 @@ a:focus {
678680
/* Status bar language picker's DropdownButton */
679681
.dropdownbutton-popup.dropdown-status-bar {
680682
-webkit-transform-origin: 0 100%;
683+
transform-origin: 0 100%;
681684
height: auto;
682685
max-height: 80%;
683686

@@ -1525,7 +1528,7 @@ input[type="color"],
15251528
box-shadow: inset 0 1px @bc-highlight-hard;
15261529
-webkit-font-smoothing: antialiased;
15271530
text-shadow: none;
1528-
margin: 3px 0px 3px 3px;
1531+
margin: 3px 0 3px 3px;
15291532

15301533
.dark & {
15311534
background-color: @dark-bc-btn-bg;

src/styles/jsTreeTheme.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
.jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; }
3030
.jstree li { display:block; min-height:@li-min-height; line-height:16px; white-space:nowrap; margin-left:18px; min-width:18px; }
3131
.jstree-rtl li { margin-left:0; margin-right:18px; }
32-
.jstree > ul > li { margin-left:0px; }
33-
.jstree-rtl > ul > li { margin-right:0px; }
32+
.jstree > ul > li { margin-left:0; }
33+
.jstree-rtl > ul > li { margin-right:0; }
3434
.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; }
3535
.jstree a:focus { outline: none; }
3636
.jstree a > ins { height:16px; width:16px; }
@@ -169,11 +169,11 @@ ins.jstree-icon {
169169
}
170170

171171
#vakata-contextmenu.jstree-brackets-context,
172-
#vakata-contextmenu.jstree-brackets-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
172+
#vakata-contextmenu.jstree-brackets-context li ul { background:#f0f0f0; border:1px solid #979797; box-shadow: 1px 1px 2px #999; }
173173
#vakata-contextmenu.jstree-brackets-context li { }
174174
#vakata-contextmenu.jstree-brackets-context a { color:black; }
175175
#vakata-contextmenu.jstree-brackets-context a:hover,
176-
#vakata-contextmenu.jstree-brackets-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
176+
#vakata-contextmenu.jstree-brackets-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; border-radius:2px; }
177177
#vakata-contextmenu.jstree-brackets-context li.jstree-contextmenu-disabled a,
178178
#vakata-contextmenu.jstree-brackets-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
179179
#vakata-contextmenu.jstree-brackets-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }

0 commit comments

Comments
 (0)