Merge branch 'master' into newmc

diff --git a/css/custom.css b/css/custom.css
index 5f6a8e43696f45d658e99ddd2145348f353aea2e..f12650dbf340323357420689fae1ada1c8821db0 100644 (file)
--- a/css/custom.css
+++ b/css/custom.css
@@ -1,3 +1,8 @@
+body {
+       padding-left: 15px;
+       padding-right: 15px;
+}
+
 h1#title{
        font-weight: bold;
        text-align: center;
@@ -63,3 +68,19 @@ td.user, td.owner, .break-all {
 .transition-color, .transition-color * {
        transition: color 0.5s ease-in, background-color 0.5s ease-in;
 }
+
+@media (min-width:768px) {
+       #content {
+               float: left;
+               width: 75%;
+       }
+
+       #sidebar {
+               float: right;
+               width: 23%
+       }
+
+       footer {
+               clear: both;
+       }
+}
\ No newline at end of file

diff --git a/css/mindcoding.css b/css/mindcoding.css
index 6965804e5572333fbdd373180c38d34510747c87..70cd5f54247878d2605ca5877b8f54c47ddb2634 100644 (file)
--- a/css/mindcoding.css
+++ b/css/mindcoding.css
@@ -9,3 +9,15 @@ footer {
 #sponsors a.logo {
        margin-bottom: 1em;
 }
+
+@media (min-width:768px) {
+       .left-half {
+               float: left;
+               width: 49%;
+       }
+
+       .right-half {
+               float: right;
+               width: 49%;
+       }
+}

diff --git a/css/themes/cyborg.css b/css/themes/cyborg.css
index ca686c958c9f4d068661d6497c4ab081a84b943d..7d28ae37a62349af60915148445f5f3d247f0865 100644 (file)
--- a/css/themes/cyborg.css
+++ b/css/themes/cyborg.css
@@ -360,13 +360,7 @@ h2,
 h3,
 h4,
 h5,
-h6,
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6 {
+h6 {
   font-family: sans-serif;
   font-weight: 500;
   line-height: 1.1;
@@ -377,97 +371,49 @@ h2 small,
 h3 small,
 h4 small,
 h5 small,
-h6 small,
-.h1 small,
-.h2 small,
-.h3 small,
-.h4 small,
-.h5 small,
-.h6 small,
-h1 .small,
-h2 .small,
-h3 .small,
-h4 .small,
-h5 .small,
-h6 .small,
-.h1 .small,
-.h2 .small,
-.h3 .small,
-.h4 .small,
-.h5 .small,
-.h6 .small {
+h6 small {
   font-weight: normal;
   line-height: 1;
   color: #888888;
 }
 h1,
-.h1,
 h2,
-.h2,
-h3,
-.h3 {
+h3 {
   margin-top: 20px;
   margin-bottom: 10px;
 }
 h1 small,
-.h1 small,
 h2 small,
-.h2 small,
-h3 small,
-.h3 small,
-h1 .small,
-.h1 .small,
-h2 .small,
-.h2 .small,
-h3 .small,
-.h3 .small {
+h3 small {
   font-size: 65%;
 }
 h4,
-.h4,
 h5,
-.h5,
-h6,
-.h6 {
+h6 {
   margin-top: 10px;
   margin-bottom: 10px;
 }
 h4 small,
-.h4 small,
 h5 small,
-.h5 small,
-h6 small,
-.h6 small,
-h4 .small,
-.h4 .small,
-h5 .small,
-.h5 .small,
-h6 .small,
-.h6 .small {
+h6 small {
   font-size: 75%;
 }
-h1,
-.h1 {
+h1 {
   font-size: 36px;
 }
-h2,
-.h2 {
+h2 {
   font-size: 30px;
 }
-h3,
-.h3 {
+h3 {
   font-size: 24px;
 }
-h4,
-.h4 {
+h4 {
   font-size: 18px;
 }
-h5,
-.h5 {
+h5 {
   font-size: 14px;
 }
-h6,
-.h6 {
+h6 {
   font-size: 12px;
 }
 p {
@@ -484,15 +430,9 @@ p {
     font-size: 21px;
   }
 }
-small,
-.small {
+small {
   font-size: 85%;
 }
-mark,
-.mark {
-  background-color: #ff8800;
-  padding: .2em;
-}
 .text-left {
   text-align: left;
 }
@@ -508,103 +448,13 @@ mark,
 .text-nowrap {
   white-space: nowrap;
 }
-.text-lowercase {
-  text-transform: lowercase;
-}
-.text-uppercase {
-  text-transform: uppercase;
-}
-.text-capitalize {
-  text-transform: capitalize;
-}
-.text-muted {
-  color: #888888;
-}
-.text-primary {
-  color: #2a9fd6;
-}
-a.text-primary:hover,
-a.text-primary:focus {
-  color: #2180ac;
-}
-.text-success {
-  color: #ffffff;
-}
-a.text-success:hover,
-a.text-success:focus {
-  color: #e6e6e6;
-}
-.text-info {
-  color: #ffffff;
-}
-a.text-info:hover,
-a.text-info:focus {
-  color: #e6e6e6;
-}
-.text-warning {
-  color: #ffffff;
-}
-a.text-warning:hover,
-a.text-warning:focus {
-  color: #e6e6e6;
-}
-.text-danger {
-  color: #ffffff;
-}
-a.text-danger:hover,
-a.text-danger:focus {
-  color: #e6e6e6;
-}
-.bg-primary {
-  color: #fff;
-  background-color: #2a9fd6;
-}
-a.bg-primary:hover,
-a.bg-primary:focus {
-  background-color: #2180ac;
-}
-.bg-success {
-  background-color: #77b300;
-}
-a.bg-success:hover,
-a.bg-success:focus {
-  background-color: #558000;
-}
-.bg-info {
-  background-color: #9933cc;
-}
-a.bg-info:hover,
-a.bg-info:focus {
-  background-color: #7a29a3;
-}
-.bg-warning {
-  background-color: #ff8800;
-}
-a.bg-warning:hover,
-a.bg-warning:focus {
-  background-color: #cc6d00;
-}
-.bg-danger {
-  background-color: #cc0000;
-}
-a.bg-danger:hover,
-a.bg-danger:focus {
-  background-color: #990000;
-}
-.page-header {
-  padding-bottom: 9px;
-  margin: 40px 0 20px;
-  border-bottom: 1px solid #282828;
-}
 ul,
 ol {
   margin-top: 0;
   margin-bottom: 10px;
 }
 ul ul,
-ol ul,
-ul ol,
-ol ol {
+ol ul {
   margin-bottom: 0;
 }
 .list-unstyled {
@@ -654,58 +504,12 @@ abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted #888888;
 }
-.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
 blockquote {
   padding: 10px 20px;
   margin: 0 0 20px;
   font-size: 17.5px;
   border-left: 5px solid #282828;
 }
-blockquote p:last-child,
-blockquote ul:last-child,
-blockquote ol:last-child {
-  margin-bottom: 0;
-}
-blockquote footer,
-blockquote small,
-blockquote .small {
-  display: block;
-  font-size: 80%;
-  line-height: 1.42857143;
-  color: #555555;
-}
-blockquote footer:before,
-blockquote small:before,
-blockquote .small:before {
-  content: '\2014 \00A0';
-}
-.blockquote-reverse,
-blockquote.pull-right {
-  padding-right: 15px;
-  padding-left: 0;
-  border-right: 5px solid #282828;
-  border-left: 0;
-  text-align: right;
-}
-.blockquote-reverse footer:before,
-blockquote.pull-right footer:before,
-.blockquote-reverse small:before,
-blockquote.pull-right small:before,
-.blockquote-reverse .small:before,
-blockquote.pull-right .small:before {
-  content: '';
-}
-.blockquote-reverse footer:after,
-blockquote.pull-right footer:after,
-.blockquote-reverse small:after,
-blockquote.pull-right small:after,
-.blockquote-reverse .small:after,
-blockquote.pull-right .small:after {
-  content: '\00A0 \2014';
-}
 address {
   margin-bottom: 20px;
   font-style: normal;
@@ -763,74 +567,6 @@ pre code {
   max-height: 340px;
   overflow-y: scroll;
 }
-.container {
-  margin-right: auto;
-  margin-left: auto;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-@media (min-width: 992px) {
-  .container {
-    width: 970px;
-  }
-}
-.container-fluid {
-  margin-right: auto;
-  margin-left: auto;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-.row {
-  margin-left: -15px;
-  margin-right: -15px;
-}
-.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
-  position: relative;
-  min-height: 1px;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-@media (min-width: 992px) {
-  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
-    float: left;
-  }
-  .col-md-12 {
-    width: 100%;
-  }
-  .col-md-11 {
-    width: 91.66666667%;
-  }
-  .col-md-10 {
-    width: 83.33333333%;
-  }
-  .col-md-9 {
-    width: 75%;
-  }
-  .col-md-8 {
-    width: 66.66666667%;
-  }
-  .col-md-7 {
-    width: 58.33333333%;
-  }
-  .col-md-6 {
-    width: 50%;
-  }
-  .col-md-5 {
-    width: 41.66666667%;
-  }
-  .col-md-4 {
-    width: 33.33333333%;
-  }
-  .col-md-3 {
-    width: 25%;
-  }
-  .col-md-2 {
-    width: 16.66666667%;
-  }
-  .col-md-1 {
-    width: 8.33333333%;
-  }
-}
 table {
   background-color: #181818;
 }
@@ -850,10 +586,8 @@ th {
 }
 .table > thead > tr > th,
 .table > tbody > tr > th,
-.table > tfoot > tr > th,
 .table > thead > tr > td,
-.table > tbody > tr > td,
-.table > tfoot > tr > td {
+.table > tbody > tr > td {
   padding: 5px;
   line-height: 1.42857143;
   vertical-align: top;
@@ -863,29 +597,17 @@ th {
   vertical-align: bottom;
   border-bottom: 2px solid #282828;
 }
-.table > caption + thead > tr:first-child > th,
-.table > colgroup + thead > tr:first-child > th,
 .table > thead:first-child > tr:first-child > th,
-.table > caption + thead > tr:first-child > td,
-.table > colgroup + thead > tr:first-child > td,
 .table > thead:first-child > tr:first-child > td {
   border-top: 0;
 }
-.table > tbody + tbody {
-  border-top: 2px solid #282828;
-}
-.table .table {
-  background-color: #060606;
-}
 .table-bordered {
   border: 1px solid #282828;
 }
 .table-bordered > thead > tr > th,
 .table-bordered > tbody > tr > th,
-.table-bordered > tfoot > tr > th,
 .table-bordered > thead > tr > td,
-.table-bordered > tbody > tr > td,
-.table-bordered > tfoot > tr > td {
+.table-bordered > tbody > tr > td {
   border: 1px solid #282828;
 }
 .table-bordered > thead > tr > th,
@@ -895,62 +617,14 @@ th {
 .table-striped > tbody > tr:nth-of-type(odd) {
   background-color: #080808;
 }
-.table-hover > tbody > tr:hover {
-  background-color: #282828;
-}
-table col[class*="col-"] {
-  position: static;
-  float: none;
-  display: table-column;
-}
-table td[class*="col-"],
-table th[class*="col-"] {
-  position: static;
-  float: none;
-  display: table-cell;
-}
-.table > thead > tr > td.info,
 .table > tbody > tr > td.info,
-.table > tfoot > tr > td.info,
-.table > thead > tr > th.info,
-.table > tbody > tr > th.info,
-.table > tfoot > tr > th.info,
-.table > thead > tr.info > td,
-.table > tbody > tr.info > td,
-.table > tfoot > tr.info > td,
-.table > thead > tr.info > th,
-.table > tbody > tr.info > th,
-.table > tfoot > tr.info > th {
+.table > tbody > tr.info > td {
   background-color: #9933cc;
 }
-.table-hover > tbody > tr > td.info:hover,
-.table-hover > tbody > tr > th.info:hover,
-.table-hover > tbody > tr.info:hover > td,
-.table-hover > tbody > tr:hover > .info,
-.table-hover > tbody > tr.info:hover > th {
-  background-color: #8a2eb8;
-}
-.table > thead > tr > td.warning,
 .table > tbody > tr > td.warning,
-.table > tfoot > tr > td.warning,
-.table > thead > tr > th.warning,
-.table > tbody > tr > th.warning,
-.table > tfoot > tr > th.warning,
-.table > thead > tr.warning > td,
-.table > tbody > tr.warning > td,
-.table > tfoot > tr.warning > td,
-.table > thead > tr.warning > th,
-.table > tbody > tr.warning > th,
-.table > tfoot > tr.warning > th {
+.table > tbody > tr.warning > td {
   background-color: #ff8800;
 }
-.table-hover > tbody > tr > td.warning:hover,
-.table-hover > tbody > tr > th.warning:hover,
-.table-hover > tbody > tr.warning:hover > td,
-.table-hover > tbody > tr:hover > .warning,
-.table-hover > tbody > tr.warning:hover > th {
-  background-color: #e67a00;
-}
 label {
   display: inline-block;
   max-width: 100%;
@@ -1031,23 +705,17 @@ textarea.form-control {
   user-select: none;
 }
 .btn:focus,
-.btn:active:focus,
-.btn.active:focus,
-.btn.focus,
-.btn:active.focus,
-.btn.active.focus {
+.btn:active:focus {
   outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
 .btn:hover,
-.btn:focus,
-.btn.focus {
+.btn:focus {
   color: #ffffff;
   text-decoration: none;
 }
-.btn:active,
-.btn.active {
+.btn:active {
   outline: 0;
   background-image: none;
   box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
@@ -1057,8 +725,7 @@ textarea.form-control {
   background-color: #424242;
   border-color: #424242;
 }
-.btn-default:focus,
-.btn-default.focus {
+.btn-default:focus {
   color: #ffffff;
   background-color: #282828;
   border-color: #020202;
@@ -1068,63 +735,26 @@ textarea.form-control {
   background-color: #282828;
   border-color: #232323;
 }
-.btn-default:active,
-.btn-default.active,
-.open > .dropdown-toggle.btn-default {
+.btn-default:active {
   color: #ffffff;
   background-color: #282828;
   border-color: #232323;
 }
 .btn-default:active:hover,
-.btn-default.active:hover,
-.open > .dropdown-toggle.btn-default:hover,
-.btn-default:active:focus,
-.btn-default.active:focus,
-.open > .dropdown-toggle.btn-default:focus,
-.btn-default:active.focus,
-.btn-default.active.focus,
-.open > .dropdown-toggle.btn-default.focus {
+.btn-default:active:focus {
   color: #ffffff;
   background-color: #161616;
   border-color: #020202;
 }
-.btn-default:active,
-.btn-default.active,
-.open > .dropdown-toggle.btn-default {
+.btn-default:active {
   background-image: none;
 }
-.btn-default.disabled,
-.btn-default[disabled],
-fieldset[disabled] .btn-default,
-.btn-default.disabled:hover,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default:hover,
-.btn-default.disabled:focus,
-.btn-default[disabled]:focus,
-fieldset[disabled] .btn-default:focus,
-.btn-default.disabled.focus,
-.btn-default[disabled].focus,
-fieldset[disabled] .btn-default.focus,
-.btn-default.disabled:active,
-.btn-default[disabled]:active,
-fieldset[disabled] .btn-default:active,
-.btn-default.disabled.active,
-.btn-default[disabled].active,
-fieldset[disabled] .btn-default.active {
-  background-color: #424242;
-  border-color: #424242;
-}
-.btn-default .badge {
-  color: #424242;
-  background-color: #ffffff;
-}
 .btn-primary {
   color: #ffffff;
   background-color: #2a9fd6;
   border-color: #2a9fd6;
 }
-.btn-primary:focus,
-.btn-primary.focus {
+.btn-primary:focus {
   color: #ffffff;
   background-color: #2180ac;
   border-color: #15506c;
@@ -1134,56 +764,20 @@ fieldset[disabled] .btn-default.active {
   background-color: #2180ac;
   border-color: #1f79a3;
 }
-.btn-primary:active,
-.btn-primary.active,
-.open > .dropdown-toggle.btn-primary {
+.btn-primary:active {
   color: #ffffff;
   background-color: #2180ac;
   border-color: #1f79a3;
 }
 .btn-primary:active:hover,
-.btn-primary.active:hover,
-.open > .dropdown-toggle.btn-primary:hover,
-.btn-primary:active:focus,
-.btn-primary.active:focus,
-.open > .dropdown-toggle.btn-primary:focus,
-.btn-primary:active.focus,
-.btn-primary.active.focus,
-.open > .dropdown-toggle.btn-primary.focus {
+.btn-primary:active:focus {
   color: #ffffff;
   background-color: #1b698e;
   border-color: #15506c;
 }
-.btn-primary:active,
-.btn-primary.active,
-.open > .dropdown-toggle.btn-primary {
+.btn-primary:active {
   background-image: none;
 }
-.btn-primary.disabled,
-.btn-primary[disabled],
-fieldset[disabled] .btn-primary,
-.btn-primary.disabled:hover,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary:hover,
-.btn-primary.disabled:focus,
-.btn-primary[disabled]:focus,
-fieldset[disabled] .btn-primary:focus,
-.btn-primary.disabled.focus,
-.btn-primary[disabled].focus,
-fieldset[disabled] .btn-primary.focus,
-.btn-primary.disabled:active,
-.btn-primary[disabled]:active,
-fieldset[disabled] .btn-primary:active,
-.btn-primary.disabled.active,
-.btn-primary[disabled].active,
-fieldset[disabled] .btn-primary.active {
-  background-color: #2a9fd6;
-  border-color: #2a9fd6;
-}
-.btn-primary .badge {
-  color: #2a9fd6;
-  background-color: #ffffff;
-}
 .nav {
   margin-bottom: 0;
   padding-left: 0;
@@ -1203,19 +797,6 @@ fieldset[disabled] .btn-primary.active {
   text-decoration: none;
   background-color: #222222;
 }
-.nav > li.disabled > a {
-  color: #888888;
-}
-.nav > li.disabled > a:hover,
-.nav > li.disabled > a:focus {
-  color: #888888;
-  text-decoration: none;
-  background-color: transparent;
-  cursor: not-allowed;
-}
-.nav > li > a > img {
-  max-width: none;
-}
 .nav-pills > li {
   float: left;
 }
@@ -1287,14 +868,6 @@ fieldset[disabled] .btn-primary.active {
 .pager .previous > span {
   float: left;
 }
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: #888888;
-  background-color: #222222;
-  cursor: not-allowed;
-}
 .alert {
   padding: 15px;
   margin-bottom: 20px;
@@ -1315,17 +888,6 @@ fieldset[disabled] .btn-primary.active {
 .alert > p + p {
   margin-top: 5px;
 }
-.alert-success {
-  background-color: #77b300;
-  border-color: #809a00;
-  color: #ffffff;
-}
-.alert-success hr {
-  border-top-color: #6a8000;
-}
-.alert-success .alert-link {
-  color: #e6e6e6;
-}
 .alert-info {
   background-color: #9933cc;
   border-color: #6e2caf;
@@ -1348,17 +910,6 @@ fieldset[disabled] .btn-primary.active {
 .alert-warning .alert-link {
   color: #e6e6e6;
 }
-.alert-danger {
-  background-color: #cc0000;
-  border-color: #bd001f;
-  color: #ffffff;
-}
-.alert-danger hr {
-  border-top-color: #a3001b;
-}
-.alert-danger .alert-link {
-  color: #e6e6e6;
-}
 .well {
   min-height: 20px;
   padding: 19px;
@@ -1372,24 +923,10 @@ fieldset[disabled] .btn-primary.active {
   border-color: #ddd;
   border-color: rgba(0, 0, 0, 0.15);
 }
-.well-lg {
-  padding: 24px;
-  border-radius: 6px;
-}
-.well-sm {
-  padding: 9px;
-  border-radius: 3px;
-}
 .clearfix:before,
 .clearfix:after,
 .dl-horizontal dd:before,
 .dl-horizontal dd:after,
-.container:before,
-.container:after,
-.container-fluid:before,
-.container-fluid:after,
-.row:before,
-.row:after,
 .nav:before,
 .nav:after,
 .pager:before,
@@ -1399,9 +936,6 @@ fieldset[disabled] .btn-primary.active {
 }
 .clearfix:after,
 .dl-horizontal dd:after,
-.container:after,
-.container-fluid:after,
-.row:after,
 .nav:after,
 .pager:after {
   clear: both;
@@ -1461,32 +995,6 @@ fieldset[disabled] .btn-primary.active {
     display: none !important;
   }
 }
-.text-primary,
-.text-primary:hover {
-  color: #2a9fd6;
-}
-.text-success,
-.text-success:hover {
-  color: #77b300;
-}
-.text-danger,
-.text-danger:hover {
-  color: #cc0000;
-}
-.text-warning,
-.text-warning:hover {
-  color: #ff8800;
-}
-.text-info,
-.text-info:hover {
-  color: #9933cc;
-}
-.bg-success,
-.bg-info,
-.bg-warning,
-.bg-danger {
-  color: #fff;
-}
 .nav-tabs a,
 .nav-pills a,
 .breadcrumb a,
@@ -1501,8 +1009,3 @@ fieldset[disabled] .btn-primary.active {
 .alert .close {
   text-decoration: none;
 }
-a.thumbnail:hover,
-a.thumbnail:focus,
-a.thumbnail.active {
-  border-color: #282828;
-}

diff --git a/css/themes/readable.css b/css/themes/readable.css
index 3a7b322146d070c2090cf2296dd01ecaebabde6a..1f1383f4ec5f682a296219fc47bd4e94114b9222 100644 (file)
--- a/css/themes/readable.css
+++ b/css/themes/readable.css
@@ -360,13 +360,7 @@ h2,
 h3,
 h4,
 h5,
-h6,
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6 {
+h6 {
   font-family: sans-serif;
   font-weight: 500;
   line-height: 1.1;
@@ -377,97 +371,49 @@ h2 small,
 h3 small,
 h4 small,
 h5 small,
-h6 small,
-.h1 small,
-.h2 small,
-.h3 small,
-.h4 small,
-.h5 small,
-.h6 small,
-h1 .small,
-h2 .small,
-h3 .small,
-h4 .small,
-h5 .small,
-h6 .small,
-.h1 .small,
-.h2 .small,
-.h3 .small,
-.h4 .small,
-.h5 .small,
-.h6 .small {
+h6 small {
   font-weight: normal;
   line-height: 1;
   color: #b3b3b3;
 }
 h1,
-.h1,
 h2,
-.h2,
-h3,
-.h3 {
+h3 {
   margin-top: 20px;
   margin-bottom: 10px;
 }
 h1 small,
-.h1 small,
 h2 small,
-.h2 small,
-h3 small,
-.h3 small,
-h1 .small,
-.h1 .small,
-h2 .small,
-.h2 .small,
-h3 .small,
-.h3 .small {
+h3 small {
   font-size: 65%;
 }
 h4,
-.h4,
 h5,
-.h5,
-h6,
-.h6 {
+h6 {
   margin-top: 10px;
   margin-bottom: 10px;
 }
 h4 small,
-.h4 small,
 h5 small,
-.h5 small,
-h6 small,
-.h6 small,
-h4 .small,
-.h4 .small,
-h5 .small,
-.h5 .small,
-h6 .small,
-.h6 .small {
+h6 small {
   font-size: 75%;
 }
-h1,
-.h1 {
+h1 {
   font-size: 36px;
 }
-h2,
-.h2 {
+h2 {
   font-size: 30px;
 }
-h3,
-.h3 {
+h3 {
   font-size: 24px;
 }
-h4,
-.h4 {
+h4 {
   font-size: 18px;
 }
-h5,
-.h5 {
+h5 {
   font-size: 14px;
 }
-h6,
-.h6 {
+h6 {
   font-size: 12px;
 }
 p {
@@ -484,15 +430,9 @@ p {
     font-size: 21px;
   }
 }
-small,
-.small {
+small {
   font-size: 85%;
 }
-mark,
-.mark {
-  background-color: #fcf8e3;
-  padding: .2em;
-}
 .text-left {
   text-align: left;
 }
@@ -508,103 +448,13 @@ mark,
 .text-nowrap {
   white-space: nowrap;
 }
-.text-lowercase {
-  text-transform: lowercase;
-}
-.text-uppercase {
-  text-transform: uppercase;
-}
-.text-capitalize {
-  text-transform: capitalize;
-}
-.text-muted {
-  color: #b3b3b3;
-}
-.text-primary {
-  color: #4582ec;
-}
-a.text-primary:hover,
-a.text-primary:focus {
-  color: #1863e6;
-}
-.text-success {
-  color: #3fad46;
-}
-a.text-success:hover,
-a.text-success:focus {
-  color: #318837;
-}
-.text-info {
-  color: #5bc0de;
-}
-a.text-info:hover,
-a.text-info:focus {
-  color: #31b0d5;
-}
-.text-warning {
-  color: #f0ad4e;
-}
-a.text-warning:hover,
-a.text-warning:focus {
-  color: #ec971f;
-}
-.text-danger {
-  color: #d9534f;
-}
-a.text-danger:hover,
-a.text-danger:focus {
-  color: #c9302c;
-}
-.bg-primary {
-  color: #fff;
-  background-color: #4582ec;
-}
-a.bg-primary:hover,
-a.bg-primary:focus {
-  background-color: #1863e6;
-}
-.bg-success {
-  background-color: #dff0d8;
-}
-a.bg-success:hover,
-a.bg-success:focus {
-  background-color: #c1e2b3;
-}
-.bg-info {
-  background-color: #d9edf7;
-}
-a.bg-info:hover,
-a.bg-info:focus {
-  background-color: #afd9ee;
-}
-.bg-warning {
-  background-color: #fcf8e3;
-}
-a.bg-warning:hover,
-a.bg-warning:focus {
-  background-color: #f7ecb5;
-}
-.bg-danger {
-  background-color: #f2dede;
-}
-a.bg-danger:hover,
-a.bg-danger:focus {
-  background-color: #e4b9b9;
-}
-.page-header {
-  padding-bottom: 9px;
-  margin: 40px 0 20px;
-  border-bottom: 1px solid #dddddd;
-}
 ul,
 ol {
   margin-top: 0;
   margin-bottom: 10px;
 }
 ul ul,
-ol ul,
-ul ol,
-ol ol {
+ol ul {
   margin-bottom: 0;
 }
 .list-unstyled {
@@ -654,58 +504,12 @@ abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted #b3b3b3;
 }
-.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
 blockquote {
   padding: 10px 20px;
   margin: 0 0 20px;
   font-size: 17.5px;
   border-left: 5px solid #4582ec;
 }
-blockquote p:last-child,
-blockquote ul:last-child,
-blockquote ol:last-child {
-  margin-bottom: 0;
-}
-blockquote footer,
-blockquote small,
-blockquote .small {
-  display: block;
-  font-size: 80%;
-  line-height: 1.42857143;
-  color: #333333;
-}
-blockquote footer:before,
-blockquote small:before,
-blockquote .small:before {
-  content: '\2014 \00A0';
-}
-.blockquote-reverse,
-blockquote.pull-right {
-  padding-right: 15px;
-  padding-left: 0;
-  border-right: 5px solid #4582ec;
-  border-left: 0;
-  text-align: right;
-}
-.blockquote-reverse footer:before,
-blockquote.pull-right footer:before,
-.blockquote-reverse small:before,
-blockquote.pull-right small:before,
-.blockquote-reverse .small:before,
-blockquote.pull-right .small:before {
-  content: '';
-}
-.blockquote-reverse footer:after,
-blockquote.pull-right footer:after,
-.blockquote-reverse small:after,
-blockquote.pull-right small:after,
-.blockquote-reverse .small:after,
-blockquote.pull-right .small:after {
-  content: '\00A0 \2014';
-}
 address {
   margin-bottom: 20px;
   font-style: normal;
@@ -763,74 +567,6 @@ pre code {
   max-height: 340px;
   overflow-y: scroll;
 }
-.container {
-  margin-right: auto;
-  margin-left: auto;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-@media (min-width: 992px) {
-  .container {
-    width: 970px;
-  }
-}
-.container-fluid {
-  margin-right: auto;
-  margin-left: auto;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-.row {
-  margin-left: -15px;
-  margin-right: -15px;
-}
-.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
-  position: relative;
-  min-height: 1px;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-@media (min-width: 992px) {
-  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
-    float: left;
-  }
-  .col-md-12 {
-    width: 100%;
-  }
-  .col-md-11 {
-    width: 91.66666667%;
-  }
-  .col-md-10 {
-    width: 83.33333333%;
-  }
-  .col-md-9 {
-    width: 75%;
-  }
-  .col-md-8 {
-    width: 66.66666667%;
-  }
-  .col-md-7 {
-    width: 58.33333333%;
-  }
-  .col-md-6 {
-    width: 50%;
-  }
-  .col-md-5 {
-    width: 41.66666667%;
-  }
-  .col-md-4 {
-    width: 33.33333333%;
-  }
-  .col-md-3 {
-    width: 25%;
-  }
-  .col-md-2 {
-    width: 16.66666667%;
-  }
-  .col-md-1 {
-    width: 8.33333333%;
-  }
-}
 table {
   background-color: transparent;
 }
@@ -850,10 +586,8 @@ th {
 }
 .table > thead > tr > th,
 .table > tbody > tr > th,
-.table > tfoot > tr > th,
 .table > thead > tr > td,
-.table > tbody > tr > td,
-.table > tfoot > tr > td {
+.table > tbody > tr > td {
   padding: 5px;
   line-height: 1.42857143;
   vertical-align: top;
@@ -863,29 +597,17 @@ th {
   vertical-align: bottom;
   border-bottom: 2px solid #dddddd;
 }
-.table > caption + thead > tr:first-child > th,
-.table > colgroup + thead > tr:first-child > th,
 .table > thead:first-child > tr:first-child > th,
-.table > caption + thead > tr:first-child > td,
-.table > colgroup + thead > tr:first-child > td,
 .table > thead:first-child > tr:first-child > td {
   border-top: 0;
 }
-.table > tbody + tbody {
-  border-top: 2px solid #dddddd;
-}
-.table .table {
-  background-color: #ffffff;
-}
 .table-bordered {
   border: 1px solid #dddddd;
 }
 .table-bordered > thead > tr > th,
 .table-bordered > tbody > tr > th,
-.table-bordered > tfoot > tr > th,
 .table-bordered > thead > tr > td,
-.table-bordered > tbody > tr > td,
-.table-bordered > tfoot > tr > td {
+.table-bordered > tbody > tr > td {
   border: 1px solid #dddddd;
 }
 .table-bordered > thead > tr > th,
@@ -895,62 +617,14 @@ th {
 .table-striped > tbody > tr:nth-of-type(odd) {
   background-color: #f9f9f9;
 }
-.table-hover > tbody > tr:hover {
-  background-color: #f5f5f5;
-}
-table col[class*="col-"] {
-  position: static;
-  float: none;
-  display: table-column;
-}
-table td[class*="col-"],
-table th[class*="col-"] {
-  position: static;
-  float: none;
-  display: table-cell;
-}
-.table > thead > tr > td.info,
 .table > tbody > tr > td.info,
-.table > tfoot > tr > td.info,
-.table > thead > tr > th.info,
-.table > tbody > tr > th.info,
-.table > tfoot > tr > th.info,
-.table > thead > tr.info > td,
-.table > tbody > tr.info > td,
-.table > tfoot > tr.info > td,
-.table > thead > tr.info > th,
-.table > tbody > tr.info > th,
-.table > tfoot > tr.info > th {
+.table > tbody > tr.info > td {
   background-color: #d9edf7;
 }
-.table-hover > tbody > tr > td.info:hover,
-.table-hover > tbody > tr > th.info:hover,
-.table-hover > tbody > tr.info:hover > td,
-.table-hover > tbody > tr:hover > .info,
-.table-hover > tbody > tr.info:hover > th {
-  background-color: #c4e3f3;
-}
-.table > thead > tr > td.warning,
 .table > tbody > tr > td.warning,
-.table > tfoot > tr > td.warning,
-.table > thead > tr > th.warning,
-.table > tbody > tr > th.warning,
-.table > tfoot > tr > th.warning,
-.table > thead > tr.warning > td,
-.table > tbody > tr.warning > td,
-.table > tfoot > tr.warning > td,
-.table > thead > tr.warning > th,
-.table > tbody > tr.warning > th,
-.table > tfoot > tr.warning > th {
+.table > tbody > tr.warning > td {
   background-color: #fcf8e3;
 }
-.table-hover > tbody > tr > td.warning:hover,
-.table-hover > tbody > tr > th.warning:hover,
-.table-hover > tbody > tr.warning:hover > td,
-.table-hover > tbody > tr:hover > .warning,
-.table-hover > tbody > tr.warning:hover > th {
-  background-color: #faf2cc;
-}
 label {
   display: inline-block;
   max-width: 100%;
@@ -1031,23 +705,17 @@ textarea.form-control {
   user-select: none;
 }
 .btn:focus,
-.btn:active:focus,
-.btn.active:focus,
-.btn.focus,
-.btn:active.focus,
-.btn.active.focus {
+.btn:active:focus {
   outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
 .btn:hover,
-.btn:focus,
-.btn.focus {
+.btn:focus {
   color: #333333;
   text-decoration: none;
 }
-.btn:active,
-.btn.active {
+.btn:active {
   outline: 0;
   background-image: none;
   box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
@@ -1057,8 +725,7 @@ textarea.form-control {
   background-color: #ffffff;
   border-color: #dddddd;
 }
-.btn-default:focus,
-.btn-default.focus {
+.btn-default:focus {
   color: #333333;
   background-color: #e6e6e6;
   border-color: #9d9d9d;
@@ -1068,63 +735,26 @@ textarea.form-control {
   background-color: #e6e6e6;
   border-color: #bebebe;
 }
-.btn-default:active,
-.btn-default.active,
-.open > .dropdown-toggle.btn-default {
+.btn-default:active {
   color: #333333;
   background-color: #e6e6e6;
   border-color: #bebebe;
 }
 .btn-default:active:hover,
-.btn-default.active:hover,
-.open > .dropdown-toggle.btn-default:hover,
-.btn-default:active:focus,
-.btn-default.active:focus,
-.open > .dropdown-toggle.btn-default:focus,
-.btn-default:active.focus,
-.btn-default.active.focus,
-.open > .dropdown-toggle.btn-default.focus {
+.btn-default:active:focus {
   color: #333333;
   background-color: #d4d4d4;
   border-color: #9d9d9d;
 }
-.btn-default:active,
-.btn-default.active,
-.open > .dropdown-toggle.btn-default {
+.btn-default:active {
   background-image: none;
 }
-.btn-default.disabled,
-.btn-default[disabled],
-fieldset[disabled] .btn-default,
-.btn-default.disabled:hover,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default:hover,
-.btn-default.disabled:focus,
-.btn-default[disabled]:focus,
-fieldset[disabled] .btn-default:focus,
-.btn-default.disabled.focus,
-.btn-default[disabled].focus,
-fieldset[disabled] .btn-default.focus,
-.btn-default.disabled:active,
-.btn-default[disabled]:active,
-fieldset[disabled] .btn-default:active,
-.btn-default.disabled.active,
-.btn-default[disabled].active,
-fieldset[disabled] .btn-default.active {
-  background-color: #ffffff;
-  border-color: #dddddd;
-}
-.btn-default .badge {
-  color: #ffffff;
-  background-color: #333333;
-}
 .btn-primary {
   color: #ffffff;
   background-color: #4582ec;
   border-color: #4582ec;
 }
-.btn-primary:focus,
-.btn-primary.focus {
+.btn-primary:focus {
   color: #ffffff;
   background-color: #1863e6;
   border-color: #1045a1;
@@ -1134,56 +764,20 @@ fieldset[disabled] .btn-default.active {
   background-color: #1863e6;
   border-color: #175fdd;
 }
-.btn-primary:active,
-.btn-primary.active,
-.open > .dropdown-toggle.btn-primary {
+.btn-primary:active {
   color: #ffffff;
   background-color: #1863e6;
   border-color: #175fdd;
 }
 .btn-primary:active:hover,
-.btn-primary.active:hover,
-.open > .dropdown-toggle.btn-primary:hover,
-.btn-primary:active:focus,
-.btn-primary.active:focus,
-.open > .dropdown-toggle.btn-primary:focus,
-.btn-primary:active.focus,
-.btn-primary.active.focus,
-.open > .dropdown-toggle.btn-primary.focus {
+.btn-primary:active:focus {
   color: #ffffff;
   background-color: #1455c6;
   border-color: #1045a1;
 }
-.btn-primary:active,
-.btn-primary.active,
-.open > .dropdown-toggle.btn-primary {
+.btn-primary:active {
   background-image: none;
 }
-.btn-primary.disabled,
-.btn-primary[disabled],
-fieldset[disabled] .btn-primary,
-.btn-primary.disabled:hover,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary:hover,
-.btn-primary.disabled:focus,
-.btn-primary[disabled]:focus,
-fieldset[disabled] .btn-primary:focus,
-.btn-primary.disabled.focus,
-.btn-primary[disabled].focus,
-fieldset[disabled] .btn-primary.focus,
-.btn-primary.disabled:active,
-.btn-primary[disabled]:active,
-fieldset[disabled] .btn-primary:active,
-.btn-primary.disabled.active,
-.btn-primary[disabled].active,
-fieldset[disabled] .btn-primary.active {
-  background-color: #4582ec;
-  border-color: #4582ec;
-}
-.btn-primary .badge {
-  color: #4582ec;
-  background-color: #ffffff;
-}
 .nav {
   margin-bottom: 0;
   padding-left: 0;
@@ -1203,19 +797,6 @@ fieldset[disabled] .btn-primary.active {
   text-decoration: none;
   background-color: #eeeeee;
 }
-.nav > li.disabled > a {
-  color: #b3b3b3;
-}
-.nav > li.disabled > a:hover,
-.nav > li.disabled > a:focus {
-  color: #b3b3b3;
-  text-decoration: none;
-  background-color: transparent;
-  cursor: not-allowed;
-}
-.nav > li > a > img {
-  max-width: none;
-}
 .nav-pills > li {
   float: left;
 }
@@ -1287,14 +868,6 @@ fieldset[disabled] .btn-primary.active {
 .pager .previous > span {
   float: left;
 }
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: #b3b3b3;
-  background-color: #ffffff;
-  cursor: not-allowed;
-}
 .alert {
   padding: 15px;
   margin-bottom: 20px;
@@ -1315,17 +888,6 @@ fieldset[disabled] .btn-primary.active {
 .alert > p + p {
   margin-top: 5px;
 }
-.alert-success {
-  background-color: #3fad46;
-  border-color: #3fad46;
-  color: #ffffff;
-}
-.alert-success hr {
-  border-top-color: #389a3e;
-}
-.alert-success .alert-link {
-  color: #e6e6e6;
-}
 .alert-info {
   background-color: #5bc0de;
   border-color: #5bc0de;
@@ -1348,17 +910,6 @@ fieldset[disabled] .btn-primary.active {
 .alert-warning .alert-link {
   color: #e6e6e6;
 }
-.alert-danger {
-  background-color: #d9534f;
-  border-color: #d9534f;
-  color: #ffffff;
-}
-.alert-danger hr {
-  border-top-color: #d43f3a;
-}
-.alert-danger .alert-link {
-  color: #e6e6e6;
-}
 .well {
   min-height: 20px;
   padding: 19px;
@@ -1372,24 +923,10 @@ fieldset[disabled] .btn-primary.active {
   border-color: #ddd;
   border-color: rgba(0, 0, 0, 0.15);
 }
-.well-lg {
-  padding: 24px;
-  border-radius: 6px;
-}
-.well-sm {
-  padding: 9px;
-  border-radius: 3px;
-}
 .clearfix:before,
 .clearfix:after,
 .dl-horizontal dd:before,
 .dl-horizontal dd:after,
-.container:before,
-.container:after,
-.container-fluid:before,
-.container-fluid:after,
-.row:before,
-.row:after,
 .nav:before,
 .nav:after,
 .pager:before,
@@ -1399,9 +936,6 @@ fieldset[disabled] .btn-primary.active {
 }
 .clearfix:after,
 .dl-horizontal dd:after,
-.container:after,
-.container-fluid:after,
-.row:after,
 .nav:after,
 .pager:after {
   clear: both;
@@ -1461,69 +995,14 @@ fieldset[disabled] .btn-primary.active {
     display: none !important;
   }
 }
-.navbar {
-  font-family: sans-serif;
-}
-.navbar-nav,
-.navbar-form {
-  margin-left: 0;
-  margin-right: 0;
-}
-.navbar-nav > li > a {
-  margin: 13.5px 6px;
-  padding: 8px 12px;
-  border: 1px solid transparent;
-  border-radius: 4px;
-}
-.navbar-nav > li > a:hover {
-  border: 1px solid #ddd;
-}
-.navbar-nav > .active > a,
-.navbar-nav > .active > a:hover {
-  border: 1px solid #ddd;
-}
-.navbar-default .navbar-nav > .active > a:hover {
-  color: #4582ec;
-}
-.navbar-inverse .navbar-nav > .active > a:hover {
-  color: #333333;
-}
-.navbar-brand {
-  padding-top: 14.5px;
-  padding-bottom: 14.5px;
-  line-height: 1.9;
-}
-@media (min-width: 768px) {
-  .navbar .navbar-nav > li > a {
-    padding: 8px 12px;
-  }
-}
-@media (max-width: 768px - 1) {
-  .navbar .navbar-nav > li > a {
-    margin: 0;
-  }
-}
 .btn {
   font-family: sans-serif;
 }
-legend {
-  font-family: sans-serif;
-}
-.input-group-addon {
-  font-family: sans-serif;
-}
 .nav .open > a,
 .nav .open > a:hover,
 .nav .open > a:focus {
   border: 1px solid #ddd;
 }
-.pagination {
-  font-family: sans-serif;
-}
-.pagination-lg > li > a,
-.pagination-lg > li > span {
-  padding: 14px 24px;
-}
 .pager {
   font-family: sans-serif;
 }

diff --git a/css/themes/slate.css b/css/themes/slate.css
index a242c37acf3e528b144829d570ca2f8e887eb65e..19c8aea0802c8e225a8d5da5a0cff16581262e8d 100644 (file)
--- a/css/themes/slate.css
+++ b/css/themes/slate.css
@@ -360,13 +360,7 @@ h2,
 h3,
 h4,
 h5,
-h6,
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6 {
+h6 {
   font-family: sans-serif;
   font-weight: 500;
   line-height: 1.1;
@@ -377,97 +371,49 @@ h2 small,
 h3 small,
 h4 small,
 h5 small,
-h6 small,
-.h1 small,
-.h2 small,
-.h3 small,
-.h4 small,
-.h5 small,
-.h6 small,
-h1 .small,
-h2 .small,
-h3 .small,
-h4 .small,
-h5 .small,
-h6 .small,
-.h1 .small,
-.h2 .small,
-.h3 .small,
-.h4 .small,
-.h5 .small,
-.h6 .small {
+h6 small {
   font-weight: normal;
   line-height: 1;
   color: #7a8288;
 }
 h1,
-.h1,
 h2,
-.h2,
-h3,
-.h3 {
+h3 {
   margin-top: 20px;
   margin-bottom: 10px;
 }
 h1 small,
-.h1 small,
 h2 small,
-.h2 small,
-h3 small,
-.h3 small,
-h1 .small,
-.h1 .small,
-h2 .small,
-.h2 .small,
-h3 .small,
-.h3 .small {
+h3 small {
   font-size: 65%;
 }
 h4,
-.h4,
 h5,
-.h5,
-h6,
-.h6 {
+h6 {
   margin-top: 10px;
   margin-bottom: 10px;
 }
 h4 small,
-.h4 small,
 h5 small,
-.h5 small,
-h6 small,
-.h6 small,
-h4 .small,
-.h4 .small,
-h5 .small,
-.h5 .small,
-h6 .small,
-.h6 .small {
+h6 small {
   font-size: 75%;
 }
-h1,
-.h1 {
+h1 {
   font-size: 36px;
 }
-h2,
-.h2 {
+h2 {
   font-size: 30px;
 }
-h3,
-.h3 {
+h3 {
   font-size: 24px;
 }
-h4,
-.h4 {
+h4 {
   font-size: 18px;
 }
-h5,
-.h5 {
+h5 {
   font-size: 14px;
 }
-h6,
-.h6 {
+h6 {
   font-size: 12px;
 }
 p {
@@ -484,15 +430,9 @@ p {
     font-size: 21px;
   }
 }
-small,
-.small {
+small {
   font-size: 85%;
 }
-mark,
-.mark {
-  background-color: #f89406;
-  padding: .2em;
-}
 .text-left {
   text-align: left;
 }
@@ -508,103 +448,13 @@ mark,
 .text-nowrap {
   white-space: nowrap;
 }
-.text-lowercase {
-  text-transform: lowercase;
-}
-.text-uppercase {
-  text-transform: uppercase;
-}
-.text-capitalize {
-  text-transform: capitalize;
-}
-.text-muted {
-  color: #7a8288;
-}
-.text-primary {
-  color: #7a8288;
-}
-a.text-primary:hover,
-a.text-primary:focus {
-  color: #62686d;
-}
-.text-success {
-  color: #ffffff;
-}
-a.text-success:hover,
-a.text-success:focus {
-  color: #e6e6e6;
-}
-.text-info {
-  color: #ffffff;
-}
-a.text-info:hover,
-a.text-info:focus {
-  color: #e6e6e6;
-}
-.text-warning {
-  color: #ffffff;
-}
-a.text-warning:hover,
-a.text-warning:focus {
-  color: #e6e6e6;
-}
-.text-danger {
-  color: #ffffff;
-}
-a.text-danger:hover,
-a.text-danger:focus {
-  color: #e6e6e6;
-}
-.bg-primary {
-  color: #fff;
-  background-color: #7a8288;
-}
-a.bg-primary:hover,
-a.bg-primary:focus {
-  background-color: #62686d;
-}
-.bg-success {
-  background-color: #62c462;
-}
-a.bg-success:hover,
-a.bg-success:focus {
-  background-color: #42b142;
-}
-.bg-info {
-  background-color: #5bc0de;
-}
-a.bg-info:hover,
-a.bg-info:focus {
-  background-color: #31b0d5;
-}
-.bg-warning {
-  background-color: #f89406;
-}
-a.bg-warning:hover,
-a.bg-warning:focus {
-  background-color: #c67605;
-}
-.bg-danger {
-  background-color: #ee5f5b;
-}
-a.bg-danger:hover,
-a.bg-danger:focus {
-  background-color: #e9322d;
-}
-.page-header {
-  padding-bottom: 9px;
-  margin: 40px 0 20px;
-  border-bottom: 1px solid #1c1e22;
-}
 ul,
 ol {
   margin-top: 0;
   margin-bottom: 10px;
 }
 ul ul,
-ol ul,
-ul ol,
-ol ol {
+ol ul {
   margin-bottom: 0;
 }
 .list-unstyled {
@@ -654,58 +504,12 @@ abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted #7a8288;
 }
-.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
 blockquote {
   padding: 10px 20px;
   margin: 0 0 20px;
   font-size: 17.5px;
   border-left: 5px solid #7a8288;
 }
-blockquote p:last-child,
-blockquote ul:last-child,
-blockquote ol:last-child {
-  margin-bottom: 0;
-}
-blockquote footer,
-blockquote small,
-blockquote .small {
-  display: block;
-  font-size: 80%;
-  line-height: 1.42857143;
-  color: #7a8288;
-}
-blockquote footer:before,
-blockquote small:before,
-blockquote .small:before {
-  content: '\2014 \00A0';
-}
-.blockquote-reverse,
-blockquote.pull-right {
-  padding-right: 15px;
-  padding-left: 0;
-  border-right: 5px solid #7a8288;
-  border-left: 0;
-  text-align: right;
-}
-.blockquote-reverse footer:before,
-blockquote.pull-right footer:before,
-.blockquote-reverse small:before,
-blockquote.pull-right small:before,
-.blockquote-reverse .small:before,
-blockquote.pull-right .small:before {
-  content: '';
-}
-.blockquote-reverse footer:after,
-blockquote.pull-right footer:after,
-.blockquote-reverse small:after,
-blockquote.pull-right small:after,
-.blockquote-reverse .small:after,
-blockquote.pull-right .small:after {
-  content: '\00A0 \2014';
-}
 address {
   margin-bottom: 20px;
   font-style: normal;
@@ -763,74 +567,6 @@ pre code {
   max-height: 340px;
   overflow-y: scroll;
 }
-.container {
-  margin-right: auto;
-  margin-left: auto;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-@media (min-width: 992px) {
-  .container {
-    width: 970px;
-  }
-}
-.container-fluid {
-  margin-right: auto;
-  margin-left: auto;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-.row {
-  margin-left: -15px;
-  margin-right: -15px;
-}
-.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
-  position: relative;
-  min-height: 1px;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-@media (min-width: 992px) {
-  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
-    float: left;
-  }
-  .col-md-12 {
-    width: 100%;
-  }
-  .col-md-11 {
-    width: 91.66666667%;
-  }
-  .col-md-10 {
-    width: 83.33333333%;
-  }
-  .col-md-9 {
-    width: 75%;
-  }
-  .col-md-8 {
-    width: 66.66666667%;
-  }
-  .col-md-7 {
-    width: 58.33333333%;
-  }
-  .col-md-6 {
-    width: 50%;
-  }
-  .col-md-5 {
-    width: 41.66666667%;
-  }
-  .col-md-4 {
-    width: 33.33333333%;
-  }
-  .col-md-3 {
-    width: 25%;
-  }
-  .col-md-2 {
-    width: 16.66666667%;
-  }
-  .col-md-1 {
-    width: 8.33333333%;
-  }
-}
 table {
   background-color: #2e3338;
 }
@@ -850,10 +586,8 @@ th {
 }
 .table > thead > tr > th,
 .table > tbody > tr > th,
-.table > tfoot > tr > th,
 .table > thead > tr > td,
-.table > tbody > tr > td,
-.table > tfoot > tr > td {
+.table > tbody > tr > td {
   padding: 5px;
   line-height: 1.42857143;
   vertical-align: top;
@@ -863,29 +597,17 @@ th {
   vertical-align: bottom;
   border-bottom: 2px solid #1c1e22;
 }
-.table > caption + thead > tr:first-child > th,
-.table > colgroup + thead > tr:first-child > th,
 .table > thead:first-child > tr:first-child > th,
-.table > caption + thead > tr:first-child > td,
-.table > colgroup + thead > tr:first-child > td,
 .table > thead:first-child > tr:first-child > td {
   border-top: 0;
 }
-.table > tbody + tbody {
-  border-top: 2px solid #1c1e22;
-}
-.table .table {
-  background-color: #272b30;
-}
 .table-bordered {
   border: 1px solid #1c1e22;
 }
 .table-bordered > thead > tr > th,
 .table-bordered > tbody > tr > th,
-.table-bordered > tfoot > tr > th,
 .table-bordered > thead > tr > td,
-.table-bordered > tbody > tr > td,
-.table-bordered > tfoot > tr > td {
+.table-bordered > tbody > tr > td {
   border: 1px solid #1c1e22;
 }
 .table-bordered > thead > tr > th,
@@ -895,62 +617,14 @@ th {
 .table-striped > tbody > tr:nth-of-type(odd) {
   background-color: #353a41;
 }
-.table-hover > tbody > tr:hover {
-  background-color: #49515a;
-}
-table col[class*="col-"] {
-  position: static;
-  float: none;
-  display: table-column;
-}
-table td[class*="col-"],
-table th[class*="col-"] {
-  position: static;
-  float: none;
-  display: table-cell;
-}
-.table > thead > tr > td.info,
 .table > tbody > tr > td.info,
-.table > tfoot > tr > td.info,
-.table > thead > tr > th.info,
-.table > tbody > tr > th.info,
-.table > tfoot > tr > th.info,
-.table > thead > tr.info > td,
-.table > tbody > tr.info > td,
-.table > tfoot > tr.info > td,
-.table > thead > tr.info > th,
-.table > tbody > tr.info > th,
-.table > tfoot > tr.info > th {
+.table > tbody > tr.info > td {
   background-color: #5bc0de;
 }
-.table-hover > tbody > tr > td.info:hover,
-.table-hover > tbody > tr > th.info:hover,
-.table-hover > tbody > tr.info:hover > td,
-.table-hover > tbody > tr:hover > .info,
-.table-hover > tbody > tr.info:hover > th {
-  background-color: #46b8da;
-}
-.table > thead > tr > td.warning,
 .table > tbody > tr > td.warning,
-.table > tfoot > tr > td.warning,
-.table > thead > tr > th.warning,
-.table > tbody > tr > th.warning,
-.table > tfoot > tr > th.warning,
-.table > thead > tr.warning > td,
-.table > tbody > tr.warning > td,
-.table > tfoot > tr.warning > td,
-.table > thead > tr.warning > th,
-.table > tbody > tr.warning > th,
-.table > tfoot > tr.warning > th {
+.table > tbody > tr.warning > td {
   background-color: #f89406;
 }
-.table-hover > tbody > tr > td.warning:hover,
-.table-hover > tbody > tr > th.warning:hover,
-.table-hover > tbody > tr.warning:hover > td,
-.table-hover > tbody > tr:hover > .warning,
-.table-hover > tbody > tr.warning:hover > th {
-  background-color: #df8505;
-}
 label {
   display: inline-block;
   max-width: 100%;
@@ -1031,23 +705,17 @@ textarea.form-control {
   user-select: none;
 }
 .btn:focus,
-.btn:active:focus,
-.btn.active:focus,
-.btn.focus,
-.btn:active.focus,
-.btn.active.focus {
+.btn:active:focus {
   outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
 .btn:hover,
-.btn:focus,
-.btn.focus {
+.btn:focus {
   color: #ffffff;
   text-decoration: none;
 }
-.btn:active,
-.btn.active {
+.btn:active {
   outline: 0;
   background-image: none;
   box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
@@ -1057,8 +725,7 @@ textarea.form-control {
   background-color: #3a3f44;
   border-color: #3a3f44;
 }
-.btn-default:focus,
-.btn-default.focus {
+.btn-default:focus {
   color: #ffffff;
   background-color: #232628;
   border-color: #000000;
@@ -1068,63 +735,26 @@ textarea.form-control {
   background-color: #232628;
   border-color: #1e2023;
 }
-.btn-default:active,
-.btn-default.active,
-.open > .dropdown-toggle.btn-default {
+.btn-default:active {
   color: #ffffff;
   background-color: #232628;
   border-color: #1e2023;
 }
 .btn-default:active:hover,
-.btn-default.active:hover,
-.open > .dropdown-toggle.btn-default:hover,
-.btn-default:active:focus,
-.btn-default.active:focus,
-.open > .dropdown-toggle.btn-default:focus,
-.btn-default:active.focus,
-.btn-default.active.focus,
-.open > .dropdown-toggle.btn-default.focus {
+.btn-default:active:focus {
   color: #ffffff;
   background-color: #121415;
   border-color: #000000;
 }
-.btn-default:active,
-.btn-default.active,
-.open > .dropdown-toggle.btn-default {
+.btn-default:active {
   background-image: none;
 }
-.btn-default.disabled,
-.btn-default[disabled],
-fieldset[disabled] .btn-default,
-.btn-default.disabled:hover,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default:hover,
-.btn-default.disabled:focus,
-.btn-default[disabled]:focus,
-fieldset[disabled] .btn-default:focus,
-.btn-default.disabled.focus,
-.btn-default[disabled].focus,
-fieldset[disabled] .btn-default.focus,
-.btn-default.disabled:active,
-.btn-default[disabled]:active,
-fieldset[disabled] .btn-default:active,
-.btn-default.disabled.active,
-.btn-default[disabled].active,
-fieldset[disabled] .btn-default.active {
-  background-color: #3a3f44;
-  border-color: #3a3f44;
-}
-.btn-default .badge {
-  color: #3a3f44;
-  background-color: #ffffff;
-}
 .btn-primary {
   color: #ffffff;
   background-color: #7a8288;
   border-color: #7a8288;
 }
-.btn-primary:focus,
-.btn-primary.focus {
+.btn-primary:focus {
   color: #ffffff;
   background-color: #62686d;
   border-color: #3e4245;
@@ -1134,56 +764,20 @@ fieldset[disabled] .btn-default.active {
   background-color: #62686d;
   border-color: #5d6368;
 }
-.btn-primary:active,
-.btn-primary.active,
-.open > .dropdown-toggle.btn-primary {
+.btn-primary:active {
   color: #ffffff;
   background-color: #62686d;
   border-color: #5d6368;
 }
 .btn-primary:active:hover,
-.btn-primary.active:hover,
-.open > .dropdown-toggle.btn-primary:hover,
-.btn-primary:active:focus,
-.btn-primary.active:focus,
-.open > .dropdown-toggle.btn-primary:focus,
-.btn-primary:active.focus,
-.btn-primary.active.focus,
-.open > .dropdown-toggle.btn-primary.focus {
+.btn-primary:active:focus {
   color: #ffffff;
   background-color: #51565a;
   border-color: #3e4245;
 }
-.btn-primary:active,
-.btn-primary.active,
-.open > .dropdown-toggle.btn-primary {
+.btn-primary:active {
   background-image: none;
 }
-.btn-primary.disabled,
-.btn-primary[disabled],
-fieldset[disabled] .btn-primary,
-.btn-primary.disabled:hover,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary:hover,
-.btn-primary.disabled:focus,
-.btn-primary[disabled]:focus,
-fieldset[disabled] .btn-primary:focus,
-.btn-primary.disabled.focus,
-.btn-primary[disabled].focus,
-fieldset[disabled] .btn-primary.focus,
-.btn-primary.disabled:active,
-.btn-primary[disabled]:active,
-fieldset[disabled] .btn-primary:active,
-.btn-primary.disabled.active,
-.btn-primary[disabled].active,
-fieldset[disabled] .btn-primary.active {
-  background-color: #7a8288;
-  border-color: #7a8288;
-}
-.btn-primary .badge {
-  color: #7a8288;
-  background-color: #ffffff;
-}
 .nav {
   margin-bottom: 0;
   padding-left: 0;
@@ -1203,19 +797,6 @@ fieldset[disabled] .btn-primary.active {
   text-decoration: none;
   background-color: #3e444c;
 }
-.nav > li.disabled > a {
-  color: #7a8288;
-}
-.nav > li.disabled > a:hover,
-.nav > li.disabled > a:focus {
-  color: #7a8288;
-  text-decoration: none;
-  background-color: transparent;
-  cursor: not-allowed;
-}
-.nav > li > a > img {
-  max-width: none;
-}
 .nav-pills > li {
   float: left;
 }
@@ -1287,14 +868,6 @@ fieldset[disabled] .btn-primary.active {
 .pager .previous > span {
   float: left;
 }
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: #7a8288;
-  background-color: #3a3f44;
-  cursor: not-allowed;
-}
 .alert {
   padding: 15px;
   margin-bottom: 20px;
@@ -1315,17 +888,6 @@ fieldset[disabled] .btn-primary.active {
 .alert > p + p {
   margin-top: 5px;
 }
-.alert-success {
-  background-color: #62c462;
-  border-color: #62bd4f;
-  color: #ffffff;
-}
-.alert-success hr {
-  border-top-color: #55b142;
-}
-.alert-success .alert-link {
-  color: #e6e6e6;
-}
 .alert-info {
   background-color: #5bc0de;
   border-color: #3dced8;
@@ -1348,17 +910,6 @@ fieldset[disabled] .btn-primary.active {
 .alert-warning .alert-link {
   color: #e6e6e6;
 }
-.alert-danger {
-  background-color: #ee5f5b;
-  border-color: #ed4d63;
-  color: #ffffff;
-}
-.alert-danger hr {
-  border-top-color: #ea364f;
-}
-.alert-danger .alert-link {
-  color: #e6e6e6;
-}
 .well {
   min-height: 20px;
   padding: 19px;
@@ -1372,24 +923,10 @@ fieldset[disabled] .btn-primary.active {
   border-color: #ddd;
   border-color: rgba(0, 0, 0, 0.15);
 }
-.well-lg {
-  padding: 24px;
-  border-radius: 6px;
-}
-.well-sm {
-  padding: 9px;
-  border-radius: 3px;
-}
 .clearfix:before,
 .clearfix:after,
 .dl-horizontal dd:before,
 .dl-horizontal dd:after,
-.container:before,
-.container:after,
-.container-fluid:before,
-.container-fluid:after,
-.row:before,
-.row:after,
 .nav:before,
 .nav:after,
 .pager:before,
@@ -1399,9 +936,6 @@ fieldset[disabled] .btn-primary.active {
 }
 .clearfix:after,
 .dl-horizontal dd:after,
-.container:after,
-.container-fluid:after,
-.row:after,
 .nav:after,
 .pager:after {
   clear: both;
@@ -1490,26 +1024,6 @@ h5,
 h6 {
   text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
 }
-.text-primary,
-.text-primary:hover {
-  color: #7a8288;
-}
-.text-success,
-.text-success:hover {
-  color: #62c462;
-}
-.text-danger,
-.text-danger:hover {
-  color: #ee5f5b;
-}
-.text-warning,
-.text-warning:hover {
-  color: #f89406;
-}
-.text-info,
-.text-info:hover {
-  color: #5bc0de;
-}
 .table .success,
 .table .warning,
 .table .danger,

diff --git a/js/80-sidebar.js b/js/80-sidebar.js
index 5120df52eee0be2b289203e1949500b4e4446b1a..dcb3bc97e7916ff146a74d5174a9f5d26fedb535 100644 (file)
--- a/js/80-sidebar.js
+++ b/js/80-sidebar.js
@@ -1,7 +1,5 @@
 $(function() {
        if(!document.getElementById('sidebar')) {
-        const content = q('main');
-               content.innerHTML = '<div class="col-md-9">' + content.innerHTML + '</div><aside id="sidebar" class="col-md-3"></aside>';
-               content.classList.add('row');
+        q('main').insertAdjacentHTML('afterend', '<aside id="sidebar"></aside>');
     }
 });

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index d4afb4c69a8703371200bd9f7b5ae7625995defa..b23ddb970b0269edbb13aa3f0228403d30ce8db0 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -64,7 +64,15 @@ sub render {
        my ($tmpl, $lang, %args) = @_;
        $lang //= 'en';
        my $meat = _render($tmpl, $lang, %args);
-       _render('skel', $lang, %args, meat => $meat)
+       my $html = _render('skel', $lang, %args, meat => $meat);
+       if ($tmpl eq 'pb_entry') { # Move sidebar to correct position
+               my $builder = HTML::TreeBuilder->new;
+               $builder->ignore_unknown(0);
+               my $tree = $builder->parse_content($html);
+               $tree->fid('content')->postinsert($tree->fid('sidebar'));
+               $html = $tree->as_HTML(undef, undef, $optional_end_tags)
+       }
+       $html
 }
 
 sub render_article {

diff --git a/tmpl/pb_entry.en b/tmpl/pb_entry.en
index 2dd499bc4a897b7ecf5fcd2e236b449df83c4a12..ce2c100a2fcca4e37b04523f762a2f7679144c0b 100644 (file)
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@ -1,9 +1,6 @@
-<div class="row">
-<div class="col-md-9">
 <div id="statement"></div>
-</div>
 
-<div class="col-md-3" id="sidebar">
+<aside id="sidebar">
 <dl>
 <dt>Author</dt> <dd id="author">author</dd>
 <dt>Owner</dt> <dd id="owner">owner</dd>
@@ -48,8 +45,7 @@ To submit solutions to this problem, please visit the problem <a href="/pb/id">o
 <input type="submit" value="Submit job" class="btn btn-primary">
 </form>
 </div>
-</div>
-</div>
+</aside>
 
 <div class="hidden backdrop"></div>
 <div id="solution_modal" class="hidden modal"></div>

diff --git a/tmpl/skel.en b/tmpl/skel.en
index 49d2bb82f165a2c94b4f7689259871e0e0fe7b82..f7ca6226f9320600d79528326c0c3627c097fe41 100644 (file)
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -9,7 +9,6 @@
 <script src="/static/js/all.js" type="text/javascript" async defer integrity="x"></script>
 
 <body>
-<div class="container-fluid">
 <nav role="navigation">
 <ul class="nav nav-pills nav-justified">
 <li id="nav-home"><a href="/">Home</a>
@@ -39,13 +38,11 @@
 </div>
 
 <footer>
-<div class="row">
-<div class="col-md-6 text-center">
+<div class="left-half text-center">
 <a href="http://www.societatea-hermes.ro"><img src="/static/logos/dark.svg#logo-hermes" alt="Societatea Hermes" width="164px" height="100px"></a>
 </div>
 
-<div class="col-md-6 text-center">
+<div class="right-half text-center">
 <a href="http://www.facebook.com/mindcodingcluj"><img src="/static/logos/dark.svg#logo-facebook" alt="MindCoding Facebook page" width="100px" height="100px"></a>
 </div>
-</div>
 </footer>