Skip to content

Commit

Permalink
fix(style): el-select height of feed tab
Browse files Browse the repository at this point in the history
improve(style): status change style of feed page

improve(style): feed page
  • Loading branch information
Map1en committed Dec 17, 2024
1 parent cdf5688 commit cb22cd0
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions html/src/mixins/tabs/feed.pug
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mixin feedTab()
div(style="flex:none;margin-right:10px")
el-tooltip(placement="bottom" :content="$t('view.feed.favorites_only_tooltip')" :disabled="hideTooltips")
el-switch(v-model="feedTable.vip" @change="feedTableLookup" active-color="#13ce66")
el-select(v-model="feedTable.filter" @change="feedTableLookup" multiple clearable style="flex:1" :placeholder="$t('view.feed.filter_placeholder')")
el-select(v-model="feedTable.filter" @change="feedTableLookup" multiple clearable style="flex:1;height:40px;" :placeholder="$t('view.feed.filter_placeholder')")
el-option(v-once v-for="type in ['GPS', 'Online', 'Offline', 'Status', 'Avatar', 'Bio']" :key="type" :label="type" :value="type")
el-input(v-model="feedTable.search" :placeholder="$t('view.feed.search_placeholder')" @keyup.native.13="feedTableLookup" @change="feedTableLookup" clearable style="flex:none;width:150px;margin:0 10px")
el-table-column(type="expand" width="20")
Expand Down Expand Up @@ -51,7 +51,7 @@ mixin feedTab()
span(v-else-if="scope.row.previousStatus === 'busy'") {{ $t('dialog.user.status.busy') }}
span(v-else) {{ $t('dialog.user.status.offline') }}
i.x-user-status(:class="statusClass(scope.row.previousStatus)")
span(v-text="scope.row.previousStatusDescription")
span(v-text="scope.row.previousStatusDescription" style="margin-left:5px")
br
span
i.el-icon-right
Expand All @@ -62,7 +62,7 @@ mixin feedTab()
span(v-else-if="scope.row.status === 'ask me'") {{ $t('dialog.user.status.ask_me') }}
span(v-else-if="scope.row.status === 'busy'") {{ $t('dialog.user.status.busy') }}
span(v-else) {{ $t('dialog.user.status.offline') }}
i.x-user-status(:class="statusClass(scope.row.status)")
i.x-user-status(:class="statusClass(scope.row.status)" style="margin:0 5px")
span(v-text="scope.row.statusDescription")
template(v-else-if="scope.row.type === 'Bio'")
template(v-for="(bio,idx) in formatDifference(scope.row.previousBio, scope.row.bio)")
Expand Down Expand Up @@ -95,7 +95,7 @@ mixin feedTab()
span(v-else-if="scope.row.previousStatus === 'busy'") {{ $t('dialog.user.status.busy') }}
span(v-else) {{ $t('dialog.user.status.offline') }}
i.x-user-status(:class="statusClass(scope.row.previousStatus)")
span
span(style="margin:0 5px")
i.el-icon-right
el-tooltip(placement="top")
template(#content)
Expand All @@ -113,8 +113,7 @@ mixin feedTab()
span(v-else-if="scope.row.status === 'ask me'") {{ $t('dialog.user.status.ask_me') }}
span(v-else-if="scope.row.status === 'busy'") {{ $t('dialog.user.status.busy') }}
span(v-else) {{ $t('dialog.user.status.offline') }}
i.x-user-status(:class="statusClass(scope.row.status)")
span ‎
i.x-user-status(:class="statusClass(scope.row.status)" style="margin-right:3px")
span(v-text="scope.row.statusDescription")
template(v-else-if="scope.row.type === 'Avatar'")
avatar-info(:imageurl="scope.row.currentAvatarImageUrl" :userid="scope.row.userId" :hintownerid="scope.row.ownerId" :hintavatarname="scope.row.avatarName" :avatartags="scope.row.currentAvatarTags")
Expand Down

0 comments on commit cb22cd0

Please sign in to comment.