Skip to content

Commit 3e7dfc9

Browse files
committed
styles: add bootstrap styles to .form-control and buttons
1 parent 9fc302d commit 3e7dfc9

File tree

2 files changed

+50
-23
lines changed

2 files changed

+50
-23
lines changed

dev/index.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
<meta charset="utf-8">
55
<title>vue-form-generator development</title>
66
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.1/css/font-awesome.css">
7-
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.css">
7+
<!--link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.css">
88
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.10.0/css/bootstrap-select.min.css">
9-
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.css">
9+
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.css"-->
1010
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.css">
1111
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/ion-rangeslider/2.1.4/css/ion.rangeSlider.css">
1212
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/ion-rangeslider/2.1.4/css/ion.rangeSlider.skinHTML5.css">
1313

1414
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.3/jquery.js"></script>
1515
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
1616

17-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.js"></script>
17+
<!-- script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.js"></script>
1818
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.10.0/js/bootstrap-select.min.js"></script>
19-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"></script>
19+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"></script -->
2020
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.js"></script>
2121
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.maskedinput/1.4.1/jquery.maskedinput.js"></script>
2222
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ion-rangeslider/2.1.4/js/ion.rangeSlider.js"></script>

src/formGenerator.vue

+46-19
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,20 @@
164164
165165
fieldset.vue-form-generator {
166166
167-
input, select, textarea {
168-
border-radius: 4px;
169-
border: 1px solid #BBB;
170-
padding: 2px 5px;
167+
.form-control {
168+
// Default Bootstrap .form-control style
169+
display: block;
171170
width: 100%;
171+
padding: 6px 12px;
172+
font-size: 14px;
173+
line-height: 1.42857143;
174+
color: #555;
175+
background-color: #fff;
176+
background-image: none;
177+
border: 1px solid #ccc;
178+
border-radius: 4px;
179+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
180+
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
172181
}
173182
174183
span.help {
@@ -210,20 +219,6 @@
210219
width: 100%;
211220
}
212221
213-
/* CSS Triangles - see Trevor's post */
214-
/*.helpText:after {
215-
border-left: solid transparent 10px;
216-
border-right: solid transparent 10px;
217-
border-top: solid #1496bb 10px;
218-
bottom: -10px;
219-
content: " ";
220-
height: 0;
221-
left: 50%;
222-
margin-left: -13px;
223-
position: absolute;
224-
width: 0;
225-
}*/
226-
227222
&:hover .helpText {
228223
opacity: 1;
229224
pointer-events: auto;
@@ -236,9 +231,41 @@
236231
237232
.buttons {
238233
white-space: nowrap;
234+
239235
button {
236+
237+
// Default Bootstrap button style
240238
display: inline-block;
241-
margin: 0 2px;
239+
padding: 6px 12px;
240+
margin: 0px;
241+
margin-left: 4px;
242+
font-size: 14px;
243+
font-weight: normal;
244+
line-height: 1.42857143;
245+
text-align: center;
246+
white-space: nowrap;
247+
vertical-align: middle;
248+
touch-action: manipulation;
249+
cursor: pointer;
250+
user-select: none;
251+
color: #333;
252+
background-color: #fff;
253+
border: 1px solid #ccc;
254+
border-radius: 4px;
255+
256+
&:hover {
257+
color: #333;
258+
background-color: #e6e6e6;
259+
border-color: #adadad;
260+
}
261+
262+
&:active {
263+
color: #333;
264+
background-color: #d4d4d4;
265+
border-color: #8c8c8c;
266+
outline: 0;
267+
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
268+
}
242269
}
243270
}
244271
}

0 commit comments

Comments
 (0)