diff options
Diffstat (limited to 'journal')
| -rw-r--r-- | journal/bootstrap.css | 92 | ||||
| -rw-r--r-- | journal/bootstrap.min.css | 18 | ||||
| -rwxr-xr-x | journal/bootswatch.less | 124 |
3 files changed, 108 insertions, 126 deletions
diff --git a/journal/bootstrap.css b/journal/bootstrap.css index b41e324b..78c27abe 100644 --- a/journal/bootstrap.css +++ b/journal/bootstrap.css @@ -4780,10 +4780,6 @@ h4 { h5 { font-size: 13px; } -h6 { - color: #000000; - font-weight: bold; -} p > a, address > a, .breadcrumb a, @@ -4798,15 +4794,27 @@ abbr[title]:hover { text-decoration: none; border-bottom: 1px solid; } +code, +pre { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + background-color: #eeeeee; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} .page-header { border-bottom: 2px solid #eeeeee; } +hr { + border-bottom: 1px solid #eeeeee; +} .navbar { font-family: "News Cycle", "Arial Narrow Bold", sans-serif; font-weight: bold; } .navbar .navbar-inner { - border-top: 2px solid #eeeeee; border-bottom: 2px solid #eeeeee; -webkit-border-radius: 0; -moz-border-radius: 0; @@ -4980,37 +4988,19 @@ div.subnav li.dropdown.open .dropdown-toggle:hover { .btn-inverse.active { background-color: #000000 \9; } -.modal { - -webkit-border-radius: 0px; - -moz-border-radius: 0px; - border-radius: 0px; - background: #ffffff; -} -.modal-header { - border-bottom: none; -} -.modal-footer { - background: transparent; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - border-top: none; -} -.close, -.close:hover { - border-bottom: none; -} -.hero-unit { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - border: 1px solid rgba(0, 0, 0, 0.05); +.table-bordered { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.hero-unit h1 { - line-height: 1.5em; +legend { + border-bottom: 2px solid #eeeeee; + font-family: "News Cycle", "Arial Narrow Bold", sans-serif; + font-weight: bold; + color: #000000; } .well { -webkit-border-radius: 0; @@ -5020,7 +5010,8 @@ div.subnav li.dropdown.open .dropdown-toggle:hover { -moz-box-shadow: none; box-shadow: none; } -.table-bordered { +.hero-unit { + border: 1px solid rgba(0, 0, 0, 0.05); -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; @@ -5028,31 +5019,28 @@ div.subnav li.dropdown.open .dropdown-toggle:hover { -moz-box-shadow: none; box-shadow: none; } -legend { - border-bottom: 2px solid #eeeeee; - font-family: "News Cycle", "Arial Narrow Bold", sans-serif; - font-weight: bold; - color: #000000; +.hero-unit h1 { + line-height: 1.5em; } -a.thumbnail:hover { - -webkit-box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.3); - border-color: #ddd; +.modal { + -webkit-border-radius: 0px; + -moz-border-radius: 0px; + border-radius: 0px; + background: #ffffff; } -code, -pre, -pre.prettyprint { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background-color: #eeeeee; +.modal-header { + border-bottom: none; +} +.modal-footer { + border-top: none; + background: transparent; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } -hr { - border-bottom: 1px solid #eeeeee; +.close, +.close:hover { + border-bottom: none; } @media (max-width: 768px) { div.subnav { diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css index 88e96ac8..a2a8cbef 100644 --- a/journal/bootstrap.min.css +++ b/journal/bootstrap.min.css @@ -807,10 +807,11 @@ h2{font-size:36px;} h3{font-size:28px;} h4{font-size:20px;} h5{font-size:13px;} -h6{color:#000000;font-weight:bold;} p>a,address>a,.breadcrumb a,abbr[title]{text-decoration:none;border-bottom:1px dotted;}p>a:hover,address>a:hover,.breadcrumb a:hover,abbr[title]:hover{text-decoration:none;border-bottom:1px solid;} +code,pre{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#eeeeee;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .page-header{border-bottom:2px solid #eeeeee;} -.navbar{font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;}.navbar .navbar-inner{border-top:2px solid #eeeeee;border-bottom:2px solid #eeeeee;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +hr{border-bottom:1px solid #eeeeee;} +.navbar{font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;}.navbar .navbar-inner{border-bottom:2px solid #eeeeee;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .brand{padding:16px 20px 20px;font-size:24px;font-weight:bold;text-shadow:none;text-transform:uppercase;} .navbar .nav>li>a{padding:20px 10px 21px;font-size:18px;text-shadow:none;text-transform:uppercase;} .navbar .nav>li.active>a{background-color:transparent;color:#000000;} @@ -831,17 +832,14 @@ div.subnav li.dropdown.open .dropdown-toggle,div.subnav li.dropdown.open .dropdo [class^="icon-"],[class*=" icon-"]{vertical-align:baseline;} .btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#141414;background-image:-moz-linear-gradient(top, #222222, #000000);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#000000));background-image:-webkit-linear-gradient(top, #222222, #000000);background-image:-o-linear-gradient(top, #222222, #000000);background-image:linear-gradient(to bottom, #222222, #000000);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff000000', GradientType=0);border-color:#000000 #000000 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#000000;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#000000;*background-color:#000000;} .btn-inverse:active,.btn-inverse.active{background-color:#000000 \9;} +.table-bordered{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +legend{border-bottom:2px solid #eeeeee;font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;color:#000000;} +.well{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.hero-unit{border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.hero-unit h1{line-height:1.5em;} .modal{-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;background:#ffffff;} .modal-header{border-bottom:none;} -.modal-footer{background:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-top:none;} +.modal-footer{border-top:none;background:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .close,.close:hover{border-bottom:none;} -.hero-unit{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.hero-unit h1{line-height:1.5em;} -.well{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.table-bordered{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -legend{border-bottom:2px solid #eeeeee;font-family:"News Cycle","Arial Narrow Bold",sans-serif;font-weight:bold;color:#000000;} -a.thumbnail:hover{-webkit-box-shadow:0 1px 3px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 1px 3px 1px rgba(0, 0, 0, 0.3);box-shadow:0 1px 3px 1px rgba(0, 0, 0, 0.3);border-color:#ddd;} -code,pre,pre.prettyprint{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#eeeeee;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -hr{border-bottom:1px solid #eeeeee;} @media (max-width:768px){div.subnav{height:auto;}div.subnav .nav>li.active>a{border-top:none;} div.subnav .nav>li:hover>a,div.subnav .nav>li:first-child:hover>a,div.subnav .nav>li.active:hover>a,div.subnav .nav>li.dropdown.open .dropdown-toggle,div.subnav .nav>li.dropdown.open .dropdown-toggle:hover{background-color:#eeeeee;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{border-color:#e5e5e5;}}@media (max-width:979px){.nav-collapse .navbar-form,.nav-collapse .navbar-search{margin-bottom:0;border-top:2px solid #eeeeee;border-bottom:2px solid #eeeeee;}}.pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} diff --git a/journal/bootswatch.less b/journal/bootswatch.less index 2e35a2e7..3793d709 100755 --- a/journal/bootswatch.less +++ b/journal/bootswatch.less @@ -9,6 +9,7 @@ @import url('https://fonts.googleapis.com/css?family=News+Cycle:400,700'); h1, h2, h3, h4, h5, h6 { + line-height: 1.5em; a { @@ -16,33 +17,15 @@ h1, h2, h3, h4, h5, h6 { } } -h1 { - font-size: 48px; -} - -h2 { - font-size: 36px; -} - -h3 { - font-size: 28px; -} +h1 { font-size: 48px; } -h4 { - font-size: 20px; -} +h2 { font-size: 36px; } -h5 { - font-size: 13px; -} +h3 { font-size: 28px; } -h6 { - color: @black; - font-weight: bold; -} +h4 { font-size: 20px; } -// SCAFFOLDING -// ----------------------------------------------------- +h5 { font-size: 13px; } p > a, address > a, @@ -57,10 +40,23 @@ abbr[title] { } } +code, pre { + .border-radius(0); + background-color: @grayLighter; + .box-shadow(none); +} + +// SCAFFOLDING +// ----------------------------------------------------- + .page-header { border-bottom: 2px solid @grayLighter; } +hr { + border-bottom: 1px solid @grayLighter; +} + // NAVBAR // ----------------------------------------------------- @@ -70,7 +66,6 @@ abbr[title] { font-weight: bold; .navbar-inner { - border-top: 2px solid @grayLighter; border-bottom: 2px solid @grayLighter; .border-radius(0); .box-shadow(none); @@ -206,6 +201,9 @@ div.subnav { } } +// NAV +// ----------------------------------------------------- + // BUTTONS // ----------------------------------------------------- @@ -217,79 +215,77 @@ div.subnav { .buttonBackground(@grayDarker, @black); } -// MODALS +// TABLES // ----------------------------------------------------- -.modal { - .border-radius(0px); - background: @bodyBackground; +.table-bordered { + .border-radius(0); + .box-shadow(none); } -.modal-header { - border-bottom: none; -} +// FORMS +// ----------------------------------------------------- -.modal-footer { - background: transparent; - .box-shadow(none); - border-top: none; +legend { + border-bottom: 2px solid @grayLighter; + font-family: @headingsFontFamily; + font-weight: @headingsFontWeight; + color: @headingsColor; } -.close, -.close:hover { - border-bottom: none; -} +// DROPDOWNS +// ----------------------------------------------------- // MISC // ----------------------------------------------------- -.hero-unit { - .box-shadow(none); - border: 1px solid rgba(0,0,0,.05); - .border-radius(0); - - h1 { - line-height: 1.5em; - } -} - .well { .border-radius(0); .box-shadow(none); - } -.table-bordered { +.hero-unit { + border: 1px solid rgba(0,0,0,.05); .border-radius(0); .box-shadow(none); + + h1 { + line-height: 1.5em; + } } +// a.thumbnail:hover { +// .box-shadow(0 1px 3px 1px rgba(0, 0, 0, 0.3)); +// border-color: #ddd; +// } -legend { - border-bottom: 2px solid @grayLighter; - font-family: @headingsFontFamily; - font-weight: @headingsFontWeight; - color: @headingsColor; +.modal { + .border-radius(0px); + background: @bodyBackground; } -a.thumbnail:hover { - .box-shadow(0 1px 3px 1px rgba(0, 0, 0, 0.3)); - border-color: #ddd; +.modal-header { + border-bottom: none; } -code, pre, pre.prettyprint { - .border-radius(0); - background-color: @grayLighter; +.modal-footer { + border-top: none; + background: transparent; .box-shadow(none); } -hr { - border-bottom: 1px solid @grayLighter; +.close, +.close:hover { + border-bottom: none; } +// MEDIA QUERIES +// ----------------------------------------------------- + @media (max-width: 768px) { div.subnav { + height: auto; .nav > li.active > a { |