diff --git a/css/main.css b/css/main.css index d643f0a0..0cc9a00d 100644 --- a/css/main.css +++ b/css/main.css @@ -1,6 +1,5 @@ body { - background-image: url(../img/honeycomb.png); - background-repeat: repeat; + background-color: #f5f5f5; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -8,16 +7,111 @@ body { user-select: none; } +/* +Override Bootstrap +*/ +div, span, a, ul, li, textarea, input { + background-image: none !important; + filter: none !important; + -webkit-box-shadow: none !important; + -moz-box-shadow: none !important; + box-shadow: none !important; + text-shadow: none !important; +} + +.btn, .navbar-inner, .well, textarea, input { + border: none !important; +} + +.navbar-inner .btn { + background-color: #ddd; +} + +.navbar-inner .btn:hover, +.navbar-inner .btn:focus, +.navbar-inner .btn:active, +.navbar-inner .btn.active, +.btn-group.open .btn.dropdown-toggle { + color: #333333; + background-color: #eee; +} + +.navbar-inner .btn.disabled, +.navbar-inner .btn[disabled] { + color: #333333; + background-color: #ddd; + opacity: 0.3; + filter: alpha(opacity=30); +} + +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a, +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { + background-color: #999; +} + +.btn-primary { + background-color: #888; +} + +.btn-primary:hover, +.btn-primary:focus, +.btn-primary:active, +.btn-primary.active, +.btn-primary.disabled, +.btn-primary[disabled] { + background-color: #999; +} + +.btn-group { + margin-left: 5px !important; + margin-right: 5px !important; +} + +.btn-group > .btn + .dropdown-toggle { + padding-right: 12px; + padding-left: 12px; +} + +.navbar-inner { + background-color: #ddd !important; +} + +code { + color: #333333 !important; +} + +h1 { + margin: 50px 0 20px; +} + +h2 { + margin-top: 30px; +} + +p, pre, blockquote { + margin: 0 0 20px; +} + +hr { + border-top: 1px solid #ddd; + margin: 30px 0; +} + #navbar { position: static; } #menu-bar { - margin-right: 20px; + margin-right: 15px; } #wmd-button-bar { - margin-left: 20px; + margin-left: 15px; } #wmd-input,#wmd-preview { @@ -39,7 +133,7 @@ body { } .wmd-spacer { - margin: 0 5px; + margin: 0 10px; display: inline-block; } @@ -69,13 +163,6 @@ body { font-weight: bold; } -.ui-layout-center,.ui-layout-east,.ui-layout-south { - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1) !important; - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1) !important; - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1) !important; - border-color: #cccccc !important; -} - .icon-code { background-position: -384px -168px; } @@ -107,18 +194,8 @@ body { margin: 13px 15px 0; } -.ui-layout-toggler-north { - margin-top: -3px !important; - height: 18px !important; -} - -.ui-layout-toggler-south { - margin-top: 3px !important; - height: 18px !important; -} - -.ui-layout-toggler-south .caret { - margin-top: 6px; +.ui-layout-toggler-north .caret, .ui-layout-toggler-south .caret { + margin-top: 5px; } .ui-layout-toggler-north-open .caret,.ui-layout-toggler-south-closed .caret @@ -137,11 +214,6 @@ body { border-bottom: 0; } -.ui-layout-toggler-east { - margin-left: 3px !important; - width: 18px !important; -} - .ui-layout-toggler-east .caret,.ui-layout-toggler-west .caret { margin-top: 40px; } diff --git a/img/glyphicons-halflings.png b/img/glyphicons-halflings.png index 84d1e328..215f90cf 100644 Binary files a/img/glyphicons-halflings.png and b/img/glyphicons-halflings.png differ diff --git a/img/honeycomb.png b/img/honeycomb.png deleted file mode 100644 index 00d3988b..00000000 Binary files a/img/honeycomb.png and /dev/null differ diff --git a/index.html b/index.html index aa80113a..1acea2d4 100644 --- a/index.html +++ b/index.html @@ -63,13 +63,11 @@ data-toggle="dropdown" href="#" title="Menu">