2
0
mirror of https://github.com/tenrok/vue-select.git synced 2026-05-17 02:29:37 +03:00

Drop theme prop, move theme CSS to App.vue, replace .alert class with .selected-tag

This commit is contained in:
Owen Conti
2016-03-14 06:09:55 -06:00
parent 2154a4f439
commit f9f92cde8a
4 changed files with 22248 additions and 52 deletions
+22208 -4
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>vue-select</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.1/animate.min.css">
<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.1/animate.min.css"> -->
<link rel="stylesheet" href="dist/prism.css">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
</head>
+23
View File
@@ -32,6 +32,29 @@
color: #404040;
}
/* Cyan theme */
#v-select .selected-tag {
color: #147688;
background-color: #d7f3f9;
border-color: #91ddec;
}
#v-select.dropdown.open .dropdown-toggle,
#v-select.dropdown.open .dropdown-menu {
border-color: #4CC3D9;
}
#v-select .active a {
background: rgba(50,50,50,.1);
color: #333;
}
#v-select.dropdown .highlight a,
#v-select.dropdown li:hover a {
background: #4CC3D9;
color: #fff;
}
#output {
height: 200px;
border: none;
+16 -47
View File
@@ -3,6 +3,11 @@
position: relative;
}
.open .dropdown-toggle,
.open .dropdown-menu {
border-color: rgba(60,60,60,.26);
}
.open-indicator {
position: absolute;
top: 10px;
@@ -45,7 +50,11 @@
border-top-right-radius: 0;
}
.alert {
.selected-tag {
color: #333;
background-color: #f0f0f0;
border: 1px solid #ccc;
border-radius: 4px;
height: 26px;
margin: 4px 1px 0px 3px;
padding: 0 0.25em;
@@ -53,7 +62,7 @@
line-height: 1.7em;
}
.alert .close {
.selected-tag .close {
float: none;
margin-right: 0;
font-size: 20px;
@@ -82,51 +91,16 @@
cursor: pointer;
}
/* Default theme */
.theme-default .alert {
color: #333;
background-color: #f0f0f0;
border-color: #ccc;
}
.theme-default.dropdown.open .dropdown-toggle,
.theme-default.dropdown.open .dropdown-menu {
border-color: rgba(60,60,60,.26);
}
.theme-default .active a {
.active a {
background: rgba(50,50,50,.1);
color: #333;
}
.theme-default .highlight a,
.theme-default li:hover a {
.highlight a,
li:hover a {
background: #f0f0f0;
color: #333;
}
/* Cyan theme */
.theme-cyan .alert {
color: #147688;
background-color: #d7f3f9;
border-color: #91ddec;
}
.theme-cyan.dropdown.open .dropdown-toggle,
.theme-cyan.dropdown.open .dropdown-menu {
border-color: #4CC3D9;
}
.theme-cyan .active a {
background: rgba(50,50,50,.1);
color: #333;
}
.theme-cyan.dropdown .highlight a,
.theme-cyan.dropdown li:hover a {
background: #4CC3D9;
color: #fff;
}
</style>
<template>
@@ -136,7 +110,7 @@
{{ placeholder }}
</span>
<span class="alert" v-for="option in valueAsArray">
<span class="selected-tag" v-for="option in valueAsArray">
{{ getOptionLabel(option) }}
<button v-if="multiple" @click="select(option)" type="button" class="close">
<span aria-hidden="true">&times;</span>
@@ -185,10 +159,6 @@
type: Array,
default() { return [] },
},
theme: {
type: String,
default: 'default'
},
maxHeight: {
type: String,
default: '400px'
@@ -333,8 +303,7 @@
cssClasses() {
return {
open: this.open,
searchable: this.searchable,
[this.theme]: this.theme
searchable: this.searchable
}
},