rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

update the file input to undo the damage of the generic input selector

Browse Source
This commit is contained in:
Mark Otto 2011-09-02 11:53:58 -07:00
parent a4dc2c8955
commit 62f8916407
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bootstrap-1.2.0.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Sep 2 09:52:17 PDT 2011 * Date: Fri Sep 2 11:52:53 PDT 2011
*/ */
/* Reset.less /* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@ -658,10 +658,10 @@ select,
.uneditable-input { .uneditable-input {
display: inline-block; display: inline-block;
width: 210px; width: 210px;
height: 18px;
padding: 4px; padding: 4px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
height: 18px;
color: #808080; color: #808080;
border: 1px solid #ccc; border: 1px solid #ccc;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
@ -671,14 +671,17 @@ select,
/* mini reset for non-html5 file types */ /* mini reset for non-html5 file types */
input[type=checkbox], input[type=radio] { input[type=checkbox], input[type=radio] {
width: auto; width: auto;
padding: 0;
line-height: normal;
height: auto; height: auto;
padding: 0;
margin: 3px 0; margin: 3px 0;
line-height: normal;
border: none;
} }
input[type=file] { input[type=file] {
border: 0; background-color: #fff;
padding: 0; padding: initial;
border: initial;
line-height: initial;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;

6
bootstrap-1.2.0.min.css vendored
View File

@ -106,9 +106,9 @@ label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-se
label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
div.input{margin-left:150px;} div.input{margin-left:150px;}
input[type=checkbox],input[type=radio]{cursor:pointer;} input[type=checkbox],input[type=radio]{cursor:pointer;}
input,textarea,select,.uneditable-input{display:inline-block;width:210px;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
input[type=checkbox],input[type=radio]{width:auto;padding:0;line-height:normal;height:auto;margin:3px 0;} input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;line-height:normal;border:none;}
input[type=file]{border:0;padding:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=file]{background-color:#fff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
select,input[type=file]{height:27px;line-height:27px;} select,input[type=file]{height:27px;line-height:27px;}
textarea{height:auto;} textarea{height:auto;}

13
lib/forms.less
View File

@ -67,10 +67,10 @@ select,
.uneditable-input { .uneditable-input {
display: inline-block; display: inline-block;
width: 210px; width: 210px;
height: @baseline;
padding: 4px; padding: 4px;
font-size: 13px; font-size: 13px;
line-height: @baseline; line-height: @baseline;
height: @baseline;
color: @gray; color: @gray;
border: 1px solid #ccc; border: 1px solid #ccc;
.border-radius(3px); .border-radius(3px);
@ -80,15 +80,18 @@ select,
input[type=checkbox], input[type=checkbox],
input[type=radio] { input[type=radio] {
width: auto; width: auto;
padding: 0;
line-height: normal;
height: auto; height: auto;
padding: 0;
margin: 3px 0; margin: 3px 0;
line-height: normal;
border: none;
} }
input[type=file] { input[type=file] {
border: 0; background-color: #fff;
padding: 0; padding: initial;
border: initial;
line-height: initial;
.box-shadow(none); .box-shadow(none);
} }