Skip to content

Commit

Permalink
fix problem list styles; fix dropdown menu bug
Browse files Browse the repository at this point in the history
  • Loading branch information
zema1 committed Apr 22, 2018
1 parent 21bcf15 commit 0c30031
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"element-ui": "^2.0.9",
"font-awesome": "^4.7.0",
"highlight.js": "^9.12.0",
"iview": "^2.8.0",
"iview": "^2.13.0",
"moment": "^2.20.1",
"papaparse": "^4.3.6",
"raven-js": "^3.21.0",
Expand Down
8 changes: 4 additions & 4 deletions src/pages/oj/components/NavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@

<style lang="less" scoped>
#header {
min-width: 1100px;
position: fixed;
overflow: hidden;
top: 0;
left: 0;
height: 60px;
Expand All @@ -151,10 +151,10 @@
}
.drop-menu {
float: right;
margin-right: 40px;
position: absolute;
right: 10px;
&-title {
font-size: 18px;
font-size: 16px;
}
}
.btn-menu {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/oj/components/mixins/problem.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default {
return
}
tableColumns.splice(0, 0, {
width: '60',
width: 60,
title: ' ',
render: (h, params) => {
let status = params.row.my_status
Expand Down
3 changes: 2 additions & 1 deletion src/pages/oj/views/contest/ContestList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</div>
<p id="no-contest" v-if="contests.length == 0">No contest</p>
<ol id="contest-list">
<li v-for="contest in contests">
<li v-for="contest in contests" :key="contest.title">
<Row type="flex" justify="space-between" align="middle">
<img class="trophy" src="../../../../assets/Cup.png"/>
<Col :span="18" class="contest-main">
Expand Down Expand Up @@ -197,6 +197,7 @@
> li {
padding: 20px;
border-bottom: 1px solid rgba(187, 187, 187, 0.5);
list-style: none;
.trophy {
height: 40px;
Expand Down
3 changes: 2 additions & 1 deletion src/pages/oj/views/general/Announcements.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</div>
<template v-if="listVisible">
<ul class="announcements-container" key="list">
<li v-for="announcement, index in announcements">
<li v-for="announcement in announcements" :key="announcement.title">
<div class="flex-container">
<div class="title"><a class="entry" @click="goAnnouncement(announcement)">
{{announcement.title}}</a></div>
Expand Down Expand Up @@ -126,6 +126,7 @@
margin-bottom: 10px;
li {
padding-top: 15px;
list-style: none;
padding-bottom: 15px;
margin-left: 20px;
font-size: 16px;
Expand Down
4 changes: 2 additions & 2 deletions src/pages/oj/views/problem/ProblemList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
{
title: '#',
key: '_id',
width: 80,
render: (h, params) => {
return h('Button', {
props: {
Expand All @@ -110,7 +111,6 @@
},
{
title: 'Title',
width: '35%',
render: (h, params) => {
return h('Button', {
props: {
Expand Down Expand Up @@ -236,7 +236,7 @@
{
title: 'Tags',
align: 'center',
width: '200px',
width: 200,
render: (h, params) => {
let tags = []
params.row.tags.forEach(tag => {
Expand Down

0 comments on commit 0c30031

Please sign in to comment.