Commit 3d80fae5 authored by Phil Hughes's avatar Phil Hughes

fixed up spacing throughout sidebars

parent bb3752c7
...@@ -5,7 +5,7 @@ import LoadingButton from '~/vue_shared/components/loading_button.vue'; ...@@ -5,7 +5,7 @@ import LoadingButton from '~/vue_shared/components/loading_button.vue';
import CommitMessageField from './message_field.vue'; import CommitMessageField from './message_field.vue';
import Actions from './actions.vue'; import Actions from './actions.vue';
import SuccessMessage from './success_message.vue'; import SuccessMessage from './success_message.vue';
import { activityBarViews, MAX_WINDOW_HEIGHT_COMPACT, COMMIT_ITEM_PADDING } from '../../constants'; import { activityBarViews, MAX_WINDOW_HEIGHT_COMPACT } from '../../constants';
export default { export default {
components: { components: {
...@@ -70,7 +70,7 @@ export default { ...@@ -70,7 +70,7 @@ export default {
? this.$refs.formEl && this.$refs.formEl.offsetHeight ? this.$refs.formEl && this.$refs.formEl.offsetHeight
: this.$refs.compactEl && this.$refs.compactEl.offsetHeight; : this.$refs.compactEl && this.$refs.compactEl.offsetHeight;
this.componentHeight = elHeight + COMMIT_ITEM_PADDING; this.componentHeight = elHeight;
}, },
enterTransition() { enterTransition() {
this.$nextTick(() => { this.$nextTick(() => {
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
? this.$refs.compactEl && this.$refs.compactEl.offsetHeight ? this.$refs.compactEl && this.$refs.compactEl.offsetHeight
: this.$refs.formEl && this.$refs.formEl.offsetHeight; : this.$refs.formEl && this.$refs.formEl.offsetHeight;
this.componentHeight = elHeight + COMMIT_ITEM_PADDING; this.componentHeight = elHeight;
}); });
}, },
afterEndTransition() { afterEndTransition() {
......
...@@ -122,11 +122,11 @@ export default { ...@@ -122,11 +122,11 @@ export default {
<div <div
class="file" class="file"
:class="fileClass" :class="fileClass"
@click="clickFile"
role="button"
> >
<div <div
class="file-name" class="file-name"
@click="clickFile"
role="button"
> >
<span <span
class="ide-file-name str-truncated" class="ide-file-name str-truncated"
......
...@@ -5,8 +5,6 @@ export const FILE_FINDER_EMPTY_ROW_HEIGHT = 33; ...@@ -5,8 +5,6 @@ export const FILE_FINDER_EMPTY_ROW_HEIGHT = 33;
export const MAX_WINDOW_HEIGHT_COMPACT = 750; export const MAX_WINDOW_HEIGHT_COMPACT = 750;
export const COMMIT_ITEM_PADDING = 32;
// Commit message textarea // Commit message textarea
export const MAX_TITLE_LENGTH = 50; export const MAX_TITLE_LENGTH = 50;
export const MAX_BODY_LENGTH = 72; export const MAX_BODY_LENGTH = 72;
......
...@@ -39,12 +39,14 @@ ...@@ -39,12 +39,14 @@
.ide-file-list { .ide-file-list {
flex: 1; flex: 1;
padding-left: $gl-padding;
padding-right: $gl-padding;
.file { .file {
cursor: pointer; cursor: pointer;
&.file-open { &.file-open {
background: $link-active-background; background: $white-normal;
} }
&.file-active { &.file-active {
...@@ -84,11 +86,12 @@ ...@@ -84,11 +86,12 @@
.ide-new-btn { .ide-new-btn {
display: none; display: none;
margin-left: auto;
} }
&:hover, &:hover,
&:focus { &:focus {
background: $link-active-background; background: $white-normal;
.ide-new-btn { .ide-new-btn {
display: block; display: block;
...@@ -110,12 +113,11 @@ ...@@ -110,12 +113,11 @@
} }
} }
.file-name, .file-name {
.file-col-commit-message {
display: flex; display: flex;
overflow: visible; overflow: visible;
align-items: center; align-items: center;
padding: 6px $gl-padding; width: 100%;
} }
.multi-file-loading-container { .multi-file-loading-container {
...@@ -500,7 +502,7 @@ ...@@ -500,7 +502,7 @@
align-items: center; align-items: center;
margin-bottom: 0; margin-bottom: 0;
border-bottom: 1px solid $white-dark; border-bottom: 1px solid $white-dark;
padding: $gl-btn-padding $gl-padding; padding: $grid-size 0;
} }
.multi-file-commit-panel-header-title { .multi-file-commit-panel-header-title {
...@@ -522,32 +524,26 @@ ...@@ -522,32 +524,26 @@
.multi-file-commit-list { .multi-file-commit-list {
flex: 1; flex: 1;
overflow: auto; overflow: auto;
padding: $gl-padding; padding: $gl-padding 0;
margin-left: -$grid-size;
margin-right: -$grid-size;
min-height: 60px; min-height: 60px;
.multi-file-commit-list-item {
margin-left: 0;
margin-right: 0;
}
} }
.multi-file-commit-list-item { .multi-file-commit-list-item {
display: flex;
padding: 0;
align-items: center;
border-radius: $border-radius-default;
.multi-file-discard-btn { .multi-file-discard-btn {
display: none; display: none;
margin-top: -2px; margin-top: -2px;
margin-left: auto; margin-left: auto;
margin-right: $grid-size;
color: $gl-link-color; color: $gl-link-color;
&:focus,
&:hover {
text-decoration: underline;
}
} }
&:hover { &:hover {
background: $white-normal;
.multi-file-discard-btn { .multi-file-discard-btn {
display: flex; display: flex;
} }
...@@ -583,25 +579,39 @@ ...@@ -583,25 +579,39 @@
} }
} }
.multi-file-commit-list-item,
.ide-file-list .file {
display: flex;
align-items: center;
margin-left: -$grid-size;
margin-right: -$grid-size;
padding: $grid-size / 2 $grid-size;
border-radius: $border-radius-default;
text-align: left;
&:hover,
&:focus {
background: $white-normal;
}
}
.multi-file-commit-list-path { .multi-file-commit-list-path {
padding: $grid-size / 2; padding: 0;
padding-left: $grid-size;
background: none; background: none;
border: 0; border: 0;
text-align: left; text-align: left;
width: 100%; width: 100%;
min-width: 0;
&:hover,
&:focus {
outline: 0;
}
svg { svg {
min-width: 16px; min-width: 16px;
vertical-align: middle; vertical-align: middle;
display: inline-block; display: inline-block;
} }
&:hover,
&:focus {
outline: 0;
}
} }
.multi-file-commit-list-file-path { .multi-file-commit-list-file-path {
...@@ -618,12 +628,18 @@ ...@@ -618,12 +628,18 @@
.multi-file-commit-form { .multi-file-commit-form {
position: relative; position: relative;
padding: $gl-padding;
background-color: $white-light; background-color: $white-light;
border-top: 1px solid $white-dark;
border-left: 1px solid $white-dark; border-left: 1px solid $white-dark;
transition: all 0.3s ease; transition: all 0.3s ease;
> form,
> .commit-form-compact {
padding: $gl-padding 0;
margin-left: $gl-padding;
margin-right: $gl-padding;
border-top: 1px solid $white-dark;
}
.btn { .btn {
font-size: $gl-font-size; font-size: $gl-font-size;
} }
...@@ -786,8 +802,9 @@ ...@@ -786,8 +802,9 @@
display: flex; display: flex;
flex: 1; flex: 1;
flex-direction: column; flex-direction: column;
width: 100%;
min-height: 140px; min-height: 140px;
margin-left: $gl-padding;
margin-right: $gl-padding;
&.is-first { &.is-first {
border-bottom: 1px solid $white-dark; border-bottom: 1px solid $white-dark;
...@@ -979,8 +996,6 @@ ...@@ -979,8 +996,6 @@
display: flex; display: flex;
align-items: center; align-items: center;
padding: 10px 0; padding: 10px 0;
margin-left: $gl-padding;
margin-right: $gl-padding;
border-bottom: 1px solid $white-dark; border-bottom: 1px solid $white-dark;
.ide-new-btn { .ide-new-btn {
...@@ -1011,9 +1026,9 @@ ...@@ -1011,9 +1026,9 @@
.commit-form-slide-up-enter-active, .commit-form-slide-up-enter-active,
.commit-form-slide-up-leave-active { .commit-form-slide-up-leave-active {
position: absolute; position: absolute;
top: 16px; top: 0;
left: 16px; left: 0;
right: 16px; right: 0;
transition: all 0.3s ease; transition: all 0.3s ease;
} }
......
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