Skip to content

chore: update css of project drop-down to accommodate git branch drop-down #1995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abose merged 2 commits into from
Dec 18, 2024
Merged

chore: update css of project drop-down to accommodate git branch drop-down #1995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f026a6
chore: update css of project dropdown to accomedate git branch dropdown
abose Dec 18, 2024
dfe4b67
chore: project dropdown location display change , rendering html and …
abose Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/extensionsIntegrated/RecentProjects/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,9 +548,7 @@ define(function (require, exports, module) {
});

AppInit.htmlReady(function () {
$("#project-title")
.wrap("<div id='project-dropdown-toggle' class='btn-alt-quiet'></div>")
.after("<span class='dropdown-arrow'></span>");
$("#project-dropdown-toggle .dropdown-arrow").removeClass("forced-hidden");

var cmenuAdapter = {
open: showDropdown,
Expand Down
5 changes: 4 additions & 1 deletion src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,10 @@
</div>
<div id="project-files-header">
<i id="project-operations-spinner" class="fa fa-spinner fa-spin forced-hidden"></i>
<span id="project-title" class="title"></span>
<div id='project-dropdown-toggle' class='btn-alt-quiet'>
<span id="project-title" class="title"></span>
<span class='dropdown-arrow forced-hidden'></span>
</div>
</div>
<div id="project-files-container">
<!-- This will contain a dynamically generated <ul> hierarchy at runtime -->
Expand Down
4 changes: 2 additions & 2 deletions src/phoenix/shell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// jshint ignore: start
/*eslint no-console: 0*/
/*eslint strict: ["error", "global"]*/
/*global Phoenix, fs*/
/*global fs, path*/


/** Setup phoenix shell components
Expand Down Expand Up @@ -334,7 +334,7 @@ Phoenix.app = {
if (fullVFSPath.startsWith(Phoenix.VFS.getMountDir())) {
return fullVFSPath.replace(Phoenix.VFS.getMountDir(), "");
}
return window.Strings.STORED_IN_YOUR_BROWSER;
return `${path.basename(fullVFSPath)} - ${window.Strings.STORED_IN_YOUR_BROWSER}`;
},
getDisplayPath: function (fullOrRelativeVFSPath) {
if(!fullOrRelativeVFSPath){
Expand Down
21 changes: 15 additions & 6 deletions src/styles/Extn-RecentProjects.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,27 @@
}

#project-dropdown-toggle {
display: inline-block;
display: flex;
/* adjust margins to keep position #project-title position stable after extension is loaded */
margin: -3px 5px -2px -6px;
overflow: hidden;
padding: 0 5px;
white-space: nowrap;
padding: 2px 5px;
margin-left: -5px;
.dropdown-arrow {
display: inline-block;
width: 7px;
height: 5px;
margin-left: 4px;
position: relative;
top: 7px;
}
}

#project-title {
/* vertical align center text */
height: 21px;
line-height: 21px;
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
flex: 1 1 0;
}

#project-dropdown-toggle:hover .dropdown-arrow {
Expand Down
6 changes: 4 additions & 2 deletions src/styles/brackets.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,10 +1325,11 @@ a, img {
display: flex;
align-items: center;
border-top: 1px solid rgba(255, 255, 255, 0.05);
padding: 8px 0 9px 12px;
padding: 6px 0 6px 12px;
font-size: 15px;
color: @project-panel-text-2;
overflow: hidden;
gap: .5em;

.btn-alt-quiet {
background-color: #47484b;
Expand All @@ -1340,7 +1341,8 @@ a, img {
}

#project-operations-spinner{
margin-right: 7px;
margin-right: 5px;
margin-top: 0;
}

.open-files-container {
Expand Down
4 changes: 2 additions & 2 deletions test/spec/LowLevelFileIO-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ define(function (require, exports, module) {
expect(brackets.app.getDisplayLocation("/mnt/apple")).toBe("apple");
expect(brackets.app.getDisplayLocation("/mnt/apple/x/")).toBe("apple/x/");
// filer paths
expect(brackets.app.getDisplayLocation("/x/apple")).toBe(Strings.STORED_IN_YOUR_BROWSER);
expect(brackets.app.getDisplayLocation("/y/apple/x/")).toBe(Strings.STORED_IN_YOUR_BROWSER);
expect(brackets.app.getDisplayLocation("/x/apple")).toBe("apple - "+ Strings.STORED_IN_YOUR_BROWSER);
expect(brackets.app.getDisplayLocation("/y/apple/x/")).toBe("x - " + Strings.STORED_IN_YOUR_BROWSER);
});

it("should getDisplayLocation return correct path in tauri", function () {
Expand Down
Loading