diff options
28 files changed, 508 insertions, 612 deletions
diff --git a/bundles/org.eclipse.orion.client.git/web/git/css/git.css b/bundles/org.eclipse.orion.client.git/web/git/css/git.css index c9af564..efa1ad5 100644 --- a/bundles/org.eclipse.orion.client.git/web/git/css/git.css +++ b/bundles/org.eclipse.orion.client.git/web/git/css/git.css @@ -21,7 +21,7 @@ height:25px; background-color: #f4f4f4; padding-top:5px; - border-top: 1px solid #cacaca; + border-top: 1px solid #f1f3f4; padding-bottom:4px; } @@ -32,7 +32,7 @@ .gitChangeListCompare { height: 420px; - border: 1px solid lightgray; + border: 1px solid #f1f3f4; margin-right: 10px; min-height: 50px; } @@ -76,15 +76,19 @@ .mainToolbar .sectionWrapper { margin-left: 0; - margin-right: 10px; - margin-top: 10px; + margin-right: 0; + margin-top: 0; width: auto; float: left; - background-color: #FFF; - border: 1px solid #DDD; + color: white; + background-color: #37474F; + border: none; border-radius: 4px; - padding-top: 2px; - padding-bottom: 2px; + padding-top: 0; + padding-bottom: 0; + flex: 0 0 auto; + -ms-flex: 0 0 auto; + -webkit-flex: 0 0 auto; } .mainToolbar .sectionWrapper.sectionOpened { @@ -106,30 +110,34 @@ min-width: 400px; z-index: 200; background-color: white; - border: 1px solid #aaa; + border: 1px solid #f1f3f4; } -.mainToolbar { - height: 50px; +.innerPanels { + margin: 20px; + width: calc(100% - 2px) } -.innerPanels { - top: 50px; +.fixedToolbarHolder { + width: calc(100% - 16px); + overflow: hidden; } .gitSectionLabel { float: left; font-weight: bold; text-transform: uppercase; - font-size: 12px; - padding-top: 19px; + font-size: 11px; padding-right: 6px; + padding-left: 20px; + color:white; + flex: 0 0 auto; + -ms-flex: 0 0 auto; + -webkit-flex: 0 0 auto; } .sidebar > .sectionWrapper { - margin-left: 15px; - margin-right:5px; - margin-top: 0; + margin: 0; flex: 0 0 auto; -ms-flex: 0 0 auto; -webkit-flex: 0 0 auto; @@ -140,9 +148,7 @@ } .sidebar > .sectionTable { - margin-left: 15px; - margin-right: 5px; - margin-bottom: 0; + margin: 0; background-color: #fcfcfc; flex: 1 0; -ms-flex: 1 0; @@ -170,7 +176,7 @@ margin-left: 10px; margin-right: 10px; position: absolute; - width: calc(100% - 42px); + width: calc(100% - 20px); z-index: 200; margin-top: -1px; background-color: white; @@ -211,7 +217,7 @@ margin-right: 5px; margin-left: 5px; background-color: white; - border-top: 1px solid #ddd; + border-top: 1px solid #f1f3f4; overflow-y: auto; } @@ -242,13 +248,14 @@ .mainToolbar #configSection { float: right; - padding: 2px; + padding: 4px; + padding-top: 0; + border: 1px solid transparent; height: 18px; } .mainToolbar #configSection:hover { - background-color: #e6e6e6; - border: 1px solid #ccc; + color: #C0E6FF; box-shadow: none; border-radius: 0; } @@ -317,7 +324,7 @@ table .sectionTable { } .sidebarWrapper > .sidebar { - height: calc(100% - 10px); + height: calc(100% - 0px); } .sidebarWrapper { @@ -395,9 +402,16 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ } .gitCommitInfoValue { - color: black; + color: #596876; +} + +.checkedRow .gitCommitInfoValue{ + color: white; } +.checkedRow{ + color:white !important; +} .tooltip .gitCommitInfoValue { color: white; } @@ -407,7 +421,7 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ } .gitCommitMessageSection { - background-color: #F3FAF5; + background-color: #e4eef7; } .gitCommitMessage .gitCommitMessageTopRow { @@ -418,7 +432,7 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ margin: 10px 10px 10px 4px; margin-bottom: 0; border-radius: 5px; - border: 1px solid #b2cfb9; + border: 1px solid #4CAAC6; } .gitCommitMessage .gitCommitMessageTopRow.invalidParam { @@ -468,8 +482,9 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ border: none; background: transparent; font-weight: bold; - margin-top: 10px; - color: #FF4500; + margin-top: 5px; + margin-right: 5px; + color: #ff3c6e; cursor: pointer; } @@ -496,7 +511,6 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ .sectionTitle { font-size: 12px; - color: #333; padding-bottom: 3px; } @@ -505,7 +519,7 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ } .gitCommitListSection { - background-color: #f4f4f4; + background-color: #f5f8fc; } #commitsNodeOutgoing .gitListCell, @@ -592,7 +606,11 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ .gitCommitTitle { font-weight: bold; padding-bottom: 5px; - color: #555; + color: #596876; +} + +.checkedRow .gitCommitTitle{ + color:white; } .gitCommitWarningBadge { @@ -624,11 +642,26 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ padding-right: 6px; margin-right: 10px; margin-top: 5px; - color:#637367; + color:#1D3649; +} + +.checkedRow .gitStatusIcon { + font-size: 30px; + float: left; + position: relative; + height: 30px; + vertical-align: text-top; + width: 30px; + padding: 2px; + padding-left: 6px; + padding-right: 6px; + margin-right: 10px; + margin-top: 5px; + color:white; } .gitStatusSection{ - background: #F3FAF5; + background: #E4EEF7; color:#8AA190; } @@ -636,9 +669,19 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ padding-left: 24px; } +.checkedRow .gitStatusTitle { + font-weight: bold; + color: white; + padding-bottom:5px; +} + +.checkedRow .stretch{ + color:white; +} + .gitStatusTitle { font-weight: bold; - color: #637367; + color: #1D3649; padding-bottom:5px; } @@ -680,7 +723,6 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ height: 30px; vertical-align: text-top; width: 30px; - border: 1px solid lightGrey; padding: 3px; margin-right: 10px; } @@ -733,7 +775,7 @@ _:-moz-tree-row(hover), .gitChangeListCheck { /* Firefox HACK */ height: 25px; padding-top: 5px; padding-bottom: 5px; - border-bottom: 1px solid #cacaca; + border-bottom: 1px solid #f1f3f4; } .sidebar .gitFilterBox { diff --git a/bundles/org.eclipse.orion.client.git/web/git/git-repository.js b/bundles/org.eclipse.orion.client.git/web/git/git-repository.js index ee39919..d8784d0 100644 --- a/bundles/org.eclipse.orion.client.git/web/git/git-repository.js +++ b/bundles/org.eclipse.orion.client.git/web/git/git-repository.js @@ -118,6 +118,11 @@ mBootstrap.startup().then(function(core) { // previously saved resource value var previousResourceValue = params.resource; + + /* For some reason, the page content scrolls to the left on IE11 even though overflow is set to hidden. */ + document.getElementById("pageContent").addEventListener("scroll", function(evt) { //$NON-NLS-1$ //$NON-NLS-0$ + evt.target.scrollLeft = evt.target.scrollTop = 0; + }); window.addEventListener("hashchange", function() { //$NON-NLS-0$ // make sure to close all parameter collectors diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/gitRepositoryExplorer.js b/bundles/org.eclipse.orion.client.git/web/orion/git/gitRepositoryExplorer.js index ec7e32f..f743435 100644 --- a/bundles/org.eclipse.orion.client.git/web/orion/git/gitRepositoryExplorer.js +++ b/bundles/org.eclipse.orion.client.git/web/orion/git/gitRepositoryExplorer.js @@ -435,12 +435,14 @@ define([ GitRepositoryExplorer.prototype.displayRepositories = function(location, mode, links) { this.destroyRepositories(); var parent = lib.node('pageToolbar'); //$NON-NLS-0$ + var sibling = lib.node('pageActions'); //$NON-NLS-0$ - this.repositoriesLabel = this.createLabel(parent, messages["Repository:"]); + this.repositoriesLabel = this.createLabel(parent, messages["Repository:"], sibling); var section = this.repositoriesSection = new mSection.Section(parent, { id: "repoSection", //$NON-NLS-0$ title: messages["Repo"], + sibling: sibling, // iconClass: ["gitImageSprite", "git-sprite-repository"], //$NON-NLS-1$ //$NON-NLS-0$ slideout: true, content: '<div id="repositoryNode" class="repoDropdownList"></div><div id="dropdownRepositoryActionsNode" class="sectionDropdownActions toolComposite"></div>', //$NON-NLS-0$ @@ -491,12 +493,14 @@ define([ GitRepositoryExplorer.prototype.displayBranches = function(repository) { this.destroyBranches(); var parent = lib.node('pageToolbar'); //$NON-NLS-0$ + var sibling = lib.node('pageActions'); //$NON-NLS-0$ - this.branchesLabel = this.createLabel(parent, messages["Reference:"]); + this.branchesLabel = this.createLabel(parent, messages["Reference:"], sibling); var section = this.branchesSection = new mSection.Section(parent, { id: "branchSection", //$NON-NLS-0$ title: this.previousBranchTitle || "\u00A0", //$NON-NLS-0$ + sibling: sibling, // iconClass: ["gitImageSprite", "git-sprite-branch"], //$NON-NLS-1$ //$NON-NLS-0$ slideout: true, content: '<div id="branchNode" class="branchDropdownList"></div><div id="dropdownBranchesActionsNode" class="sectionDropdownActions toolComposite"></div>', //$NON-NLS-0$ @@ -733,7 +737,7 @@ define([ GitRepositoryExplorer.prototype.displayConfig = function(repository, mode) { this.destroyConfig(); - var parent = lib.node('pageToolbar'); //$NON-NLS-0$ + var parent = lib.node('settingsActions'); //$NON-NLS-0$ var section = this.configSection = new mSection.Section(parent, { id: "configSection", //$NON-NLS-0$ diff --git a/bundles/org.eclipse.orion.client.help/web/help/help.css b/bundles/org.eclipse.orion.client.help/web/help/help.css index 4a74b9b..7ff4732 100644 --- a/bundles/org.eclipse.orion.client.help/web/help/help.css +++ b/bundles/org.eclipse.orion.client.help/web/help/help.css @@ -9,7 +9,7 @@ html,body { } .sidebarWrapper > .sidebar { - height: calc(100% - 10px); + height: calc(100% - 0px); width: calc(100% - 10px); left: 10px; } diff --git a/bundles/org.eclipse.orion.client.ui/web/css/controls.css b/bundles/org.eclipse.orion.client.ui/web/css/controls.css index 03ef32d..ce41b79 100644 --- a/bundles/org.eclipse.orion.client.ui/web/css/controls.css +++ b/bundles/org.eclipse.orion.client.ui/web/css/controls.css @@ -36,6 +36,23 @@ color: #F58B0F;
}
+/* ----- side panel ----- */
+
+#auxpane .navlinkonpage, .nav_fakelink {
+ text-decoration: none;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ color: inherit;
+}
+
+#auxpane .navlink {
+ display: inline-block;
+ padding: 2px;
+ color: inherit;
+ vertical-align: bottom;
+ line-height: 12px;
+}
+
.dragOver {
background: #ffffd8;
outline: #AAA 2px dotted !important;
@@ -60,8 +77,9 @@ }
.pageActions {
- min-height: 20px;
- margin-top: 8px;
+ flex: 0 0 auto;
+ -ms-flex: 0 0 auto;
+ -webkit-flex: 0 0 auto;
}
.runBar {
@@ -70,13 +88,18 @@ display: -webkit-inline-flex !important; /* Safari */
display: inline-flex !important;
height: 100%;
+ flex: 0 0 auto;
+ -ms-flex: 0 0 auto;
+ -webkit-flex: 0 0 auto;
}
/* 4px margin used by toolbar, plus 4px of border/padding */
.status {
- padding-top: 10px;
- color:#555;
+ color: white;
vertical-align: baseline;
+ flex: 0 0 auto;
+ -ms-flex: 0 0 auto;
+ -webkit-flex: 0 0 auto;
}
/* marker for finding section and main toolbars */
@@ -236,7 +259,6 @@ textarea.parameterInput { }
.selectableNavRow:hover {
- background-color: #cedce7;
}
.disabledNavRow > .navColumn > .mainNavColumn {
@@ -388,9 +410,7 @@ textarea.parameterInput { }
.slideParameters {
- border: 1px solid #bbb;
- background-color: lightgrey;
- border-radius: 5px;
+ background-color: #C0E6FF;
}
.mainToolbar .slideContainer {
@@ -464,10 +484,10 @@ textarea.parameterInput { .keyAssistFloat {
color: white;
display: none;
- background: rgba(51, 51, 51, 0.9);
+ background: rgba(55, 71, 79, 0.9);
position: fixed;
right: 44px;
- top: 75px;
+ top: 80px;
min-width: 250px;
padding: 5px;
z-index:100;
@@ -484,7 +504,7 @@ textarea.parameterInput { .keyAssistInput {
color: inherit;
- background: #333;
+ background: #263238;
width: 100%;
margin: 0;
padding-left: 0;
@@ -525,7 +545,7 @@ textarea.parameterInput { /*font-family: Monaco;*/
font-size: 10pt;
font-weight: bold;
- color: gold;
+ color: #efc100;
text-align: right;
padding: 3px;
border-top-right-radius: 4px;
@@ -693,6 +713,10 @@ textarea.parameterInput { background-color: white;
}
+#auxpane .treeIterationCursorRow {
+ background-color: #37474F;
+}
+
.treeIterationCursorRow_Dotted {
background-color: white;
}
@@ -917,7 +941,7 @@ textarea.parameterInput { }
.projectPrimaryNavColumn {
- color: #000;
+ color: white;
}
.projectNavColumn a{
@@ -958,10 +982,7 @@ textarea.parameterInput { margin-top: 0;
margin-left: 8%;
margin-right: 8%;
- border: 1px solid;
- border-bottom-left-radius: 3px;
- border-bottom-right-radius: 3px;
- border-color:#dadada;
+ border: 1px solid #f1f3f4;
-webkit-transition: all 0.1s ease, left 0;
transition: all 0.1s ease, left 0;
-webkit-transform-origin: top;
@@ -995,7 +1016,7 @@ textarea.parameterInput { padding: 6px;
color: gray;
margin-bottom: 0;
- border-color: #dadada;
+ border-color: #e3e7ea;
transition: all 0.1s ease;
}
@@ -1012,7 +1033,7 @@ textarea.parameterInput { }
.sectionTable td {
- border-bottom: 1px solid #dadada;
+ border-bottom: 1px solid #f1f3f4;
vertical-align: middle;
color: gray;
}
diff --git a/bundles/org.eclipse.orion.client.ui/web/css/images.css b/bundles/org.eclipse.orion.client.ui/web/css/images.css index 8010cb0..beba945 100644 --- a/bundles/org.eclipse.orion.client.ui/web/css/images.css +++ b/bundles/org.eclipse.orion.client.ui/web/css/images.css @@ -113,9 +113,8 @@ font-size: 16px; line-height: 14px; vertical-align: top; - color: #333333; font-family: 'Orion Icon Font'; - padding: 0; + padding: 3px; background: none; border: none; margin: 0; @@ -124,7 +123,7 @@ } .core-sprite-silhouette:hover { - color: #F58B0F; + color: #C0E6FF; } .core-sprite-addcontent{ @@ -152,12 +151,11 @@ } .core-sprite-wrench{ - font-size: 16px; + font-size: 14px; line-height:16px; vertical-align:middle; - color: #555555; font-family: 'Orion Icon Font'; - padding: 0; + padding: 2px; background: none; border: none; margin: 0; @@ -222,7 +220,6 @@ font-size: 16px; line-height: normal; vertical-align: bottom; - color: #777; font-family: 'Orion Icon Font'; padding: 0; background: none; @@ -234,7 +231,6 @@ .core-sprite-closedarrow{ font-size: 16px; - color: #777; line-height: normal; vertical-align: bottom; font-family: 'Orion Icon Font'; @@ -391,7 +387,7 @@ .file-sprite-css{ font-size: 16px; color: #555; - line-height: normal; + line-height: 16px; vertical-align: bottom; font-family: 'Orion Icon Font'; padding-right: 5px; @@ -693,14 +689,26 @@ -moz-osx-font-smoothing: grayscale; } + +.core-sprite-dashboard, +.core-sprite-runlogs, +.core-sprite-play, +.core-sprite-stop{ + font-size: 16px; + line-height: normal; + vertical-align:middle; + color: white; + font-family: 'Orion Icon Font'; + background: none; + border: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + .core-sprite-page, .core-sprite-horizontal, .core-sprite-vertical, .core-sprite-pip, -.core-sprite-dashboard, -.core-sprite-runlogs, -.core-sprite-play, -.core-sprite-stop, .core-sprite-open, .core-sprite-debug, .core-sprite-download, @@ -712,7 +720,6 @@ font-size: 16px; line-height: normal; vertical-align:middle; - color: #555; font-family: 'Orion Icon Font'; background: none; border: none; @@ -720,6 +727,15 @@ -moz-osx-font-smoothing: grayscale; } + +.core-sprite-page, +.core-sprite-horizontal, +.core-sprite-vertical, +.core-sprite-pip { + padding: 2px; + padding-top: 0; +} + .core-sprite-hamburger:before{ content:'\E000'; } .core-sprite-gear:before{ content:'\E001'; } .core-sprite-silhouette:before{ content:'\E003'; float: right;} diff --git a/bundles/org.eclipse.orion.client.ui/web/css/layout.css b/bundles/org.eclipse.orion.client.ui/web/css/layout.css index 3163a66..3762a51 100644 --- a/bundles/org.eclipse.orion.client.ui/web/css/layout.css +++ b/bundles/org.eclipse.orion.client.ui/web/css/layout.css @@ -26,7 +26,18 @@ hard-coded numbers elsewhere. /* $ToolbarHeight */
.toolbarLayout {
- height: 39px;
+ height: 50px;
+
+ display: -webkit-box;
+ display: -moz-box;
+ display: -ms-flexbox;
+ display: -webkit-flex;
+ display: flex;
+ flex-direction: row;
+ -ms-flex-direction: row;
+ -webkit-flex-direction: row;
+ -webkit-align-items: center; /* Safari */
+ align-items: center;
}
/*
@@ -136,11 +147,12 @@ hard-coded numbers elsewhere. clear: both;
overflow: hidden;
position: absolute;
- top: 37px;
+ top: 0;
/* bottom: 36px; $FooterHeight + footer border (1px) */
bottom: 0;
- left: 0;
+ left: 50px;
right: 0;
+ background: #37474F;
/*margin-bottom: 29px;*/
}
@@ -153,6 +165,10 @@ hard-coded numbers elsewhere. bottom: 0;
}
+.content-sideMenu-closed {
+ left: 0;
+}
+
.content-fluid {
}
@@ -185,6 +201,12 @@ hard-coded numbers elsewhere. margin: 0;
}
+.layoutFlexStretch {
+ flex: 1 1;
+ -ms-flex: 1 1;
+ -webkit-flex: 1 1;
+}
+
.spacingLeft {
margin-left: 5px;
}
@@ -298,19 +320,19 @@ hard-coded numbers elsewhere. position: relative;
left: 0;
top: 0;
- height: calc(100% - 38px);
+ height: calc(100% - 29px);
overflow-x: visible;
}
.projectNavSidebarWrapper > .sidebar {
- height: calc(100% - 4px);
+ height: calc(100% - 0px);
}
.workingTarget {
position: absolute;
top: 0;
width: 100%;
- bottom: 10px;
+ bottom: 0;
overflow-y: auto;
margin-right: 2px;
background: #FFF;
@@ -318,25 +340,23 @@ hard-coded numbers elsewhere. .toolbarTarget {
position: absolute;
- top: 36px; /* $ToolbarHeight + 2 */
+ top: 50px; /* $ToolbarHeight + 2 */
width: 100%;
- bottom: 10px;
overflow-y: auto;
}
.toolbarTarget-toolbarHidden {
- top: 2px; /* 2 */
+ top: 0;
}
.pageLayoutTarget {
position: absolute;
- width: calc( 100% - 35px );
- bottom: 10px;
+ width: calc( 100% - 60px );
+ bottom: 0;
overflow-y: auto;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.33); /* 0 0 0 1px #d1d1d1,0 0 4px 1px #ccc; */
- margin-left: 2px;
- margin-right: 10px;
- margin-left:10px;
+ margin: 20px;
+ margin-right: 0;
padding-top: 10px;
padding-bottom: 5px;
background: white;
@@ -362,21 +382,22 @@ hard-coded numbers elsewhere. .editorViewerHeader {
display:flex;
+ background: #37474F;
flex-direction:row;
align-items:center;
- line-height:24px;
- border-bottom: 1px solid #dedede;
+ line-height:26px;
+ border-bottom: 1px solid #263238;
}
.editorViewerHeaderTitle {
padding-left: 5px;
- color: #555;
+ color: white;
}
.editorViewerContent {
position: absolute;
width: 100%;
- top: 25px;
+ top: 27px;
bottom: 0;
overflow: auto
}
@@ -401,7 +422,7 @@ hard-coded numbers elsewhere. left: 33%; /* override this value if you want a different proportion of the two split panes */
height: 100%;
z-index: 51;
- width: 3px;
+ width: 1px;
cursor: e-resize;
visibility: hidden; /* use visibility vs. display because we need a position in calculations */
}
@@ -414,8 +435,8 @@ hard-coded numbers elsewhere. position: absolute;
top: 33%; /* override this value if you want a different proportion of the two split panes */
width: 100%;
- z-index: 5;
- height: 3px;
+ z-index: 51;
+ height: 1px;
cursor: n-resize;
visibility: hidden; /* use visibility vs. display because we need a position in calculations */
}
@@ -456,45 +477,49 @@ and (max-device-width : 1024px) { .splitThumbLeftLayout {
position: absolute;
left: 100%;
- height: 3em;
- width: 200%;
- top: calc(50% - 1.5em);
+ height: 4em;
+ width: 4px;
+ top: calc(50% - 2em);
+ margin-left: -1px;
cursor: pointer;
- border-top-right-radius: 5px;
- border-bottom-right-radius: 5px;
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
}
.splitThumbRightLayout {
position: absolute;
right: 100%;
- height: 3em;
- width: 200%;
- top: calc(50% - 1.5em);
+ height: 4em;
+ width: 4px;
+ top: calc(50% - 2em);
+ margin-right: -1px;
cursor: pointer;
- border-top-left-radius: 5px;
- border-bottom-left-radius: 5px;
+ border-top-left-radius: 3px;
+ border-bottom-left-radius: 3px;
}
.splitVerticalThumbUpLayout {
position: absolute;
top: 100%;
- width: 3em;
- height: 200%;
- left: calc(50% - 1.5em);
+ width: 4em;
+ height: 4px;
+ left: calc(50% - 2em);
+ margin-top: -1px;
cursor: pointer;
- border-bottom-left-radius: 5px;
- border-bottom-right-radius: 5px;
+ border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 3px;
}
.splitVerticalThumbDownLayout {
position: absolute;
- top: -200%;
- width: 3em;
- height: 200%;
- left: calc(50% - 1.5em);
+ bottom: 100%;
+ width: 4em;
+ height: 4px;
+ left: calc(50% - 2em);
+ margin-bottom: -1px;
cursor: pointer;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
}
.splitLayoutAnimation {
@@ -551,11 +576,11 @@ and (max-device-width : 1024px) { /* ----- side menu begin ----- */
.sideMenu{
- width: 0;
- background: #4a4a4a;
+ width: 50px;
+ background: #263238;
float: left;
position: absolute;
- top: 36px;
+ top: 0;
/* bottom: 36px; $FooterHeight + footer border (1px) */
bottom: 0;
/*z-index: 0;*/
@@ -583,9 +608,19 @@ and (max-device-width : 1024px) { bottom: 0;
}
+.sideMenu-closed {
+ width: 0;
+ display: none;
+}
+
+.sideMenuHome{
+ width: 100%;
+ height: 50px;
+}
+
.sideMenuList{
display:inline-block !important;
- height: calc(100% - 4px);
+ height: calc(100% - 64px);
margin: 0;
overflow-y: hidden;
padding: 0;
@@ -594,11 +629,10 @@ and (max-device-width : 1024px) { }
.sideMenuItem{
- border-bottom: 1px solid #444;
- border-top: 1px solid transparent;
list-style-type: none;
font-size:16px !important;
padding: 0;
+ margin: 3px;
}
.sideMenuItem:hover, .sideMenuItem.expanded {
@@ -633,11 +667,12 @@ and (max-device-width : 1024px) { .sideMenuBottomScrollButton {
bottom: 0;
+ left: 0;
}
/* icon links */
.sideMenuItem > .submenu-trigger {
- color: #bbb !important;
+ color: #5a7c99 !important;
text-decoration:none !important;
width: 100%;
display: inline-block;
@@ -645,13 +680,10 @@ and (max-device-width : 1024px) { }
.sideMenuItem>.submenu-trigger:hover, .sideMenuItem.expanded>.submenu-trigger{
text-decoration:none;
- color:white !important;
+ color:#C0E6FF !important;
}
.sideMenuItemActive {
- background: radial-gradient(circle 20px, #3a3a3a, #333);
- border-top: 1px solid #555;
- border-bottom: 1px solid #666;
}
.sideMenuItemActive > .submenu-trigger {
@@ -797,88 +829,9 @@ and (max-device-width : 1024px) { .innerPanels{
position:absolute;
width:100%;
- top:40px;
+ top:50px;
bottom:0;
}
.userMenu {
- align-items: center;
- color: #ccc;
- line-height: 16px;
- display: flex;
- justify-content: flex-end;
-
- -webkit-align-items: center; /* Safari */
- display: -webkit-flex; /* Safari */
- -webkit-justify-content: flex-end; /* Safari */
-}
-
-.userMenu > .userTrigger {
- margin-top: -4px;
- padding: 13px 11px;
- border-left: 1px solid #ddd !important;
-}
-
-.userMenu > .dropdownMenuOpen {
- top: 36px;
-}
-
-/* Split View Menu */
-
-.splitMenuBox{
- display: flex;
- align-items: flex-start;
- flex-direction: column;
- z-index: 100;
- margin-left: 10px;
- margin-top: 7px;
- width:0;
-}
-
-.splitMenuSelectionTable{
- display: flex;
- align-items: flex-start;
- flex-direction: column;
- background: white;
- border: 1px solid #eee;
- margin: 1px;
- margin-top:2px;
- visibility:collapse;
- box-shadow: 2px 2px 5px 3px rgba(0, 0, 0, 0.2);
- z-index:1000;
-}
-
-.splitMenuSelectionItem{
- display: flex;
- flex-direction: row;
- align-items: baseline;
- padding-top: 2px;
- flex-grow: 1;
- flex-shrink: 0;
- flex-basis: auto;
- width: 100%;
-}
-
-.splitMenuSelectionItem:hover{
- cursor: pointer;
- background: #FEEFDE;
-}
-
-.splitMenuState{
- height: 16px;
- width: 16px;
- margin-right: 5px;
- margin-left: 5px;
- color: #3B4B54 !important;
-}
-
-.splitMenuDescription{
- margin-left:5px;
- color:#3B4B54;
- margin-right: 10px;
- padding-bottom:3px;
-}
-
-.chosen{
- cursor:pointer;
}
diff --git a/bundles/org.eclipse.orion.client.ui/web/css/pages.css b/bundles/org.eclipse.orion.client.ui/web/css/pages.css index 07d390c..510540c 100644 --- a/bundles/org.eclipse.orion.client.ui/web/css/pages.css +++ b/bundles/org.eclipse.orion.client.ui/web/css/pages.css @@ -9,8 +9,10 @@ html { html, body {
margin: 0;
padding: 0;
- font: 9pt Arial,Helvetica,Myriad,Tahoma,clean,sans-serif, Lucida Sans Unicode,Lucida Grande,Verdana;
+ font: 9pt Helvetica, Arial, Myriad,Tahoma,clean,sans-serif, Lucida Sans Unicode,Lucida Grande,Verdana;
min-width:700px;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
}
h2 {
@@ -38,9 +40,9 @@ input { -moz-user-select: text;
text-indent: 0;
text-shadow: none;
- border: solid 1px #bbb;
+ border: 1px solid #f1f3f4;
color: #333;
- font-size: 9pt;
+ font-size: 8pt;
padding: 2px;
margin-left: 5px;
}
diff --git a/bundles/org.eclipse.orion.client.ui/web/css/progress.css b/bundles/org.eclipse.orion.client.ui/web/css/progress.css index 2d65d86..8f98f5e 100644 --- a/bundles/org.eclipse.orion.client.ui/web/css/progress.css +++ b/bundles/org.eclipse.orion.client.ui/web/css/progress.css @@ -18,22 +18,20 @@ }
.progressWarning {
- color: #c09853 !important;
- background-color: #fcf8e3 !important;
- border: 1px solid #fbeed5 !important;
+ color: #3C3200 !important;
+ background-color: #FDE876 !important;
}
.progressError {
- color: #b94a48 !important;
- background-color: #f2dede !important;
- border: 1px solid #eed3d7 !important;
+ color: #E71D32 !important;
+ background-color: #FFD2DD !important;
}
.progressNormal {
- color: #468847 !important;
- background-color: #dff0d8 !important;
- border: 1px solid #d6e9c6 !important;
+ color: #144D14 !important;
+ background-color: #B4E051 !important;
}
+
.progressPane {
vertical-align: middle;
margin-right: 24px;
@@ -53,11 +51,15 @@ height: 16px;
background: transparent;
border: none;
- margin-right: 10px;
+ margin-right: 6px;
+ margin-left: 12px;
+ flex: 0 0 auto;
+ -ms-flex: 0 0 auto;
+ -webkit-flex: 0 0 auto;
}
.watchButton {
- border-top: 1px solid #ddd;
+ border-top: 1px solid #515a5f;
position: absolute;
top: 0;
width: 3px;
@@ -74,7 +76,7 @@ width: calc(100% - 5px); /* subtract borders and button height */
height: calc(100% - 5px); /* subtract borders, button height and space between button and body */
background: transparent;
- border: 1px solid #ddd;
+ border: 1px solid #515a5f;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
border-radius: 50%;
@@ -102,7 +104,7 @@ display: block;
border-radius: 40%;
height: 5px;
- background: #ddd;
+ background: #515a5f;
transition: background-color 1s ease;
}
@@ -121,7 +123,7 @@ border-radius: 40%;
right: 0;
width: 4px;
- background: #ddd;
+ background: #515a5f;
transition: background-color 1s ease;
}
@@ -152,20 +154,20 @@ }
.progressWatch.running .watchButton {
- border-color: #333333;
+ border-color: white;
top: 1px;
}
.progressWatch.running .watchBody {
- border-color: #333333;
+ border-color: white;
}
.progressWatch.running .watchBody .hand.longHour > .darkSide {
- background-color: #333333;
+ background-color: white;
}
.progressWatch.running .watchBody .hand.longMinute > .darkSide {
- background-color: #333333;
+ background-color: white;
}
/* warning */
@@ -257,8 +259,8 @@ }
.notificationShow {
- color: #468847;
- background-color: #dff0d8;
+ color: #144D14;
+ background-color: #B4E051;
top: 0;
position: fixed;
float: left;
@@ -274,8 +276,7 @@ z-index: 100;
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
- border: 1px solid #dff0d8;
- border-top:none;
+ border:none;
transition:top 0.7s;
-webkit-transition: top 0.7s;
-moz-transition: top 0.7s;
diff --git a/bundles/org.eclipse.orion.client.ui/web/css/theme.css b/bundles/org.eclipse.orion.client.ui/web/css/theme.css index a169aec..07861a5 100644 --- a/bundles/org.eclipse.orion.client.ui/web/css/theme.css +++ b/bundles/org.eclipse.orion.client.ui/web/css/theme.css @@ -22,8 +22,9 @@ display: flex; white-space: nowrap; border-bottom: 1px solid #ddd; - height: 36px; + height: 0; padding: 0; + display: none; } @@ -81,7 +82,7 @@ a:hover { /* Row selection */ .checkedRow { - background-color: #cedce7 !important; /* was e3e3e3 */ + background-color: #4CAAC6 !important; /* was e3e3e3 */ } .checkedRow.disabledRow { @@ -93,7 +94,7 @@ a:hover { } .navRow.checkedRow > td:first-child { - border-left-color: #7fa4c0; + border-left-color: #d57152; } .navbar-item-selected { @@ -198,13 +199,14 @@ a.breadcrumb.currentLocation { .auxpane { border: 0; - background: #eeeeee; + background: #37474F; + color: white; } .mainpane { border: 0; - background: #eee !important; - padding-right:15px; + background: #37474F !important; + padding-right:20px; } .editorTheme .mainpane{ @@ -214,14 +216,12 @@ a.breadcrumb.currentLocation { } .mainToolbar { - background: #eeeeee; + background: #263238; padding-left: 2px; padding-right: 5px; /* border-bottom: 1px solid #ebebeb; */ /* padding-left:50px; */ white-space: nowrap; - border-bottom: 1px solid #DDD; - min-width: 1000px; } /* Filesystem switcher toolbar */ @@ -248,7 +248,7 @@ a.breadcrumb.currentLocation { -webkit-user-select: none; -ms-user-select: none; user-select: none; - color:#555; + color:white; } .filesystemSwitcher { @@ -319,20 +319,29 @@ a.breadcrumb.currentLocation { } .commandButton.orionButton.dropdownTrigger:hover { - border-color: #ccc; + border-color: #C0E6FF; +} + +.mainToolbar .commandButton.orionButton.dropdownTrigger { + color:white; +} + +.mainToolbar .commandImage { + color:white; } .commandButton { - color: #222; - border: 1px solid #dedede; - background-color: #ddd; - border-radius: 2px; - vertical-align:middle; + color: #1D3649; + border: 1px solid #C0E6FF; + background-color: #C0E6FF; + border-radius: 2px; + vertical-align: middle; } .commandButton:hover, .commandButton:focus { - background-color: #eee; - box-shadow: 0 1px 2px 0 rgba(0,0,0,0.2); + background-color: #7CC7FF; + border: 1px solid #7CC7FF; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2); } .commandButton.disabled { @@ -362,8 +371,7 @@ a.breadcrumb.currentLocation { } .commandImage:hover, .commandImage:focus { - background-color: #e6e6e6; - border: 1px solid #ccc; + color: #C0E6FF; } /* push toggle */ @@ -539,15 +547,15 @@ a.breadcrumb.currentLocation { /* widget theming */ /* splitter - typically the color of the title area */ .split { - background: #efefef; + background: #263238; } .splitTracking { - background: #dedede; + background: #37474F; } .splitThumb { - background: #ccc; + background: #37474F; } /* dropdowns */ @@ -558,7 +566,6 @@ a.breadcrumb.currentLocation { display: inline-block; vertical-align: top; line-height: 12px; - color: #555; } .dropdownArrowRight { @@ -640,6 +647,8 @@ a.breadcrumb.currentLocation { } .dropdownMenuItem, .dropdownMenuItem a { + align-items: center; + -webkit-align-items: center; /* Safari */ align-content: stretch; -webkit-align-content: stretch; /* Safari */ display: inline-flex; @@ -658,9 +667,10 @@ a.breadcrumb.currentLocation { border-left: 6px solid transparent; } + .dropdownMenu .dropdownMenuItemSelected { - background-color: #FEEFDE; - border-left-color: #F58B0F; + background-color: #4CAAC6; + color: #FFF !important; } .dropdownMenuItem .check { @@ -694,6 +704,7 @@ a.breadcrumb.currentLocation { * specificity correctly for all users. */ background-color: white !important; + color: #555 !important; border: 1px solid #bbbbbb !important; border-bottom: none !important; border-bottom-left-radius: 0 !important; @@ -723,7 +734,7 @@ a.breadcrumb.currentLocation { } .tooltip { color: #fafafa; - background-color: #555; + background-color: #325C80; border-radius: 3px; padding: 8px; clear: both; @@ -753,7 +764,7 @@ a.breadcrumb.currentLocation { position: absolute; display: inline-block; border: 8px solid; - border-color: transparent transparent transparent #555; + border-color: transparent transparent transparent #325C80; top: 4px; content: ''; z-index: 201; @@ -763,7 +774,7 @@ a.breadcrumb.currentLocation { position: absolute; display: inline-block; border: 10px solid; - border-color: transparent transparent transparent #555; + border-color: transparent transparent transparent #325C80; top: 2px; right: -17px; content: ''; @@ -773,7 +784,7 @@ a.breadcrumb.currentLocation { position: absolute; display: inline-block; border: 8px solid; - border-color: transparent #555 transparent transparent; + border-color: transparent #325C80 transparent transparent; left: -15px; top: 4px; content: ''; @@ -784,7 +795,7 @@ a.breadcrumb.currentLocation { position: absolute; display: inline-block; border: 10px solid; - border-color: transparent #555 transparent transparent; + border-color: transparent #325C80 transparent transparent; left: -17px; top: 2px; content: ''; @@ -794,7 +805,7 @@ a.breadcrumb.currentLocation { position: absolute; display: block; border: 8px solid; - border-color: transparent transparent #555 transparent; + border-color: transparent transparent #325C80 transparent; left: 16px; top: -15px; content: ''; @@ -805,7 +816,7 @@ a.breadcrumb.currentLocation { position: absolute; display: block; border: 10px solid; - border-color: transparent transparent #555 transparent; + border-color: transparent transparent #325C80 transparent; left: 14px; top: -17px; content: ''; @@ -815,7 +826,7 @@ a.breadcrumb.currentLocation { position: absolute; display: block; border: 8px solid; - border-color: #555 transparent transparent; + border-color: #325C80 transparent transparent; left: 16px; content: ''; bottom: -15px; @@ -826,7 +837,7 @@ a.breadcrumb.currentLocation { position: absolute; display: block; border: 10px solid; - border-color: #555 transparent transparent; + border-color: #325C80 transparent transparent; left: 14px; bottom: -17px; content: ''; @@ -859,7 +870,7 @@ a.breadcrumb.currentLocation { .dialogTitle { padding-top: 5px; display: inline-block; - background: #555; + background: #264A60; width: 100%; padding-bottom: 5px; border-top-left-radius: 1px; diff --git a/bundles/org.eclipse.orion.client.ui/web/edit/setup.js b/bundles/org.eclipse.orion.client.ui/web/edit/setup.js index e55039b..b447e3e 100644 --- a/bundles/org.eclipse.orion.client.ui/web/edit/setup.js +++ b/bundles/org.eclipse.orion.client.ui/web/edit/setup.js @@ -47,20 +47,24 @@ define([ 'orion/Deferred', 'orion/projectClient', 'orion/webui/splitter', - 'orion/webui/SplitMenu', 'orion/webui/tooltip' ], function( messages, Sidebar, mInputManager, mCommands, mGlobalCommands, mTextModel, mUndoStack, mFolderView, mEditorView, mPluginEditorView , mMarkdownView, mMarkdownEditor, mCommandRegistry, mContentTypes, mFileClient, mFileCommands, mEditorCommands, mSelection, mStatus, mProgress, mOperationsClient, mOutliner, mDialogs, mExtensionCommands, ProjectCommands, mSearchClient, - EventTarget, URITemplate, i18nUtil, PageUtil, objects, lib, Deferred, mProjectClient, mSplitter, mSplitMenu, mTooltip + EventTarget, URITemplate, i18nUtil, PageUtil, objects, lib, Deferred, mProjectClient, mSplitter, mTooltip ) { var exports = {}; var enableSplitEditor = false; +var MODE_SINGLE = 0; +var MODE_VERTICAL = 1; +var MODE_HORIZONTAL = 2; +var MODE_PIP = 3; + var uriTemplate = new URITemplate("#{,resource,params*}"); //$NON-NLS-0$ function MenuBar(options) { @@ -381,8 +385,8 @@ objects.mixin(EditorViewer.prototype, { } } }.bind(this)); - this.selection.addEventListener("selectionChanged", function(event) { //$NON-NLS-0$ - inputManager.setInput(event.selection); + this.selection.addEventListener("selectionChanged", function(evt) { //$NON-NLS-0$ + inputManager.setInput(evt.selection); }); }, @@ -680,7 +684,7 @@ objects.mixin(EditorSetup.prototype, { //TODO create as many splitters as necessary given the number of editors viewers. // Note that depending on the number of viewers it may be necessary to create intermediate parents if (this.editorSplitter) return; - if (mode === this.splitMenu.MODE_SINGLE) return; + if (mode === MODE_SINGLE) return; var splitterDiv = document.createElement("div"); //$NON-NLS-0$ splitterDiv.id = "editorSplitter"; //$NON-NLS-0$ @@ -847,7 +851,7 @@ objects.mixin(EditorSetup.prototype, { if (this.splitterMode === mode) return; this.splitterMode = mode; - if (mode !== this.splitMenu.MODE_SINGLE && this.editorViewers.length < 2) { + if (mode !== MODE_SINGLE && this.editorViewers.length < 2) { this.editorViewers.push(this.createEditorViewer(this.editorViewers.length + "")); //$NON-NLS-0$ } this.createSplitters(mode); @@ -870,12 +874,12 @@ objects.mixin(EditorSetup.prototype, { switch(mode){ - case this.splitMenu.MODE_PIP: + case MODE_PIP: splitterNode.style.display = "none"; //$NON-NLS-0$ splitEditorViewerNode.classList.add("editorViewerPicInPic"); //$NON-NLS-0$ break; - case this.splitMenu.MODE_SINGLE: + case MODE_SINGLE: if (splitterNode) { splitterNode.style.display = "none"; //$NON-NLS-0$ } @@ -885,11 +889,11 @@ objects.mixin(EditorSetup.prototype, { this.setActiveEditorViewer(this.editorViewers[0]); break; - case this.splitMenu.MODE_HORIZONTAL: + case MODE_HORIZONTAL: this.editorSplitter.setOrientation(mSplitter.ORIENTATION_VERTICAL, true); break; - case this.splitMenu.MODE_VERTICAL: + case MODE_VERTICAL: this.editorSplitter.setOrientation(mSplitter.ORIENTATION_HORIZONTAL, true); break; } @@ -898,40 +902,49 @@ objects.mixin(EditorSetup.prototype, { viewer.editorView.editor.resize(); }); - if (oldSplitterMode === this.splitMenu.MODE_SINGLE && mode !== this.splitMenu.MODE_SINGLE) { + if (oldSplitterMode === MODE_SINGLE && mode !== MODE_SINGLE) { this.lastTarget = null; this.editorViewers[1].inputManager.setInput(PageUtil.hash()); } }, - _createSplitCommand: function(label){ - var id = "orion.edit.showPip" + label; //$NON-NLS-0$ - var splitCommand = new mCommands.Command({ - name: label, - tooltip: label, - id: id, //$NON-NLS-0$ + createSplitMenu: function() { + var that = this; + var currentChoice; + var toolbar = "settingsActions"; + var changeSplitModeCommand; + function callback() { + this.checked = true; + currentChoice.checked = false; + currentChoice = this; + changeSplitModeCommand.imageClass = this.imageClass; + changeSplitModeCommand.name = this.name; + that.setSplitterMode(this.mode); + that.commandRegistry.destroy(toolbar); + that.commandRegistry.renderCommands(toolbar, toolbar, that, that, "button"); //$NON-NLS-0$ + } + var choices = [ + {name: messages["SplitSinglePage"], mode: MODE_SINGLE, imageClass: "core-sprite-page", checked: true, callback: callback}, //$NON-NLS-0$ + {name: messages["SplitVertical"], mode: MODE_VERTICAL, imageClass: "core-sprite-vertical", callback: callback}, //$NON-NLS-0$ + {name: messages["SplitHorizontal"], mode: MODE_HORIZONTAL, imageClass: "core-sprite-horizontal", callback: callback}, //$NON-NLS-0$ + {name: messages["SplitPipInPip"], mode: MODE_PIP, imageClass: "core-sprite-pip", callback: callback}, //$NON-NLS-0$ + ]; + currentChoice = choices[0]; + changeSplitModeCommand = new mCommands.Command({ + imageClass: currentChoice.imageClass, + selectionClass: "dropdownSelection", //$NON-NLS-0$ + name: currentChoice.name, + tooltip: messages["SplitModeTooltip"], + id: "orion.edit.splitmode", //$NON-NLS-0$ visibleWhen: function() { return true; }, - callback: function(data) { - var mode = data.command.tooltip; - this.setSplitterMode(mode); - }.bind(this) + choiceCallback: function() { + return choices; + } }); - - this.commandRegistry.addCommand(splitCommand); - return splitCommand; - }, - createSplitMenu: function(){ - - var splitMenu = this.splitMenu = new mSplitMenu( 'SplitMenu' ); //$NON-NLS-0$ - - var modes = splitMenu.modes; - - for( var mode in modes ){ - var command = this._createSplitCommand( modes[mode].mode ); - splitMenu.addMenuItem( command ); - } - }, + this.commandRegistry.addCommand(changeSplitModeCommand); + this.commandRegistry.registerCommandContribution(toolbar, "orion.edit.splitmode", 0); //$NON-NLS-1$ //$NON-NLS-0$ + } }); exports.setUpEditor = function(serviceRegistry, pluginRegistry, preferences, readonly) { @@ -945,7 +958,7 @@ exports.setUpEditor = function(serviceRegistry, pluginRegistry, preferences, rea setup.setActiveEditorViewer(setup.editorViewers[0]); if (enableSplitEditor) { setup.createSplitMenu(); - setup.setSplitterMode(setup.splitMenu.MODE_SINGLE); + setup.setSplitterMode(MODE_SINGLE); } setup.load(); }); diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/banner/banner.html b/bundles/org.eclipse.orion.client.ui/web/orion/banner/banner.html index b486da3..3879f18 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/banner/banner.html +++ b/bundles/org.eclipse.orion.client.ui/web/orion/banner/banner.html @@ -7,7 +7,6 @@ <!-- Left banner component: hamburger --> <nav id="primaryNav" class="bannerLeftArea" style="z-index:2;" role="navigation"> - <button class="centralNavigation commandSprite core-sprite-hamburger" type="button"id="centralNavigation"></button> </nav> <!-- Middle banner component: Breadcrumb bar --> @@ -17,30 +16,6 @@ <!-- Right banner component: user identity --> <div class="bannerRightArea"> - <!-- Global commands support. --> - <div id="globalActions" class="spacingLeft layoutLeft"></div> - - <!-- Search. TODO delete this --> - <input type="text" id="search" autocomplete="off" class="layoutLeft spacingLeft searchbox" role="search" style="display:none;"> - <div id="searchOptions" class="layoutLeft" style="padding-top:1px;display:none;"></div> - - <!-- User identity menu and Progress --> - <div id="userMenu" class="userMenu"> - <div id="progressPane" class="progressWatch" tabindex="0" role="progressbar"> - <div id="watchButton" class="watchButton"></div> - <div id="watchBody" class="watchBody"> - <span class="hand longMinute"> - <span class="darkSide"></span> - </span> - <span class="hand longHour"> - <span class="darkSide"></span> - </span> - </div> - </div> - <span id="userTrigger" tabindex="0" role="button" class="dropdownTrigger userTrigger"> - </span> - <ul id="userDropdown" class="dropdownMenu" role="menu"></ul> - </div> </div> </div> diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html b/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html index 71ca29e..0b1bf77 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html +++ b/bundles/org.eclipse.orion.client.ui/web/orion/banner/toolbar.html @@ -1,9 +1,29 @@ <div class="layoutLeft runBar"></div> -<div class="layoutLeft" id="SplitMenu"></div> +<ul class="layoutLeft commandList pageActions" id="globalActions"></ul> <ul class="layoutLeft commandList pageActions" id="pageActions"></ul> <ul class="layoutLeft commandList pageActions" id="selectionTools"></ul> <ul class="layoutLeft commandList pageActions" id="navActions"></ul> <div class="layoutLeft" style="padding-left:7px;padding-right:7px;margin-top:2px;" id="filterBox" style="visibility: hidden;"></div> -<ul class="layoutRight commandList pageActions" id="settingsActions"></ul> +<div class="layoutFlexStretch"></div> <div class="layoutRight status" id="statusPane" role="status" aria-live="off"></div> +<div class="layoutRight progressWatch" id="progressPane" tabindex="0" role="progressbar"> + <div id="watchButton" class="watchButton"></div> + <div id="watchBody" class="watchBody"> + <span class="hand longMinute"> + <span class="darkSide"></span> + </span> + <span class="hand longHour"> + <span class="darkSide"></span> + </span> + </div> +</div> <ul class="layoutRight commandList pageActions" id="pageNavigationActions"></ul> +<ul class="layoutRight commandList pageActions" id="settingsActions"></ul> +<ul class="layoutRight commandList pageActions userMenu" id="userMenu"> + <li> + <button id="userTrigger" class="dropdownTrigger commandImage"/> + <span class="commandSprite core-sprite-silhouette"></span> + </button> + <ul id="userDropdown" class="dropdownMenu" role="menu"></ul> + </li> +</ul> diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js b/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js index 01fd37b..89b46ce 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js @@ -1080,7 +1080,7 @@ define([ var tooltipText, hasDefault = defaultInvocation && defaultInvocation.command && (defaultInvocation.command.tooltip || defaultInvocation.command.name); if (hasDefault) { tooltipText = defaultInvocation.command.tooltip || defaultInvocation.command.name; - } else if (hasDefault) { + } else { tooltipText = tooltip; } if (tooltipText) { diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/commands.js b/bundles/org.eclipse.orion.client.ui/web/orion/commands.js index 2ad4240..5d0fb3a 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/commands.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/commands.js @@ -629,22 +629,25 @@ define([ check.appendChild(document.createTextNode(choice.checked ? "\u25CF" : "")); //$NON-NLS-1$ //$NON-NLS-0$ node.appendChild(check); } + if (choice.imageClass) { + var image = document.createElement("span"); //$NON-NLS-0$ + image.classList.add(choice.imageClass); + node.appendChild(image); + } + var span = document.createElement("span"); //$NON-NLS-0$ var text = document.createTextNode(choice.name); - node.appendChild(text); + span.appendChild(text); + node.appendChild(span); itemNode.appendChild(node); node.choice = choice; node.addEventListener("click", function(event) { //$NON-NLS-0$ - if (event.target.choice) { - mMetrics.logEvent("command", "invoke", this.id + ">" + event.target.choice.name); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$ - event.target.choice.callback.call(event.target.choice, items); - } + mMetrics.logEvent("command", "invoke", this.id + ">" + choice.name); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$ + choice.callback.call(choice, items); }.bind(this), false); node.addEventListener("keydown", function(event) { //$NON-NLS-0$ if (event.keyCode === lib.KEY.ENTER || event.keyCode === lib.KEY.SPACE) { - if (event.target.choice) { - mMetrics.logEvent("command", "invoke", this.id + ">" + event.target.choice.name); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-0$ - event.target.choice.callback.call(event.target.choice, items); - } + mMetrics.logEvent("command", "invoke", this.id + ">" + choice.name); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-0$ + choice.callback.call(choice, items); } }.bind(this), false); } else { // anything not named is a separator diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/edit/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/edit/nls/root/messages.js index 6227acd..7320492 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/edit/nls/root/messages.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/edit/nls/root/messages.js @@ -42,6 +42,11 @@ define({//Default message bundle "running": "Running ${0}", //$NON-NLS-1$ //$NON-NLS-0$
"Saving..." : "Saving...", //$NON-NLS-1$ //$NON-NLS-0$
"View": "View", //$NON-NLS-1$ //$NON-NLS-0$
+ "SplitSinglePage": "Single Page", //$NON-NLS-1$ //$NON-NLS-0$
+ "SplitVertical": "Split Vertical", //$NON-NLS-1$ //$NON-NLS-0$
+ "SplitHorizontal": "Split Horizontal", //$NON-NLS-1$ //$NON-NLS-0$
+ "SplitPipInPip": "Picture in Picture", //$NON-NLS-1$ //$NON-NLS-0$
+ "SplitModeTooltip": "Change split editor mode", //$NON-NLS-1$ //$NON-NLS-0$
"SidePanel": "Side Panel", //$NON-NLS-1$ //$NON-NLS-0$
"SidePanelTooltip": "Choose what to show in the side panel.", //$NON-NLS-1$ //$NON-NLS-0$
"Slideout": "Slideout", //$NON-NLS-1$ //$NON-NLS-0$
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js index 31d5e32..a3f4117 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js @@ -39,7 +39,8 @@ define([ } var dropdownNode = lib.node("userDropdown"); //$NON-NLS-0$ var userDropdown = new mDropdown.Dropdown({ - dropdown: dropdownNode + dropdown: dropdownNode, + selectionClass: "dropdownSelection" //$NON-NLS-0$ }); var menuGenerator = new mUserMenu.UserMenu({ dropdownNode: dropdownNode, @@ -57,11 +58,6 @@ define([ /* * To add user name call: setUserName(serviceRegistry, dropdownTrigger); */ - - var userTrigger = document.getElementById('userTrigger'); - userTrigger.classList.add("imageSprite"); - userTrigger.classList.add("core-sprite-silhouette"); - menuGenerator.setKeyAssist(keyAssistFunction); return menuGenerator; @@ -80,15 +76,16 @@ define([ generateNavigationMenu: mCustomGlobalCommands.generateNavigationMenu || function (parentId, serviceRegistry, commandRegistry, prefsService, searcher, handler, /* optional */ editor) { var sideMenuParent = lib.node("sideMenu"); //$NON-NLS-0$ if (sideMenuParent) { - var nav = lib.node('centralNavigation'); //$NON-NLS-0$ - new mTooltip.Tooltip({ - node: nav, - text: messages["CentralNavTooltip"], //$NON-NLS-0$ - position: ["right"] //$NON-NLS-0$ - }); - this.sideMenu = new SideMenu(sideMenuParent, lib.node("pageContent")); //$NON-NLS-0$ - nav.addEventListener("click", this.sideMenu.toggle.bind(this.sideMenu)); //$NON-NLS-0$ + var nav = lib.node('centralNavigation'); //$NON-NLS-0$ + if (nav) { + new mTooltip.Tooltip({ + node: nav, + text: messages["CentralNavTooltip"], //$NON-NLS-0$ + position: ["right"] //$NON-NLS-0$ + }); + nav.addEventListener("click", this.sideMenu.toggle.bind(this.sideMenu)); //$NON-NLS-0$ + } var sideMenuToggle = lib.node("sideMenuToggle"); //$NON-NLS-0$ if (sideMenuToggle) { @@ -429,6 +426,18 @@ define([ window.document.title = title; customGlobalCommands.afterSetPageTarget.apply(this, arguments); var locationNode = options.breadCrumbContainer ? lib.node(options.breadCrumbContainer) : lib.node("location"); //$NON-NLS-0$ + var fileClient = options.fileService || (serviceRegistry && new mFileClient.FileClient(serviceRegistry)); + var resource = options.breadcrumbTarget || options.target; + var workspaceRootURL = (fileClient && resource && resource.Location) ? fileClient.fileServiceRootURL(resource.Location) : null; + var breadcrumbOptions = { + container: locationNode, + resource: resource, + rootSegmentName: breadcrumbRootName, + workspaceRootSegmentName: fileSystemRootName, + workspaceRootURL: workspaceRootURL, + makeFinalHref: options.makeBreadcrumFinalLink, + makeHref: options.makeBreadcrumbLink + }; if (locationNode) { lib.empty(locationNode); if (currentBreadcrumb) { @@ -440,32 +449,20 @@ define([ rootSegmentName: breadcrumbRootName }); } else { - var fileClient = options.fileService || (serviceRegistry && new mFileClient.FileClient(serviceRegistry)); - var resource = options.breadcrumbTarget || options.target; - var workspaceRootURL = (fileClient && resource && resource.Location) ? fileClient.fileServiceRootURL(resource.Location) : null; - var breadcrumbOptions = { - container: locationNode, - resource: resource, - rootSegmentName: breadcrumbRootName, - workspaceRootSegmentName: fileSystemRootName, - workspaceRootURL: workspaceRootURL, - makeFinalHref: options.makeBreadcrumFinalLink, - makeHref: options.makeBreadcrumbLink - }; currentBreadcrumb = new mBreadcrumbs.BreadCrumbs(breadcrumbOptions); - - // If the viewer has a node for breadcrumbs replace it as well - var viewer = options.viewer; - if (viewer && viewer.localBreadcrumbNode) { - if (viewer.currentBreadcrumb) { - viewer.currentBreadcrumb.destroy(); - } - breadcrumbOptions.id = "headerBreadcrumb" + viewer.id; - breadcrumbOptions.container = viewer.localBreadcrumbNode; - viewer.currentBreadcrumb = new mBreadcrumbs.BreadCrumbs(breadcrumbOptions); - } } } + + // If the viewer has a node for breadcrumbs replace it as well + var viewer = options.viewer; + if (viewer && viewer.localBreadcrumbNode) { + if (viewer.currentBreadcrumb) { + viewer.currentBreadcrumb.destroy(); + } + breadcrumbOptions.id = "headerBreadcrumb" + viewer.id; + breadcrumbOptions.container = viewer.localBreadcrumbNode; + viewer.currentBreadcrumb = new mBreadcrumbs.BreadCrumbs(breadcrumbOptions); + } } function boundingNode(node) { @@ -610,8 +607,6 @@ define([ var home = lib.node("home"); //$NON-NLS-0$ home.href = require.toUrl("edit/edit.html"); //$NON-NLS-0$ home.setAttribute("aria-label", messages['Orion Home']); //$NON-NLS-1$ //$NON-NLS-0$ - var progressPane = lib.node("progressPane"); //$NON-NLS-0$ - progressPane.src = mCommands.NO_IMAGE; var toolbar = lib.node("pageToolbar"); //$NON-NLS-0$ if (toolbar) { @@ -847,4 +842,4 @@ define([ setDirtyIndicator: setDirtyIndicator, setPageCommandExclusions: setPageCommandExclusions }; -});
\ No newline at end of file +}); diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/section.js b/bundles/org.eclipse.orion.client.ui/web/orion/section.js index 025c0a9..e29c407 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/section.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/section.js @@ -208,6 +208,8 @@ define(['orion/EventTarget', 'orion/webui/littlelib', 'orion/commonHTMLFragments this._contentParent.role = "region"; //$NON-NLS-0$ this._contentParent.classList.add("sectionTable"); //$NON-NLS-0$ this._contentParent.setAttribute("aria-labelledby", this.titleNode.id); //$NON-NLS-0$ + // initially style as hidden until we determine what needs to happen + this._collapse(); if (options.sibling) { parent.insertBefore(this._contentParent, options.sibling); } else { @@ -222,8 +224,6 @@ define(['orion/EventTarget', 'orion/webui/littlelib', 'orion/commonHTMLFragments this._onExpandCollapse = options.onExpandCollapse; } this._preferenceService = options.preferenceService; - // initially style as hidden until we determine what needs to happen - this._collapse(); if (!options.dropdown) { // should we consult a preference? if (this._preferenceService) { diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/webui/SideMenu.js b/bundles/org.eclipse.orion.client.ui/web/orion/webui/SideMenu.js index 7c75782..fc59555 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/webui/SideMenu.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/webui/SideMenu.js @@ -15,7 +15,6 @@ define(['orion/webui/littlelib', 'orion/PageUtil', 'orion/URL-shim'], function(l var OPEN_STATE = "open"; var CLOSED_STATE = "closed"; var DEFAULT_STATE = OPEN_STATE; - var SIDE_MENU_OPEN_WIDTH = "50px"; var TRANSITION_DURATION_MS = 301; /* this should always be greater than the duration of the left transition of .content-fixedHeight */ function SideMenu(parentNode, contentNode) { @@ -109,7 +108,11 @@ define(['orion/webui/littlelib', 'orion/PageUtil', 'orion/URL-shim'], function(l return true; } }, this); - + + var sideMenuHome = document.createElement("div"); //$NON-NLS-0$ + sideMenuHome.classList.add("sideMenuHome"); //$NON-NLS-0$ + this._sideMenuHome = sideMenuHome; + var sideMenuList = document.createElement("ul"); //$NON-NLS-0$ sideMenuList.classList.add("sideMenuList"); //$NON-NLS-0$ this._sideMenuList = sideMenuList; @@ -185,6 +188,7 @@ define(['orion/webui/littlelib', 'orion/PageUtil', 'orion/URL-shim'], function(l this._updateCategoryAnchors(); this._show = function() { + this._parentNode.appendChild(sideMenuHome); this._parentNode.appendChild(this._topScrollButton); this._parentNode.appendChild(sideMenuList); this._parentNode.appendChild(this._bottomScrollButton); @@ -201,13 +205,13 @@ define(['orion/webui/littlelib', 'orion/PageUtil', 'orion/URL-shim'], function(l } if (this._state === CLOSED_STATE) { - this._contentNode.style.left = "0"; //$NON-NLS-0$ + this._contentNode.classList.add("content-sideMenu-closed"); //$NON-NLS-0$ if (this._renderTimeout) { window.clearTimeout(this._renderTimeout); this._renderTimeout = null; } this._renderTimeout = window.setTimeout(function() { - this._parentNode.style.display = 'none'; //$NON-NLS-0$ + this._parentNode.classList.add("sideMenu-closed"); //$NON-NLS-0$ this._renderTimeout = null; }.bind(this), TRANSITION_DURATION_MS); this._parentNode.classList.add("animating"); //$NON-NLS-0$ @@ -217,9 +221,8 @@ define(['orion/webui/littlelib', 'orion/PageUtil', 'orion/URL-shim'], function(l this._renderTimeout = null; } this._parentNode.classList.remove("animating"); //$NON-NLS-0$ - this._parentNode.style.display = 'block'; //$NON-NLS-0$ - this._parentNode.style.width = SIDE_MENU_OPEN_WIDTH; - this._contentNode.style.left = SIDE_MENU_OPEN_WIDTH; + this._parentNode.classList.remove("sideMenu-closed"); //$NON-NLS-0$ + this._contentNode.classList.remove("content-sideMenu-closed"); //$NON-NLS-0$ } }, _updateScrollButtonVisibility: function() { @@ -255,7 +258,8 @@ define(['orion/webui/littlelib', 'orion/PageUtil', 'orion/URL-shim'], function(l }, hide: function() { localStorage.setItem(LOCAL_STORAGE_NAME, CLOSED_STATE); - this._contentNode.style.left = "0"; //$NON-NLS-0$ + this._parentNode.classList.add("sideMenu-closed"); //$NON-NLS-0$ + this._contentNode.classList.add("content-sideMenu-closed"); //$NON-NLS-0$ }, toggle: function() { // add animation if necessary diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/webui/Slideout.css b/bundles/org.eclipse.orion.client.ui/web/orion/webui/Slideout.css index f581e40..baa3ad8 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/webui/Slideout.css +++ b/bundles/org.eclipse.orion.client.ui/web/orion/webui/Slideout.css @@ -1,4 +1,5 @@ .slideoutWrapper {
+ color: #555;
background: whitesmoke;
border: 1px solid rgb(222, 222, 222);
border-radius: 0 5px 5px 0;
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/webui/SplitMenu.js b/bundles/org.eclipse.orion.client.ui/web/orion/webui/SplitMenu.js deleted file mode 100644 index 483ffb2..0000000 --- a/bundles/org.eclipse.orion.client.ui/web/orion/webui/SplitMenu.js +++ /dev/null @@ -1,185 +0,0 @@ -/******************************************************************************* - * @license - * Copyright (c) 2014 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Eclipse Public License v1.0 - * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution - * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). - * - * Contributors: Anton McConville - IBM Corporation - initial API and implementation - ******************************************************************************/ -/*eslint-env browser, amd*/ -/*global URL*/ -define(['orion/webui/littlelib'], function(lib) { - - function SplitMenuItem( meta ){ - this.description = meta.description; - this.className = meta.className; - this.mode = meta.mode; - this.command = meta.command; - } - - function setCommand( command ){ - this.command = command; - } - - SplitMenuItem.prototype.setCommand = setCommand; - - function SplitMenu( domId ){ - - /* Modes */ - - this.MODE_SINGLE = 0; - this.MODE_VERTICAL = 1; - this.MODE_HORIZONTAL = 2; - this.MODE_PIP = 3; - - this.DESCRIPTION_SINGLE = 'Single Page'; - this.DESCRIPTION_VERTICAL = 'Vertical Split'; - this.DESCRIPTION_HORIZONTAL = 'Horizontal Split'; - this.DESCRIPTION_PIP = 'Picture in Picture'; - - this.menuItems = []; - - this.modes = [ { description: this.DESCRIPTION_SINGLE, className: 'core-sprite-page', mode: this.MODE_SINGLE }, - { description: this.DESCRIPTION_VERTICAL, className: 'core-sprite-vertical', mode: this.MODE_VERTICAL }, - { description: this.DESCRIPTION_HORIZONTAL, className: 'core-sprite-horizontal', mode: this.MODE_HORIZONTAL }, - { description: this.DESCRIPTION_PIP, className:'core-sprite-pip', mode: this.MODE_PIP } ]; - - this.chosenMode = this.MODE_SINGLE; - - /* Attach menu to anchor */ - - var element = document.getElementById( domId ); - - if( element ){ - - this.anchor = element; - - var splitMenu = document.createElement( 'div' ); - splitMenu.className = 'splitMenuBox'; - - this.currentModeElement = document.createElement( 'div' ); - this.currentModeElement.className = "core-sprite-page chosen"; - this.currentModeElement.onclick = this.toggleMenu.bind(this); - - this.selectionTable = document.createElement( 'div' ); - this.selectionTable.className = 'splitMenuSelectionTable'; - - splitMenu.appendChild( this.currentModeElement ); - splitMenu.appendChild( this.selectionTable ); - this.anchor.appendChild( splitMenu ); - } - - lib.addAutoDismiss( [this.anchor], this.hideMenu.bind(this) ); - } - - function createMenuItem( data ){ - - var item = document.createElement( 'div' ); - item.className = 'splitMenuSelectionItem'; - - var selectionState = document.createElement( 'div' ); - selectionState.className = 'splitMenuState'; - var icon = document.createElement( 'div' ); - var description = document.createElement( 'div' ); - description.className = 'splitMenuDescription'; - - icon.className = data.className; - description.innerHTML = data.description; - - if( this.chosenMode === data.mode ){ - selectionState.className = 'core-sprite-checkmark splitMenuState'; - } - - item.appendChild( selectionState ); - item.appendChild( icon ); - item.appendChild( description ); - - item.id = data.mode; - - item.onclick = this.switchMode.bind( this ); - - return item; - } - - SplitMenu.prototype.createMenuItem = createMenuItem; - - function addMenuItem( command ){ - - this.modes[command.name].command = command; - - this.menuItems[command.name] = new SplitMenuItem( this.modes[command.name] ); - - while(this.selectionTable.firstChild ){ - this.selectionTable.removeChild( this.selectionTable.firstChild ); - } - - this.addMenuItems(); - } - - SplitMenu.prototype.addMenuItem = addMenuItem; - - - function addMenuItems(){ - for( var item in this.menuItems ){ - this.selectionTable.appendChild( this.createMenuItem( this.menuItems[item] ) ); - } - } - - SplitMenu.prototype.addMenuItems = addMenuItems; - - function toggleMenu(){ - - if( this.selectionTable.style.visibility === 'visible' ){ - this.selectionTable.style.visibility = 'collapse'; - }else{ - this.selectionTable.style.visibility = 'visible'; - } - } - - SplitMenu.prototype.toggleMenu = toggleMenu; - - - function hideMenu(){ - if( this.selectionTable.style.visibility === 'visible' ){ - this.selectionTable.style.visibility = 'collapse'; - } - } - - SplitMenu.prototype.hideMenu = hideMenu; - - function switchMode( mode ){ - - var selection = mode.target.parentNode; - - if( selection.id ){ - - this.chosenMode = parseInt( selection.id ); - - while(this.selectionTable.firstChild ){ - this.selectionTable.removeChild( this.selectionTable.firstChild ); - } - - this.addMenuItems(); - - this.toggleMenu(); - - this.currentModeElement.className = this.menuItems[ this.chosenMode ].className + " chosen"; - - var element = this.menuItems[ this.chosenMode ]; - - element.command.callback({command:element.command}); - } - } - - SplitMenu.prototype.switchMode = switchMode; - - function bindCommand( mode, command ){ - this.menuItems[mode].setCommand = command; - } - - SplitMenu.prototype.bindCommand = bindCommand; - - return SplitMenu; -});
\ No newline at end of file diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/projects/RunBar.css b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/projects/RunBar.css index f35bf82..b5f4071 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/projects/RunBar.css +++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/projects/RunBar.css @@ -3,8 +3,6 @@ .runBarWrapper { -webkit-align-items: center; /* Safari */ align-items: center; - border-left: solid 1px #ccc; - border-right: solid 1px #ccc; display: -webkit-inline-flex; /* Safari */ display: inline-flex; overflow: visible; @@ -12,17 +10,15 @@ } .runBarWrapper .disabled { - opacity: 0.15; + opacity: 0.30; } .runBarWrapper .disabled:hover { - color: #555; - opacity: 0.15; + opacity: 0.30; cursor: default; } .launchConfigurationsWrapper { - background: white; border-radius: 5px; display: inline-block; margin: 0 8px 0 0; @@ -33,7 +29,7 @@ } .launchConfigurationsWrapper > .launchConfigurationsButton.dropdownTrigger { - background: white; + background: #37474F; border-radius: 5px; padding: 2px 0 2px 4px; width: 270px; @@ -42,7 +38,7 @@ .launchConfigurationsButton > .dropdownTriggerButtonLabel { -webkit-align-items: center; /* Safari */ align-items: center; - color: #999; + color: #CCCCCC; display: -webkit-inline-flex; /* Safari */ display: inline-flex; overflow: hidden; @@ -226,6 +222,7 @@ height: 17px; line-height: 17px; margin: -4px 0 0 6px; + color:white; } .logsLink { diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeVersion.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeVersion.js index 6d4f65d..b38947f 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeVersion.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeVersion.js @@ -14,7 +14,7 @@ define([], function() { /** * Version string for theme data. Please update this string whenever you change the style of a themable element. */ - var THEMES_VERSION = "6.75"; + var THEMES_VERSION = "6.83"; return THEMES_VERSION; }); diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/editor/ThemeData.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/editor/ThemeData.js index 74e9785..069f4da 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/editor/ThemeData.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/editor/ThemeData.js @@ -39,7 +39,7 @@ define([ var defaultFont = '"Source Code Pro", "Consolas", "Monaco", "Vera Mono", monospace'; //$NON-NLS-0$
var defaultFontSize = '12px'; //$NON-NLS-0$
- var prospecto, darker;
+ var prospecto, darker, ceol;
function ThemeData() {
@@ -241,6 +241,12 @@ define([ };
this.styles.push(prospecto);
+
+ ceol = {"className":"ceol","name":"Ceol","styles":{"annotationLine":{"currentLine":{"backgroundColor":"#152935"}},"annotationRange":{"currentBracket":{"backgroundColor":"#00FE00"},"matchingBracket":{"backgroundColor":"#4178be"},"matchingSearch":{"backgroundColor":"#A6266E","currentSearch":{"backgroundColor":"#008571"}},"writeOccurrence":{"backgroundColor":"#ffff00"}},"backgroundColor":"#152935","color":"#ffa5b4","comment":{"color":"#406d89"},"constant":{"color":"#7cc7ff","numeric":{"color":"#71c9ff","hex":{"color":"#71c9ff"}}},"entity":{"name":{"color":"#98937B","function":{"color":"#67BBB8","fontWeight":"bold"}},"other":{"attribute-name":{"color":"#5F9EA0"}}},"fontFamily":"\"Source Code Pro\", \"Consolas\", \"Monaco\", \"Vera Mono\", monospace","fontSize":"12px","keyword":{"control":{"color":"#a7fae6","fontWeight":"bold"},"operator":{"color":"#a7fae6","fontWeight":"bold"},"other":{"documentation":{"color":"#7F9FBF","task":{"color":"#5595ff"}}}},"markup":{"bold":{"fontWeight":"bold"},"heading":{"color":"#0000FF"},"italic":{"fontStyle":"italic"},"list":{"color":"#CC4C07"},"other":{"separator":{"color":"#00008F"},"strikethrough":{"textDecoration":"line-through"},"table":{"color":"#3C802C"}},"quote":{"color":"#446FBD"},"raw":{"fontFamily":"monospace","html":{"backgroundColor":"#E4F7EF"}},"underline":{"link":{"textDecoration":"underline"}}},"meta":{"documentation":{"annotation":{"color":"#7F9FBF"},"tag":{"color":"#7F7F9F"}},"preprocessor":{"color":"#A4A4A4"},"tag":{"attribute":{"color":"#eed2ff"},"color":"#a7fae7"}},"punctuation":{"operator":{"color":"#ba8ff7"}},"ruler":{"annotations":{"backgroundColor":"#112935"},"backgroundColor":"#112935","overview":{"backgroundColor":"#112935"}},"rulerLines":{"color":"#396f8a","even":{"color":"#396f8a"},"odd":{"color":"#396f8a"}},"string":{"color":"#61cdff","interpolated":{"color":"#151515"}},"support":{"type":{"propertyName":{"color":"#a7fae7"}}},"textviewContent ::-moz-selection":{"backgroundColor":"#b4d5ff"},"textviewContent ::selection":{"backgroundColor":"#325C80"},"textviewLeftRuler":{"borderColor":"#112935"},"textviewRightRuler":{"borderColor":"#112935"},"textviewSelection":{"backgroundColor":"#325C80"},"textviewSelectionUnfocused":{"backgroundColor":"#325C80"},"variable":{"language":{"color":"#a2f9e7","fontWeight":"bold"},"other":{"color":"#E038AD"},"parameter":{"color":"#a2f9e7"}}}};
+ this.styles.push(ceol);
+
+
+
darker = {
"className": "darker",
"name": "Darker",
diff --git a/bundles/org.eclipse.orion.client.ui/web/settings/settings.css b/bundles/org.eclipse.orion.client.ui/web/settings/settings.css index 9ea3f60..0b868ba 100644 --- a/bundles/org.eclipse.orion.client.ui/web/settings/settings.css +++ b/bundles/org.eclipse.orion.client.ui/web/settings/settings.css @@ -24,14 +24,23 @@ } .categoriesTitle { - margin-top: 36px; background: white; border: 1px solid #dadada; font-size: 12px; color: #333; font-weight: bold; padding: 12px 6px 11px 6px; - margin-left: 15px; + margin: 0; +} + +.innerPanels { + margin: 20px; + width: calc(100% - 2px) +} + +.fixedToolbarHolder { + width: calc(100% - 16px); + overflow: hidden; } .categories { @@ -39,7 +48,7 @@ } .categoriesContainer { - height: calc(100% - 84px); + height: calc(100% - 38px); position: relative; top: 0; } @@ -558,20 +567,17 @@ div.page section:last-child { .workingTarget { border: 1px solid #dadada; box-shadow: none; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; + background: #FFF; } .sidePanelMargins { margin-top: 0; height: calc(100% - 2px); margin-bottom: 0; - margin-left: 15px; + margin-left: 0; border: 1px solid #dadada; border-top: none; background: white; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; overflow-y: auto; } diff --git a/bundles/org.eclipse.orion.client.ui/web/settings/settings.html b/bundles/org.eclipse.orion.client.ui/web/settings/settings.html index 18fea94..e6b3709 100644 --- a/bundles/org.eclipse.orion.client.ui/web/settings/settings.html +++ b/bundles/org.eclipse.orion.client.ui/web/settings/settings.html @@ -27,19 +27,21 @@ <div id="sideMenu" class="sideMenu"></div> <div id="pageContent" class="content-fixedHeight"> <div id="sideMenuToggle" class="sideMenuToggle"></div> - <div id="auxpane" class="auxpane sidePanelLayout hasSplit"> - <div class="fixedToolbarHolder"> - <div id="sidebarToolbar" class="sidebarToolbar mainToolbar toolComposite toolbarLayout"></div> - <div id="categoriesTitle" class="categoriesTitle"></div> - <div id="categoriesContainer" class="toolbarTarget categoriesContainer"></div> + <div id="pageToolbar" class="mainToolbar toolComposite toolbarLayout"></div> + <div id="innerPanels" class="innerPanels"> + <div id="auxpane" class="auxpane sidePanelLayout hasSplit"> + <div class="fixedToolbarHolder"> + <div id="sidebarToolbar" class="sidebarToolbar mainToolbar toolComposite toolbarLayout"></div> + <div id="categoriesTitle" class="categoriesTitle"></div> + <div id="categoriesContainer" class="toolbarTarget categoriesContainer toolbarTarget-toolbarHidden"></div> + </div> + </div> + <div class="split splitLayout settingsSplitLayout" style="left: 300px;"></div> + <div id="rightPane" class="mainpane mainPanelLayout hasSplit"> + <div class="fixedToolbarHolder"> + <div class="toolbarTarget workingTarget toolbarTarget-toolbarHidden" tabindex="0" id="settings"> + </div> </div> - </div> - <div class="split splitLayout settingsSplitLayout" style="left: 300px;"></div> - <div id="rightPane" class="mainpane mainPanelLayout hasSplit"> - <div class="fixedToolbarHolder"> - <div class="mainToolbar toolComposite" id="pageToolbar"></div> - <div class="toolbarTarget workingTarget" tabindex="0" id="settings"> - </div> </div> </div> <div class="footer-fixed-bottom footer" id="footer"></div> diff --git a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.css b/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.css index 38d8a0e..18ddafd 100644 --- a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.css +++ b/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.css @@ -45,5 +45,4 @@ html,body { .toolbarTarget { overflow: hidden; - margin-top: 10px; } diff --git a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.html b/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.html index 961c161..8f76ae0 100644 --- a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.html +++ b/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.html @@ -29,7 +29,7 @@ <div id="sideMenuToggle" class="sideMenuToggle"></div> <div class="fixedToolbarHolder mainpane mainPanelLayout"> <div class="mainToolbar toolComposite" id="pageToolbar"></div> - <div id="mainNode" class="toolbarTarget pageLayoutTarget toolbarTarget-toolbarHidden"> + <div id="mainNode" class="toolbarTarget pageLayoutTarget"> <div class="shell-output" id="shell-output"></div> <div class="shell-input" id="shell-input"></div> </div> |