vendor/assets/stylesheets/bootstrap-editable.scss in bootstrap-x-editable-rails-1.4.1 vs vendor/assets/stylesheets/bootstrap-editable.scss in bootstrap-x-editable-rails-1.4.3

- old
+ new

@@ -1,6 +1,6 @@ -/*! X-editable - v1.4.1 +/*! X-editable - v1.4.3 * In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery * http://github.com/vitalets/x-editable * Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */ .editableform { @@ -8,10 +8,11 @@ } .editableform .control-group { margin-bottom: 0; /* overwrites bootstrap margin */ white-space: nowrap; /* prevent wrapping buttons on new line */ + line-height: 20px; /* overwriting bootstrap line-height. See #133 */ } .editable-buttons { display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */ vertical-align: top; @@ -109,10 +110,11 @@ width: 13px; height: 13px; position: absolute; opacity: 0.6; z-index: 100; + } .editable-clear-x:hover { opacity: 1; } @@ -165,11 +167,18 @@ .editable-unsaved:after { /* content: '*'*/ } +/*see https://github.com/vitalets/x-editable/issues/139 */ +.form-horizontal .editable +{ + padding-top: 5px; + display:inline-block; +} + /*! * Datepicker for Bootstrap * * Copyright 2012 Stefan Petre * Improvements by Andrew Rowls @@ -449,9 +458,19 @@ cursor: pointer; } .datepicker thead tr:first-child th:hover, .datepicker tfoot tr:first-child th:hover { background: #eeeeee; +} +.datepicker .cw { + font-size: 10px; + width: 12px; + padding: 0 2px 0 5px; + vertical-align: middle; +} +.datepicker thead tr:first-child th.cw { + cursor: default; + background-color: transparent; } .input-append.date .add-on i, .input-prepend.date .add-on i { display: block; cursor: pointer;