Commit 55039792 authored by ganjingcun's avatar ganjingcun

css update

parent f48746c4
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>ygopro-arena-web-new</title> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>ygopro</title>
<link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="./assets/css/styles.css"> <link rel="stylesheet" href="./assets/css/styles.css">
<link rel="stylesheet" href="./assets/css/font-awesome.min.css">
</head> </head>
<body> <body>
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
import "./assets/css/Projects-Clean.css" import "./assets/css/Projects-Clean.css"
import "./assets/css/Pretty-Search-Form.css" import "./assets/css/Pretty-Search-Form.css"
// import "./assets/css/styles.css" // import "./assets/css/styles.css"
import "./assets/css/font-awesome.min.css" // import "./assets/css/font-awesome.min.css"
import "./assets/fonts/material-icons.css"
//js //js
window.jQuery = window.$ = require('jquery'); window.jQuery = window.$ = require('jquery');
......
This source diff could not be displayed because it is too large. You can view the blob instead.
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
url(MaterialIcons-Regular.woff2) format('woff2'),
url(MaterialIcons-Regular.woff) format('woff'),
url(MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 24px; /* Preferred icon size */
display: inline-block;
width: 1em;
height: 1em;
line-height: 1;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
white-space: nowrap;
direction: ltr;
/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;
/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;
/* Support for IE. */
font-feature-settings: 'liga';
}
...@@ -43,30 +43,31 @@ ...@@ -43,30 +43,31 @@
<i class="el-icon-edit" @click.prevent="dialogFormVisible = true">编辑</i> <i class="el-icon-edit" @click.prevent="dialogFormVisible = true">编辑</i>
</div> </div>
<el-dialog :title="username" v-model="dialogFormVisible"> <el-dialog :title="username" size="large" v-model="dialogFormVisible">
<el-form :model="form"> <el-form :model="form">
<el-form-item label="图片URL" :label-width="formLabelWidth"> <el-form-item label="URL" :label-width="formLabelWidth">
<el-input v-model="avatar_url" auto-complete="off"></el-input> <el-input v-model="avatar_url" auto-complete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="下拉类型" :label-width="formLabelWidth"> <el-form-item label="类型" :label-width="formLabelWidth">
<el-select v-model="form.region" placeholder="请选择类型"> <el-select v-model="form.region" placeholder="请选择类型">
<el-option label="一" value="shanghai"></el-option> <el-option label="一" value="shanghai"></el-option>
<el-option label="二" value="beijing"></el-option> <el-option label="二" value="beijing"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="卡组描述" :label-width="formLabelWidth"> <el-form-item label="描述" :label-width="formLabelWidth">
<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 6}" placeholder="请输入内容" v-model="form.desc"> <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 6}" placeholder="请输入内容" v-model="form.desc">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button> <el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="submitModify">确 定</el-button> <el-button type="primary" @click="submitModify">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -109,7 +110,7 @@ ...@@ -109,7 +110,7 @@
resource: '', resource: '',
desc: '' desc: ''
}, },
formLabelWidth: '120px', formLabelWidth: '40px',
isNew: true, isNew: true,
searchText: "", searchText: "",
......
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