Skip to content
Snippets Groups Projects
Unverified Commit 5b9495c5 authored by Mike Greiling's avatar Mike Greiling
Browse files

Prettify all the things

parent 29d129d2
No related branches found
No related tags found
No related merge requests found
Showing
with 106 additions and 339 deletions
Loading
Loading
@@ -77,89 +77,46 @@ export default {
</script>
 
<template>
<li
:id="groupDomId"
:class="rowClass"
class="group-row"
@click.stop="onClickRowGroup"
>
<li :id="groupDomId" :class="rowClass" class="group-row" @click.stop="onClickRowGroup">
<div
:class="{ 'project-row-contents': !isGroup }"
class="group-row-contents d-flex justify-content-end align-items-center"
>
<div
class="folder-toggle-wrap append-right-4 d-flex align-items-center"
>
<item-caret
:is-group-open="group.isOpen"
/>
<item-type-icon
:item-type="group.type"
:is-group-open="group.isOpen"
/>
<div class="folder-toggle-wrap append-right-4 d-flex align-items-center">
<item-caret :is-group-open="group.isOpen" />
<item-type-icon :item-type="group.type" :is-group-open="group.isOpen" />
</div>
<div
:class="{ 'content-loading': group.isChildrenLoading }"
class="avatar-container s24 d-none d-sm-flex"
>
<a
:href="group.relativePath"
class="no-expand"
>
<img
v-if="hasAvatar"
:src="group.avatarUrl"
class="avatar s24"
/>
<identicon
v-else
:entity-id="group.id"
:entity-name="group.name"
size-class="s24"
/>
<a :href="group.relativePath" class="no-expand">
<img v-if="hasAvatar" :src="group.avatarUrl" class="avatar s24" />
<identicon v-else :entity-id="group.id" :entity-name="group.name" size-class="s24" />
</a>
</div>
<div
class="group-text flex-grow"
>
<div
class="title namespace-title append-right-8"
>
<div class="group-text flex-grow">
<div class="title namespace-title append-right-8">
<a
v-tooltip
:href="group.relativePath"
:title="group.fullName"
class="no-expand"
data-placement="bottom"
>{{
// ending bracket must be by closing tag to prevent
// link hover text-decoration from over-extending
group.name
}}</a>
<span
v-if="group.permission"
class="user-access-role"
>{{
// ending bracket must be by closing tag to prevent
// link hover text-decoration from over-extending
group.name
}}</a
>
{{ group.permission }}
</span>
<span v-if="group.permission" class="user-access-role"> {{ group.permission }} </span>
</div>
<div
v-if="group.description"
class="description"
>
<span v-html="group.description">
</span>
<div v-if="group.description" class="description">
<span v-html="group.description"> </span>
</div>
</div>
<item-stats
:item="group"
class="group-stats prepend-top-2"
/>
<item-actions
v-if="isGroup"
:group="group"
:parent-group="parentGroup"
/>
<item-stats :item="group" class="group-stats prepend-top-2" />
<item-actions v-if="isGroup" :group="group" :parent-group="parentGroup" />
</div>
<group-folder
v-if="group.isOpen && hasChildren"
Loading
Loading
Loading
Loading
@@ -43,19 +43,9 @@ export default {
 
<template>
<div class="groups-list-tree-container qa-groups-list-tree-container">
<div
v-if="searchEmpty"
class="has-no-search-results"
>
{{ searchEmptyMessage }}
</div>
<template
v-else
>
<group-folder
:groups="groups"
:action="action"
/>
<div v-if="searchEmpty" class="has-no-search-results">{{ searchEmptyMessage }}</div>
<template v-else>
<group-folder :groups="groups" :action="action" />
<pagination-links
:change="change"
:page-info="pageInfo"
Loading
Loading
Loading
Loading
@@ -53,8 +53,9 @@ export default {
:aria-label="editBtnTitle"
data-container="body"
data-placement="bottom"
class="edit-group btn no-expand">
<icon name="settings"/>
class="edit-group btn no-expand"
>
<icon name="settings" />
</a>
<a
v-if="group.canLeave"
Loading
Loading
@@ -65,8 +66,9 @@ export default {
data-container="body"
data-placement="bottom"
class="leave-group btn no-expand"
@click.prevent="onLeaveGroup">
<icon name="leave"/>
@click.prevent="onLeaveGroup"
>
<icon name="leave" />
</a>
</div>
</template>
Loading
Loading
@@ -21,10 +21,5 @@ export default {
</script>
 
<template>
<span class="folder-caret">
<icon
:size="12"
:name="iconClass"
/>
</span>
<span class="folder-caret"> <icon :size="12" :name="iconClass" /> </span>
</template>
Loading
Loading
@@ -76,14 +76,8 @@ export default {
css-class="item-visibility"
tooltip-placement="left"
/>
<div
v-if="isProject"
class="last-updated"
>
<time-ago-tooltip
:time="item.updatedAt"
tooltip-placement="bottom"
/>
<div v-if="isProject" class="last-updated">
<time-ago-tooltip :time="item.updatedAt" tooltip-placement="bottom" />
</div>
</div>
</template>
Loading
Loading
@@ -57,12 +57,6 @@ export default {
:title="title"
data-container="body"
>
<icon :name="iconName" />
<span
v-if="isValuePresent"
class="stat-value"
>
{{ value }}
</span>
<icon :name="iconName" /> <span v-if="isValuePresent" class="stat-value"> {{ value }} </span>
</span>
</template>
Loading
Loading
@@ -29,7 +29,5 @@ export default {
</script>
 
<template>
<span class="item-type-icon">
<icon :name="iconClass"/>
</span>
<span class="item-type-icon"> <icon :name="iconClass" /> </span>
</template>
Loading
Loading
@@ -37,7 +37,7 @@ export default {
<button
v-tooltip
:class="{
active: currentActivityView === $options.activityBarViews.edit
active: currentActivityView === $options.activityBarViews.edit,
}"
:title="s__('IDE|Edit')"
:aria-label="s__('IDE|Edit')"
Loading
Loading
@@ -45,18 +45,16 @@ export default {
data-placement="right"
type="button"
class="ide-sidebar-link js-ide-edit-mode"
@click.prevent="changedActivityView($event, $options.activityBarViews.edit)"
@click.prevent="changedActivityView($event, $options.activityBarViews.edit);"
>
<icon
name="code"
/>
<icon name="code" />
</button>
</li>
<li>
<button
v-tooltip
:class="{
active: currentActivityView === $options.activityBarViews.review
active: currentActivityView === $options.activityBarViews.review,
}"
:title="s__('IDE|Review')"
:aria-label="s__('IDE|Review')"
Loading
Loading
@@ -64,18 +62,16 @@ export default {
data-placement="right"
type="button"
class="ide-sidebar-link js-ide-review-mode"
@click.prevent="changedActivityView($event, $options.activityBarViews.review)"
@click.prevent="changedActivityView($event, $options.activityBarViews.review);"
>
<icon
name="file-modified"
/>
<icon name="file-modified" />
</button>
</li>
<li v-show="hasChanges">
<button
v-tooltip
:class="{
active: currentActivityView === $options.activityBarViews.commit
active: currentActivityView === $options.activityBarViews.commit,
}"
:title="s__('IDE|Commit')"
:aria-label="s__('IDE|Commit')"
Loading
Loading
@@ -83,11 +79,9 @@ export default {
data-placement="right"
type="button"
class="ide-sidebar-link js-ide-commit-mode"
@click.prevent="changedActivityView($event, $options.activityBarViews.commit)"
@click.prevent="changedActivityView($event, $options.activityBarViews.commit);"
>
<icon
name="commit"
/>
<icon name="commit" />
</button>
</li>
</ul>
Loading
Loading
Loading
Loading
@@ -32,28 +32,14 @@ export default {
</script>
 
<template>
<a
:href="branchHref"
class="btn-link d-flex align-items-center"
>
<a :href="branchHref" class="btn-link d-flex align-items-center">
<span class="d-flex append-right-default ide-search-list-current-icon">
<icon
v-if="isActive"
:size="18"
name="mobile-issue-close"
/>
<icon v-if="isActive" :size="18" name="mobile-issue-close" />
</span>
<span>
<strong>
{{ item.name }}
</strong>
<span
class="ide-merge-request-project-path d-block mt-1"
>
Updated
<timeago
:time="item.committedDate || ''"
/>
<strong> {{ item.name }} </strong>
<span class="ide-merge-request-project-path d-block mt-1">
Updated <timeago :time="item.committedDate || ''" />
</span>
</span>
</a>
Loading
Loading
Loading
Loading
@@ -68,11 +68,7 @@ export default {
class="form-control dropdown-input-field"
@input="searchBranches"
/>
<icon
:size="18"
name="search"
class="input-icon"
/>
<icon :size="18" name="search" class="input-icon" />
</div>
</div>
<div class="dropdown-content ide-merge-requests-dropdown-content d-flex">
Loading
Loading
@@ -81,26 +77,13 @@ export default {
:size="2"
class="mt-3 mb-3 align-self-center ml-auto mr-auto"
/>
<ul
v-else
class="mb-3 w-100"
>
<ul v-else class="mb-3 w-100">
<template v-if="hasBranches">
<li
v-for="item in branches"
:key="item.name"
>
<item
:item="item"
:project-id="currentProjectId"
:is-active="isActiveBranch(item)"
/>
<li v-for="item in branches" :key="item.name">
<item :item="item" :project-id="currentProjectId" :is-active="isActiveBranch(item)" />
</li>
</template>
<li
v-else
class="ide-search-list-empty d-flex align-items-center justify-content-center"
>
<li v-else class="ide-search-list-empty d-flex align-items-center justify-content-center">
<template v-if="hasNoSearchResults">
{{ __('No branches found') }}
</template>
Loading
Loading
Loading
Loading
@@ -57,11 +57,7 @@ export default {
:disabled="currentBranch && !currentBranch.can_push"
:title="$options.currentBranchPermissionsTooltip"
>
<span
class="ide-radio-label"
v-html="commitToCurrentBranchText"
>
</span>
<span class="ide-radio-label" v-html="commitToCurrentBranchText"> </span>
</radio-group>
<radio-group
:value="$options.commitToNewBranch"
Loading
Loading
Loading
Loading
@@ -42,18 +42,9 @@ export default {
 
<template>
<div class="d-flex ide-commit-editor-header align-items-center">
<file-icon
:file-name="activeFile.name"
:size="16"
class="mr-2"
/>
<strong class="mr-2">
{{ activeFile.path }}
</strong>
<changed-file-icon
:file="activeFile"
class="ml-0"
/>
<file-icon :file-name="activeFile.name" :size="16" class="mr-2" />
<strong class="mr-2"> {{ activeFile.path }} </strong>
<changed-file-icon :file="activeFile" class="ml-0" />
<div class="ml-auto">
<button
v-if="!isStaged"
Loading
Loading
@@ -66,7 +57,7 @@ export default {
<button
:class="{
'btn-success': !isStaged,
'btn-warning': isStaged
'btn-warning': isStaged,
}"
type="button"
class="btn btn-inverted"
Loading
Loading
Loading
Loading
@@ -13,22 +13,12 @@ export default {
v-if="!lastCommitMsg"
class="multi-file-commit-panel-section ide-commit-empty-state js-empty-state"
>
<div
class="ide-commit-empty-state-container"
>
<div class="svg-content svg-80">
<img :src="noChangesStateSvgPath" />
</div>
<div class="ide-commit-empty-state-container">
<div class="svg-content svg-80"><img :src="noChangesStateSvgPath" /></div>
<div class="append-right-default prepend-left-default">
<div
class="text-content text-center"
>
<h4>
{{ __('No changes') }}
</h4>
<p>
{{ __('Edit files in the editor and commit changes here') }}
</p>
<div class="text-content text-center">
<h4>{{ __('No changes') }}</h4>
<p>{{ __('Edit files in the editor and commit changes here') }}</p>
</div>
</div>
</div>
Loading
Loading
Loading
Loading
@@ -96,7 +96,7 @@ export default {
<div
:class="{
'is-compact': isCompact,
'is-full': !isCompact
'is-full': !isCompact,
}"
:style="{
height: componentHeight ? `${componentHeight}px` : null,
Loading
Loading
@@ -109,11 +109,7 @@ export default {
@enter="enterTransition"
@after-enter="afterEndTransition"
>
<div
v-if="isCompact"
ref="compactEl"
class="commit-form-compact"
>
<div v-if="isCompact" ref="compactEl" class="commit-form-compact">
<button
:disabled="!hasChanges"
type="button"
Loading
Loading
@@ -122,21 +118,10 @@ export default {
>
{{ __('Commit…') }}
</button>
<p
class="text-center"
v-html="overviewText"
></p>
<p class="text-center" v-html="overviewText"></p>
</div>
<form
v-if="!isCompact"
ref="formEl"
@submit.prevent.stop="commitChanges"
>
<transition name="fade">
<success-message
v-show="lastCommitMsg"
/>
</transition>
<form v-if="!isCompact" ref="formEl" @submit.prevent.stop="commitChanges">
<transition name="fade"> <success-message v-show="lastCommitMsg" /> </transition>
<commit-message-field
:text="commitMessage"
:placeholder="preBuiltCommitMessage"
Loading
Loading
Loading
Loading
@@ -93,24 +93,11 @@ export default {
</script>
 
<template>
<div
class="ide-commit-list-container"
>
<header
class="multi-file-commit-panel-header d-flex mb-0"
>
<div
class="d-flex align-items-center flex-fill"
>
<icon
v-once
:name="iconName"
:size="18"
class="append-right-8"
/>
<strong>
{{ titleText }}
</strong>
<div class="ide-commit-list-container">
<header class="multi-file-commit-panel-header d-flex mb-0">
<div class="d-flex align-items-center flex-fill">
<icon v-once :name="iconName" :size="18" class="append-right-8" />
<strong> {{ titleText }} </strong>
<div class="d-flex ml-auto">
<button
ref="actionBtn"
Loading
Loading
@@ -119,7 +106,7 @@ export default {
:aria-label="actionBtnText"
:disabled="!filesLength"
:class="{
'disabled-content': !filesLength
'disabled-content': !filesLength,
}"
type="button"
class="d-flex ide-staged-action-btn p-0 border-0 align-items-center"
Loading
Loading
@@ -128,11 +115,7 @@ export default {
data-boundary="viewport"
@click="actionBtnClicked"
>
<icon
:name="actionBtnIcon"
:size="16"
class="ml-auto mr-auto"
/>
<icon :name="actionBtnIcon" :size="16" class="ml-auto mr-auto" />
</button>
<button
v-if="!stagedList"
Loading
Loading
@@ -141,7 +124,7 @@ export default {
:aria-label="__('Discard all changes')"
:disabled="!filesLength"
:class="{
'disabled-content': !filesLength
'disabled-content': !filesLength,
}"
type="button"
class="d-flex ide-staged-action-btn p-0 border-0 align-items-center"
Loading
Loading
@@ -150,23 +133,13 @@ export default {
data-boundary="viewport"
@click="openDiscardModal"
>
<icon
:size="16"
name="remove-all"
class="ml-auto mr-auto"
/>
<icon :size="16" name="remove-all" class="ml-auto mr-auto" />
</button>
</div>
</div>
</header>
<ul
v-if="filesLength"
class="multi-file-commit-list list-unstyled append-bottom-0"
>
<li
v-for="file in fileList"
:key="file.key"
>
<ul v-if="filesLength" class="multi-file-commit-list list-unstyled append-bottom-0">
<li v-for="file in fileList" :key="file.key">
<list-item
:file="file"
:action-component="itemActionComponent"
Loading
Loading
@@ -176,10 +149,7 @@ export default {
/>
</li>
</ul>
<p
v-else
class="multi-file-commit-list form-text text-muted text-center"
>
<p v-else class="multi-file-commit-list form-text text-muted text-center">
{{ emptyStateText }}
</p>
<gl-modal
Loading
Loading
Loading
Loading
@@ -69,9 +69,7 @@ export default {
</script>
 
<template>
<div
class="multi-file-commit-list-collapsed text-center"
>
<div class="multi-file-commit-list-collapsed text-center">
<div
v-tooltip
:title="titleTooltip"
Loading
Loading
@@ -79,11 +77,7 @@ export default {
data-placement="left"
class="append-bottom-15"
>
<icon
v-once
:name="iconName"
:size="18"
/>
<icon v-once :name="iconName" :size="18" />
</div>
<div
v-tooltip
Loading
Loading
@@ -92,11 +86,7 @@ export default {
data-placement="left"
class="append-bottom-10"
>
<icon
:name="additionIconName"
:size="18"
:css-classes="addedFilesIconClass"
/>
<icon :name="additionIconName" :size="18" :css-classes="addedFilesIconClass" />
</div>
{{ addedFilesLength }}
<div
Loading
Loading
@@ -106,11 +96,7 @@ export default {
data-placement="left"
class="prepend-top-10 append-bottom-10"
>
<icon
:name="modifiedIconName"
:size="18"
:css-classes="modifiedFilesClass"
/>
<icon :name="modifiedIconName" :size="18" :css-classes="modifiedFilesClass" />
</div>
{{ modifiedFilesLength }}
</div>
Loading
Loading
Loading
Loading
@@ -99,7 +99,7 @@ export default {
v-tooltip
:title="tooltipTitle"
:class="{
'is-active': isActive
'is-active': isActive,
}"
class="multi-file-commit-list-path w-100 border-0 ml-0 mr-0"
role="button"
Loading
Loading
@@ -107,18 +107,11 @@ export default {
@click="openFileInEditor"
>
<span class="multi-file-commit-list-file-path d-flex align-items-center">
<file-icon
:file-name="file.name"
class="append-right-8"
/>{{ file.name }}
<file-icon :file-name="file.name" class="append-right-8" />{{ file.name }}
</span>
<div class="ml-auto d-flex align-items-center">
<div class="d-flex align-items-center ide-commit-list-changed-icon">
<icon
:name="iconName"
:size="16"
:css-classes="iconClass"
/>
<icon :name="iconName" :size="16" :css-classes="iconClass" />
</div>
</div>
</div>
Loading
Loading
Loading
Loading
@@ -71,24 +71,16 @@ export default {
<fieldset class="common-note-form ide-commit-message-field">
<div
:class="{
'is-focused': isFocused
'is-focused': isFocused,
}"
class="md-area"
>
<div
v-once
class="md-header"
>
<div v-once class="md-header">
<ul class="nav-links">
<li>
{{ __('Commit Message') }}
<span
v-popover="$options.popoverOptions"
class="form-text text-muted prepend-left-10"
>
<icon
name="question"
/>
<span v-popover="$options.popoverOptions" class="form-text text-muted prepend-left-10">
<icon name="question" />
</span>
</li>
</ul>
Loading
Loading
@@ -97,22 +89,13 @@ export default {
<div class="ide-commit-message-highlights-container">
<div
:style="{
transform: `translate3d(0, ${-scrollTop}px, 0)`
transform: `translate3d(0, ${-scrollTop}px, 0)`,
}"
class="note-textarea highlights monospace"
>
<div
v-for="(line, index) in allLines"
:key="index"
>
<span
v-text="line.text"
>
</span><mark
v-show="line.highlightedText"
v-text="line.highlightedText"
>
</mark>
<div v-for="(line, index) in allLines" :key="index">
<span v-text="line.text"> </span
><mark v-show="line.highlightedText" v-text="line.highlightedText"> </mark>
</div>
</div>
</div>
Loading
Loading
@@ -124,8 +107,8 @@ export default {
name="commit-message"
@scroll="handleScroll"
@input="onInput"
@focus="updateIsFocused(true)"
@blur="updateIsFocused(false)"
@focus="updateIsFocused(true);"
@blur="updateIsFocused(false);"
>
</textarea>
</div>
Loading
Loading
Loading
Loading
@@ -56,7 +56,7 @@ export default {
v-tooltip
:title="tooltipTitle"
:class="{
'is-disabled': disabled
'is-disabled': disabled,
}"
>
<input
Loading
Loading
@@ -65,27 +65,18 @@ export default {
:disabled="disabled"
type="radio"
name="commit-action"
@change="updateCommitAction($event.target.value)"
@change="updateCommitAction($event.target.value);"
/>
<span class="prepend-left-10">
<span
v-if="label"
class="ide-radio-label"
>
{{ label }}
</span>
<slot v-else></slot>
<span v-if="label" class="ide-radio-label"> {{ label }} </span> <slot v-else></slot>
</span>
</label>
<div
v-if="commitAction === value && showInput"
class="ide-commit-new-branch"
>
<div v-if="commitAction === value && showInput" class="ide-commit-new-branch">
<input
:placeholder="newBranchName"
type="text"
class="form-control monospace"
@input="updateBranchName($event.target.value)"
@input="updateBranchName($event.target.value);"
/>
</div>
</fieldset>
Loading
Loading
Loading
Loading
@@ -38,10 +38,7 @@ export default {
</script>
 
<template>
<div
v-once
class="multi-file-discard-btn d-flex"
>
<div v-once class="multi-file-discard-btn d-flex">
<button
v-tooltip
:aria-label="__('Stage changes')"
Loading
Loading
@@ -51,13 +48,9 @@ export default {
data-container="body"
data-boundary="viewport"
data-placement="bottom"
@click.stop.prevent="stageChange(path)"
@click.stop.prevent="stageChange(path);"
>
<icon
:size="16"
name="mobile-issue-close"
class="ml-auto mr-auto"
/>
<icon :size="16" name="mobile-issue-close" class="ml-auto mr-auto" />
</button>
<button
v-tooltip
Loading
Loading
@@ -70,18 +63,14 @@ export default {
data-placement="bottom"
@click.stop.prevent="showDiscardModal"
>
<icon
:size="16"
name="remove"
class="ml-auto mr-auto"
/>
<icon :size="16" name="remove" class="ml-auto mr-auto" />
</button>
<gl-modal
:id="modalId"
:header-title-text="modalTitle"
:footer-primary-button-text="__('Discard changes')"
footer-primary-button-variant="danger"
@submit="discardFileChanges(path)"
@submit="discardFileChanges(path);"
>
{{ __("You will loose all changes you've made to this file. This action cannot be undone.") }}
</gl-modal>
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment