diff options
author | Phil Hughes <me@iamphill.com> | 2018-05-03 11:44:08 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-05-03 11:44:08 +0300 |
commit | 0917b1d81bd2f9a6344b53e93d6e95cae17d1e43 (patch) | |
tree | e424260c416c22c57807f3e2cb5069df301c45d4 /app/assets/stylesheets/pages | |
parent | 4f2f02bfe867544cb4a73e90a2dd499f3ecfc653 (diff) | |
parent | 363ebd3efc5cc0a5130664aa0676bff14a011a54 (diff) |
Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-commit-box
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 21effacb605..2abc715addf 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -159,24 +159,6 @@ border-bottom-color: $white-light; } } - - .dropdown { - display: flex; - margin-left: auto; - margin-bottom: 1px; - padding: 0 $grid-size; - border-left: 1px solid $white-dark; - background-color: $white-light; - - &.shadow { - box-shadow: 0 0 10px $dropdown-shadow-color; - } - - .btn { - margin-top: auto; - margin-bottom: auto; - } - } } .multi-file-tab { @@ -245,6 +227,17 @@ display: none; } + .is-readonly, + .editor.original { + .view-lines { + cursor: default; + } + + .cursors-layer { + display: none; + } + } + .monaco-diff-editor.vs { .editor.modified { box-shadow: none; @@ -303,10 +296,6 @@ .margin-view-overlays .delete-sign { opacity: 0.4; } - - .cursors-layer { - display: none; - } } } @@ -378,6 +367,7 @@ .ide-btn-group { padding: $gl-padding-4 $gl-vert-padding; + line-height: 24px; } .ide-status-bar { @@ -454,10 +444,10 @@ .multi-file-commit-panel-inner { display: flex; - flex: 1; flex-direction: column; height: 100%; - width: 0; + min-width: 0; + width: 100%; } .multi-file-commit-panel-inner-scroll { @@ -829,10 +819,12 @@ } &:hover { + color: $gl-text-color; background-color: $theme-gray-100; } &:focus { + color: $gl-text-color; background-color: $theme-gray-200; } @@ -1015,6 +1007,15 @@ transform: translateY(100%); } +.ide-review-header { + flex-direction: column; + align-items: flex-start; +} + +.ide-review-sub-header { + color: $gl-text-color-secondary; +} + .ide-new-modal-label { line-height: 34px; } |