Merge upstream tag v1.12.3

- commit 'b3008ca765fb56b290232e9907908bb1a3f0a002' # Conflicts: # package.json
senki · Jun 23, 2018 · 33cb94b · 33cb94b
2 parents f1046b3 + b3008ca
commit 33cb94b
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "solarized-one-light-ui",
   "theme": "ui",
-  "version": "1.12.0",
+  "version": "1.12.3",
   "description": "Solarized One light UI Theme for Atom. A perfect companion for the Solarized Dark Syntax Theme.",
   "keywords": [
     "light",
@@ -71,7 +71,7 @@
     "stickyHeaders": {
       "title": "Make tree-view project headers sticky",
       "type": "boolean",
-      "default": "true",
+      "default": "false",
       "order": 5
     }
   }

diff --git a/styles/config.less b/styles/config.less
@@ -127,10 +127,31 @@
       background: @button-background-color-selected;
     }
 
-    // Fix sticky header from covering auto-revealed items
-    .list-item.selected {
+    // Fix sticky header from covering auto-revealed files
+    .entry.file.selected {
       padding-top: @ui-tab-height;
       margin-top: -@ui-tab-height;
     }
+
+    // Fix sticky header from covering auto-revealed directories when using up/down keys
+    // for directories, scroll test moves to .header, see https://github.com/atom/tree-view/blob/d2857ad4d7eeb7dad5cf94b33257a8740211480e/lib/tree-view.coffee#L839
+    .entry.directory.selected:not(.project-root) {
+      & > .header {
+        padding-top: @ui-tab-height;
+        margin-top: -@ui-tab-height;
+      }
+      &::before {
+        margin-top: @ui-tab-height;
+      }
+    }
+
+    // Fix above directory is not being clickable
+    .entry.directory {
+      z-index: 1;
+      position: relative;
+      &.selected {
+        z-index: 0;
+      }
+    }
   }
 }
diff --git a/styles/packages.less b/styles/packages.less
@@ -175,3 +175,57 @@
     border-color: @level-3-color;
   }
 }
+
+
+
+// GitHub package ---------------------------------------------------
+
+.github {
+
+  // Fix focus styles
+  // Since it's not possible to add a padding to <atom-text-editor>
+  // a pseudo element is used to add the border when focused.
+  &-CommitView-editor atom-text-editor.is-focused {
+    box-shadow: none;
+    &:before {
+      content: "";
+      position: absolute;
+      top: -2px;
+      left: -2px;
+      right: -2px;
+      bottom: -2px;
+      border: 2px solid;
+      border-color: inherit;
+      border-radius: @component-border-radius;
+    }
+  }
+
+  // Add focus styles since :focus doesn't work
+  &-CommitView-coAuthorEditor {
+    &.is-focused {
+      .focus();
+    }
+    &.is-open {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+    }
+
+
+    .Select-option {
+      &.is-focused {
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+        color: @accent-text-color;
+        background-color: @accent-color;
+      }
+    }
+    .Select-menu-outer {
+      left: -2px;
+      right: -2px;
+      bottom: 100%;
+      border: 2px solid @accent-color;
+      background-color: @overlay-background-color;
+    }
+  }
+
+}
diff --git a/styles/ui-variables.less b/styles/ui-variables.less
@@ -55,7 +55,7 @@
 @panel-heading-background-color:   @level-2-color;
 @panel-heading-border-color:       @base-border-color;
 
-@overlay-background-color:         @level-2-color;
+@overlay-background-color:         mix(@level-2-color, @level-3-color);
 @overlay-border-color:             @base-border-color;
 
 @button-background-color:          @level-1-color;