Commit 8d9e99f7 authored by Phil Hughes's avatar Phil Hughes

spacing & color updates

parent 5ac76edb
...@@ -66,10 +66,26 @@ export default { ...@@ -66,10 +66,26 @@ export default {
<template> <template>
<li <li
:class="{
active: tab.active
}"
@click="clickFile(tab)" @click="clickFile(tab)"
@mouseover="mouseOverTab" @mouseover="mouseOverTab"
@mouseout="mouseOutTab" @mouseout="mouseOutTab"
> >
<div
class="multi-file-tab"
:title="tab.url"
>
<file-icon
:file-name="tab.name"
:size="16"
/>
{{ tab.name }}
<file-status-icon
:file="tab"
/>
</div>
<button <button
type="button" type="button"
class="multi-file-tab-close" class="multi-file-tab-close"
...@@ -86,22 +102,5 @@ export default { ...@@ -86,22 +102,5 @@ export default {
:file="tab" :file="tab"
/> />
</button> </button>
<div
class="multi-file-tab"
:class="{
active: tab.active
}"
:title="tab.url"
>
<file-icon
:file-name="tab.name"
:size="16"
/>
{{ tab.name }}
<file-status-icon
:file="tab"
/>
</div>
</li> </li>
</template> </template>
...@@ -196,10 +196,6 @@ ...@@ -196,10 +196,6 @@
box-shadow: inset 3px 0 $color-700; box-shadow: inset 3px 0 $color-700;
} }
} }
.ide-context-header a {
color: $color-700;
}
} }
body { body {
......
...@@ -141,7 +141,17 @@ ...@@ -141,7 +141,17 @@
} }
li { li {
position: relative; display: flex;
align-items: center;
padding: $grid-size $gl-padding;
background-color: $gray-normal;
border-right: 1px solid $white-dark;
border-bottom: 1px solid $white-dark;
&.active {
background-color: $white-light;
border-bottom-color: $white-light;
}
} }
.dropdown { .dropdown {
...@@ -164,35 +174,23 @@ ...@@ -164,35 +174,23 @@
} }
.multi-file-tab { .multi-file-tab {
@include str-truncated(150px); @include str-truncated(141px);
padding: ($gl-padding / 2) ($gl-padding + 12) ($gl-padding / 2) $gl-padding;
background-color: $gray-normal;
border-right: 1px solid $white-dark;
border-bottom: 1px solid $white-dark;
cursor: pointer; cursor: pointer;
svg { svg {
vertical-align: middle; vertical-align: middle;
} }
&.active {
background-color: $white-light;
border-bottom-color: $white-light;
}
} }
.multi-file-tab-close { .multi-file-tab-close {
position: absolute;
right: 8px;
top: 50%;
width: 16px; width: 16px;
height: 16px; height: 16px;
padding: 0; padding: 0;
margin-left: $grid-size;
background: none; background: none;
border: 0; border: 0;
border-radius: $border-radius-default; border-radius: $border-radius-default;
color: $theme-gray-900; color: $theme-gray-900;
transform: translateY(-50%);
svg { svg {
position: relative; position: relative;
...@@ -301,6 +299,7 @@ ...@@ -301,6 +299,7 @@
.multi-file-editor-holder { .multi-file-editor-holder {
height: 100%; height: 100%;
min-height: 0;
} }
.preview-container { .preview-container {
...@@ -774,10 +773,9 @@ ...@@ -774,10 +773,9 @@
display: flex; display: flex;
align-items: center; align-items: center;
position: relative; position: relative;
height: 55px; height: 60px;
width: 100%; width: 100%;
margin: 2.5px 0; padding: 0 $gl-padding;
padding: $gl-padding-8 $gl-padding;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
...@@ -789,9 +787,12 @@ ...@@ -789,9 +787,12 @@
margin: 0 auto; margin: 0 auto;
} }
&:hover, &:hover {
background-color: $theme-gray-100;
}
&:focus { &:focus {
background-color: $white-light; background-color: $theme-gray-200;
} }
&.active { &.active {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment