diff options
Diffstat (limited to 'web_src/js/components')
-rw-r--r-- | web_src/js/components/DiffFileList.vue | 14 | ||||
-rw-r--r-- | web_src/js/components/DiffFileTree.vue | 6 | ||||
-rw-r--r-- | web_src/js/components/DiffFileTreeItem.vue | 8 | ||||
-rw-r--r-- | web_src/js/components/PullRequestMergeForm.vue | 6 | ||||
-rw-r--r-- | web_src/js/components/RepoActionView.vue | 18 |
5 files changed, 26 insertions, 26 deletions
diff --git a/web_src/js/components/DiffFileList.vue b/web_src/js/components/DiffFileList.vue index f95f28528d..32919156b8 100644 --- a/web_src/js/components/DiffFileList.vue +++ b/web_src/js/components/DiffFileList.vue @@ -1,19 +1,19 @@ <template> - <ol class="diff-detail-box diff-stats m-0" ref="root" v-if="fileListIsVisible"> + <ol class="diff-detail-box diff-stats gt-m-0" ref="root" v-if="fileListIsVisible"> <li v-for="file in files" :key="file.NameHash"> - <div class="bold df ac pull-right"> - <span v-if="file.IsBin" class="ml-1 mr-3">{{ binaryFileMessage }}</span> + <div class="gt-bold gt-df gt-ac pull-right"> + <span v-if="file.IsBin" class="gt-ml-1 gt-mr-3">{{ binaryFileMessage }}</span> {{ file.IsBin ? '' : file.Addition + file.Deletion }} - <span v-if="!file.IsBin" class="diff-stats-bar tooltip mx-3" :data-content="statisticsMessage.replace('%d', (file.Addition + file.Deletion)).replace('%d', file.Addition).replace('%d', file.Deletion)"> + <span v-if="!file.IsBin" class="diff-stats-bar tooltip gt-mx-3" :data-content="statisticsMessage.replace('%d', (file.Addition + file.Deletion)).replace('%d', file.Addition).replace('%d', file.Deletion)"> <div class="diff-stats-add-bar" :style="{ 'width': diffStatsWidth(file.Addition, file.Deletion) }" /> </span> </div> <!-- todo finish all file status, now modify, add, delete and rename --> <span :class="['status', diffTypeToString(file.Type), 'tooltip']" :data-content="diffTypeToString(file.Type)" data-position="right center"> </span> - <a class="file mono" :href="'#diff-' + file.NameHash">{{ file.Name }}</a> + <a class="file gt-mono" :href="'#diff-' + file.NameHash">{{ file.Name }}</a> </li> - <li v-if="isIncomplete" id="diff-too-many-files-stats" class="pt-2"> - <span class="file df ac sb">{{ tooManyFilesMessage }} + <li v-if="isIncomplete" id="diff-too-many-files-stats" class="gt-pt-2"> + <span class="file gt-df gt-ac gt-sb">{{ tooManyFilesMessage }} <a :class="['ui', 'basic', 'tiny', 'button', isLoadingNewData === true ? 'disabled' : '']" id="diff-show-more-files-stats" @click.stop="loadMoreData">{{ showMoreMessage }}</a> </span> </li> diff --git a/web_src/js/components/DiffFileTree.vue b/web_src/js/components/DiffFileTree.vue index 6d77b20241..3742f3a53f 100644 --- a/web_src/js/components/DiffFileTree.vue +++ b/web_src/js/components/DiffFileTree.vue @@ -1,14 +1,14 @@ <template> <div v-if="fileTreeIsVisible" - class="mr-3 mt-3 diff-detail-box" + class="gt-mr-3 gt-mt-3 diff-detail-box" > <!-- only render the tree if we're visible. in many cases this is something that doesn't change very often --> <div class="ui list"> <DiffFileTreeItem v-for="item in fileTree" :key="item.name" :item="item" /> </div> - <div v-if="isIncomplete" id="diff-too-many-files-stats" class="pt-2"> - <span class="mr-2">{{ tooManyFilesMessage }}</span><a :class="['ui', 'basic', 'tiny', 'button', isLoadingNewData === true ? 'disabled' : '']" id="diff-show-more-files-stats" @click.stop="loadMoreData">{{ showMoreMessage }}</a> + <div v-if="isIncomplete" id="diff-too-many-files-stats" class="gt-pt-2"> + <span class="gt-mr-2">{{ tooManyFilesMessage }}</span><a :class="['ui', 'basic', 'tiny', 'button', isLoadingNewData === true ? 'disabled' : '']" id="diff-show-more-files-stats" @click.stop="loadMoreData">{{ showMoreMessage }}</a> </div> </div> </template> diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue index 40d56b2262..245286dded 100644 --- a/web_src/js/components/DiffFileTreeItem.vue +++ b/web_src/js/components/DiffFileTreeItem.vue @@ -1,6 +1,6 @@ <template> <div v-show="show"> - <div class="item" :class="item.isFile ? 'filewrapper p-1' : ''"> + <div class="item" :class="item.isFile ? 'filewrapper gt-p-1' : ''"> <!-- Files --> <SvgIcon v-if="item.isFile" @@ -10,7 +10,7 @@ /> <a v-if="item.isFile" - class="file ellipsis muted" + class="file gt-ellipsis muted" :href="item.isFile ? '#diff-' + item.file.NameHash : ''" >{{ item.name }}</a> <SvgIcon @@ -21,7 +21,7 @@ /> <!-- Directories --> - <div v-if="!item.isFile" class="directory p-1" @click.stop="handleClick(item.isFile)"> + <div v-if="!item.isFile" class="directory gt-p-1" @click.stop="handleClick(item.isFile)"> <SvgIcon class="svg-icon" :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'" @@ -30,7 +30,7 @@ class="svg-icon directory" name="octicon-file-directory-fill" /> - <span class="ellipsis">{{ item.name }}</span> + <span class="gt-ellipsis">{{ item.name }}</span> </div> <div v-show="!collapsed"> <DiffFileTreeItem v-for="childItem in item.children" :key="childItem.name" :item="childItem" class="list" /> diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue index 1e0ebc5a47..2e10ce2531 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -47,14 +47,14 @@ {{ mergeForm.textCancel }} </button> - <div class="ui checkbox ml-2" v-if="mergeForm.isPullBranchDeletable && !autoMergeWhenSucceed"> + <div class="ui checkbox gt-ml-2" v-if="mergeForm.isPullBranchDeletable && !autoMergeWhenSucceed"> <input name="delete_branch_after_merge" type="checkbox" v-model="deleteBranchAfterMerge" id="delete-branch-after-merge"> <label for="delete-branch-after-merge">{{ mergeForm.textDeleteBranch }}</label> </div> </form> </div> - <div v-if="!showActionForm" class="df"> + <div v-if="!showActionForm" class="gt-df"> <!-- the merge button --> <div class="ui buttons merge-button" :class="[mergeForm.emptyCommit ? 'grey' : mergeForm.allOverridableChecksOk ? 'green' : 'red']" @click="toggleActionForm(true)" > <button class="ui button"> @@ -95,7 +95,7 @@ </div> <!-- the cancel auto merge button --> - <form v-if="mergeForm.hasPendingPullRequestMerge" :action="mergeForm.baseLink+'/cancel_auto_merge'" method="post" class="ml-4"> + <form v-if="mergeForm.hasPendingPullRequestMerge" :action="mergeForm.baseLink+'/cancel_auto_merge'" method="post" class="gt-ml-4"> <input type="hidden" name="_csrf" :value="csrfToken"> <button class="ui button"> {{ mergeForm.textAutoMergeCancelSchedule }} diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 58019e9df1..deb071da5a 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -42,15 +42,15 @@ <div class="job-step-container"> <div class="job-step-section" v-for="(jobStep, i) in currentJob.steps" :key="i"> <div class="job-step-summary" @click.stop="toggleStepLogs(i)"> - <SvgIcon name="octicon-chevron-down" class="mr-3" v-show="currentJobStepsStates[i].expanded"/> - <SvgIcon name="octicon-chevron-right" class="mr-3" v-show="!currentJobStepsStates[i].expanded"/> - - <SvgIcon name="octicon-check-circle-fill" class="green mr-3" v-if="jobStep.status === 'success'"/> - <SvgIcon name="octicon-skip" class="ui text grey mr-3" v-else-if="jobStep.status === 'skipped'"/> - <SvgIcon name="octicon-clock" class="ui text yellow mr-3" v-else-if="jobStep.status === 'waiting'"/> - <SvgIcon name="octicon-blocked" class="ui text yellow mr-3" v-else-if="jobStep.status === 'blocked'"/> - <SvgIcon name="octicon-meter" class="ui text yellow mr-3" class-name="job-status-rotate" v-else-if="jobStep.status === 'running'"/> - <SvgIcon name="octicon-x-circle-fill" class="red mr-3 " v-else/> + <SvgIcon name="octicon-chevron-down" class="gt-mr-3" v-show="currentJobStepsStates[i].expanded"/> + <SvgIcon name="octicon-chevron-right" class="gt-mr-3" v-show="!currentJobStepsStates[i].expanded"/> + + <SvgIcon name="octicon-check-circle-fill" class="green gt-mr-3" v-if="jobStep.status === 'success'"/> + <SvgIcon name="octicon-skip" class="ui text grey gt-mr-3" v-else-if="jobStep.status === 'skipped'"/> + <SvgIcon name="octicon-clock" class="ui text yellow gt-mr-3" v-else-if="jobStep.status === 'waiting'"/> + <SvgIcon name="octicon-blocked" class="ui text yellow gt-mr-3" v-else-if="jobStep.status === 'blocked'"/> + <SvgIcon name="octicon-meter" class="ui text yellow gt-mr-3" class-name="job-status-rotate" v-else-if="jobStep.status === 'running'"/> + <SvgIcon name="octicon-x-circle-fill" class="red gt-mr-3 " v-else/> <span class="step-summary-msg">{{ jobStep.summary }}</span> <span class="step-summary-dur">{{ jobStep.duration }}</span> |