X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=css-bootstrap%2Fbootstrap.css;h=b58e7ac18f2e768b05440641f2431da79f794328;hb=df2668ee967ea69a2d16ead1f90684216e8a2b43;hp=b5cb8e727e1096cb523583f823cf7d71e30bceaf;hpb=42fd850d94c1e5603d3a5297dc90d91963deb194;p=roojs1 diff --git a/css-bootstrap/bootstrap.css b/css-bootstrap/bootstrap.css index b5cb8e727e..b58e7ac18f 100644 --- a/css-bootstrap/bootstrap.css +++ b/css-bootstrap/bootstrap.css @@ -1,12 +1,11 @@ +/* +* Consider remove or merge these... +*/ /*! * Bootstrap v3.4.0 (http://getbootstrap.com) * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -/* - * CAUTION! - * This CSS file is auto generated. Please edit the .less instead! - */ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; @@ -187,14 +186,16 @@ th { } /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ @media print { - *, - *:before, - *:after { - background: transparent !important; - color: #000 !important; - box-shadow: none !important; - text-shadow: none !important; - } + /* + *, + *:before, + *:after { + background: transparent !important; + color: #000 !important; // Black prints faster: h5bp.com/s + box-shadow: none !important; + text-shadow: none !important; + } +*/ a, a:visited { text-decoration: underline; @@ -258,8 +259,8 @@ th { } @font-face { font-family: 'Glyphicons Halflings'; - src: url('fonts/glyphicons-halflings-regular.eot'); - src: url('fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('fonts/glyphicons-halflings-regular.woff') format('woff'), url('fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../fonts/glyphicons-halflings-regular.eot'); + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; @@ -2258,6 +2259,7 @@ th { width: 100%; max-width: 100%; margin-bottom: 20px; + border-bottom: 1px solid #dddddd; } .table > thead > tr > th, .table > tbody > tr > th, @@ -2632,10 +2634,10 @@ input[type="search"] { margin-top: 10px; margin-bottom: 10px; } -.radio label, -.checkbox label { +.radio label.box-label, +.checkbox label.box-label { min-height: 20px; - padding-left: 20px; + padding-left: 5px; margin-bottom: 0; font-weight: normal; cursor: pointer; @@ -3457,6 +3459,11 @@ input[type="reset"].btn-block, input[type="button"].btn-block { width: 100%; } +.x-btn-text-icon .x-btn-center .x-btn-text-no-padding { + background-position: 0 2px; + background: none no-repeat scroll 0 0 transparent; + padding: 1px 0px 1px; +} .fade { opacity: 0; -webkit-transition: opacity 0.15s linear; @@ -3980,11 +3987,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn { background-color: #eeeeee; } .nav > li.disabled > a { - color: #777777; + color: #eeeeee; } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { - color: #777777; + color: #eeeeee; text-decoration: none; background-color: transparent; cursor: not-allowed; @@ -6728,3 +6735,4 @@ button.close { display: none !important; } } +/*# sourceMappingURL=bootstrap.css.map */ \ No newline at end of file