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

Commit b2468f6

Browse files
committed
Merge pull request #5921 from adobe/larz/modal-transition
UI Polish
2 parents 437b908 + da64651 commit b2468f6

20 files changed

Lines changed: 270 additions & 300 deletions

src/editor/InlineTextEditor.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ define(function (require, exports, module) {
244244
// dirty indicator, with file path stored on it
245245
var $dirtyIndicatorDiv = $("<div/>")
246246
.addClass("dirty-indicator")
247+
.html("&bull;")
247248
.width(0); // initialize indicator as hidden
248249
$dirtyIndicatorDiv.data("fullPath", doc.file.fullPath);
249250

src/extensions/default/InlineColorEditor/css/main.css

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
}
8181
.color-editor aside ul.swatches li:focus {
8282
outline: none;
83-
box-shadow: 0 0 0 2px #6fb5f1;
83+
box-shadow: 0 0 0 1px #94ceff;
8484
border-radius: 2px;
8585
}
8686
.color-editor aside ul.swatches li .swatch-bg {
@@ -148,7 +148,7 @@
148148
}
149149
.color-editor section .color-selection-field .selector-base:focus {
150150
outline: none;
151-
box-shadow: 0 0 0 5px #6fb5f1;
151+
box-shadow: 0 0 0 5px #94ceff;
152152
border-radius: 10px;
153153
}
154154
.color-editor section .color-selection-field .selector {
@@ -181,7 +181,7 @@
181181
}
182182
.color-editor section .slider .selector-base:focus {
183183
outline: none;
184-
box-shadow: 0 0 0 5px #6fb5f1;
184+
box-shadow: 0 0 0 5px #94ceff;
185185
border-radius: 1px;
186186
}
187187
.color-editor section .slider .selector {
@@ -210,7 +210,7 @@
210210
width: 118px;
211211
height: 23px;
212212
margin-right: 5px;
213-
border-color: #aaa;
213+
border-color: #b2b5b5;
214214
box-sizing: border-box;
215215
display: inline-block;
216216
color: #222;
@@ -219,8 +219,8 @@
219219
display: inline-block;
220220
height: 23px;
221221
padding: 0 0 0 4px;
222-
border: 1px solid #9c9e9e;
223-
box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.12);
222+
border: 1px solid #b2b5b5;
223+
box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
224224
background: #fff;
225225
font-family: "SourceSansPro";
226226
font-size: 12px;
@@ -232,8 +232,8 @@
232232
.color-editor section footer input:focus {
233233
background: #fff;
234234
outline: none;
235-
box-shadow: 0 0 0 2px #6fb5f1;
236-
border: 1px solid #0940fd;
235+
box-shadow: 0 0 0 1px #94ceff;
236+
border: 1px solid #2893ef;
237237
z-index: 911;
238238
}
239239
@media all and (-webkit-min-device-pixel-ratio : 2), (min-device-pixel-ratio : 2) {
@@ -284,21 +284,21 @@
284284
padding: 2px 4px 4px;
285285
height: 15px;
286286
font-size: 12px;
287-
text-shadow: 0 1px #fff;
287+
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.76);
288288
background-color: #e5e9e9;
289-
border: 1px solid #9c9e9e;
289+
border: 1px solid #b2b5b5;
290290
border-right: 1px solid transparent;
291291
margin-left: -3px;
292292

293-
box-shadow: inset 0 1px 0 #fff;
293+
box-shadow: inset 0 1px 0 #f3f3f3;
294294
}
295295

296296
.color-editor .button-bar a:focus, .color-editor .button-bar li.selected a:focus{
297297
outline: none;
298298
position: relative;
299-
border: 1px solid #0940fd;
300-
border-right: 1px solid #063dfa !important; /* we need this !important, sorry! */
301-
box-shadow: 0 0 0 2px #65aeed;
299+
border: 1px solid #2893ef;
300+
border-right: 1px solid #2893ef !important; /* we need this !important, sorry! */
301+
box-shadow: 0 0 0 1px #94ceff;
302302
z-index: 999;
303303
}
304304
.color-editor .button-bar li:first-child {
@@ -310,13 +310,13 @@
310310
border-bottom-left-radius: 3px;
311311
}
312312
.color-editor .button-bar li:last-child a {
313-
border-right: 1px solid #9c9e9e;
313+
border-right: 1px solid #b2b5b5;
314314
border-top-right-radius: 3px;
315315
border-bottom-right-radius: 3px;
316316
}
317317
.color-editor .button-bar li.selected a {
318318
background-color: #d3d7d7;
319-
box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.12);
319+
box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.06);
320320
background-image: none;
321321
}
322322
.color-editor .button-bar li.disabled a {

src/extensions/default/RecentProjects/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ define(function (require, exports, module) {
114114
* Create the "delete" button that shows up when you hover over a project.
115115
*/
116116
function renderDelete() {
117-
return $("<div id='recent-folder-delete' class='trash-icon'></div>")
117+
return $("<div id='recent-folder-delete' class='trash-icon'>&times;</div>")
118118
.mouseup(function (e) {
119119
// Don't let the click bubble upward.
120120
e.stopPropagation();
@@ -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/close-btn.svg

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 9 additions & 8 deletions
Loading

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

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
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;
8-
width: 5px;
9-
height: 10px;
3+
width: 7px;
4+
height: 5px;
105
margin-left: 4px;
116
background-image: url("down-arrow.svg");
7+
background-repeat: no-repeat;
128
position: relative;
13-
top: 1px;
9+
top: 0;
1410
}
1511

1612
.trash-icon {
1713
position: absolute;
1814
left: 7px;
1915
width: 16px;
2016
height: 16px;
21-
background-image: url("close-btn.svg");
22-
background-position: 0 0;
17+
font-size: 20px;
18+
color: rgba(0, 0, 0, 0.5);
19+
line-height: 15px;
20+
text-align: center;
2321
}
22+
2423
.trash-icon:hover {
25-
background-position: -15px 0;
24+
color: rgba(0, 0, 0, 1);
2625
}
2726

2827
#project-dropdown-toggle {
29-
border: 1px solid transparent;
3028
display: inline-block;
3129
/* adjust margins to keep position #project-title position stable after extension is loaded */
3230
margin: -3px 0px -2px -6px;
@@ -41,12 +39,6 @@
4139
line-height: 21px;
4240
}
4341

44-
#project-dropdown-toggle:hover {
45-
border-radius: 3px;
46-
border: 1px solid #2d2f31;
47-
box-shadow: inset 0 1px 0 rgba(255,255,255,0.15);
48-
text-decoration: none;
49-
}
5042
#project-dropdown-toggle:hover .dropdown-arrow {
5143
background-image: url("down-arrow.svg");
5244
}

src/htmlContent/extension-manager-dialog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<li><a href="#installed" class="installed" data-toggle="tab"><img src="styles/images/extension-manager-installed.svg"/><br/>{{Strings.EXTENSIONS_INSTALLED_TITLE}}</a><span class="notification"></span></li>
99
</ul>
1010
<div>
11-
<button class="search-clear"></button>
11+
<button class="search-clear">&times;</button>
1212
<input class="search" type="text" placeholder="{{EXTENSION_SEARCH_PLACEHOLDER}}">
1313
</div>
1414
</div>

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 -->

0 commit comments

Comments
 (0)