diff --git a/bootstrapmediawiki.php b/bootstrapmediawiki.php index ae633aa..f6bc859 100644 --- a/bootstrapmediawiki.php +++ b/bootstrapmediawiki.php @@ -305,11 +305,11 @@ if( $subnav_links = $this->get_page_links('Bootstrap:Subnav') ) { if(preg_match('/^\*\s*([^\*]*)\[\[:?(.+)\]\]/', $line, $match)) { $sub = false; $link = true; - }elseif(preg_match('/^\*\s*([^\*]*)\[([^ ]+) (.+)\]/', $line, $match)) { + }elseif(preg_match('/^\*\s*([^\*\[]*)\[([^\[ ]+) (.+)\]/', $line, $match)) { $sub = false; $link = true; $external = true; - }elseif(preg_match('/^\*\*\s*([^\*]*)\[([^ ]+) (.+)\]/', $line, $match)) { + }elseif(preg_match('/^\*\*\s*([^\*\[]*)\[([^\[ ]+) (.+)\]/', $line, $match)) { $sub = true; $link = true; $external = true; diff --git a/style.css b/style.css index 4e78a32..26b3063 100644 --- a/style.css +++ b/style.css @@ -1,5 +1,6 @@ body { padding-top: 100px; + background-position: left 80px !important; } body.page-Main_Page .page-header, @@ -212,21 +213,53 @@ img.thumbborder { border: 1px solid #dddddd; } +.navbar .navbar-inner { + background: #fff; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +.navbar .brand { + color: #00654d; +} + +.brand img { + margin-top: -5px; + display: inline-block; + vertical-align: middle; +} + +.navbar input { + background-color: #f5f5f5; + border-color: #ccc; + color: #333; +} + +.navbar .nav > li > a { + color: #333; + text-shadow: none; +} + +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > li > a:hover { + color: #333; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.1); +} + +.navbar .nav .dropdown-toggle .caret, +.navbar .nav .open.dropdown .caret { + border-top-color: #333; +} + /* Subnav */ .subnav { + background: url(images/nav-bg.png) top center no-repeat; width: 100%; height: 36px; + height: 63px; margin-top: 2px; - background-color: #eeeeee; /* Old browsers */ - background-repeat: repeat-x; /* Repeat the gradient */ - background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */ - background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */ - background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */ - background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ - background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */ - border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -238,11 +271,12 @@ img.thumbborder { .subnav .nav > li > a { text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1); text-decoration: none; + color: #fff; margin: 0; - padding-top: 11px; - padding-bottom: 11px; - border-left: 1px solid #f5f5f5; - border-right: 1px solid #e5e5e5; + padding-top: 16px; + padding-bottom: 16px; + border-left: 1px solid transparent; + border-right: 1px solid transparent; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; @@ -252,9 +286,9 @@ img.thumbborder { .subnav .nav > .active > a, .subnav .nav > .active > a:hover { padding-left: 13px; - color: #777; - background-color: #e9e9e9; - border-right-color: #ddd; + color: #fff; + background-color: #497168; + border-right-color: transparent; border-left: 0; -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05); @@ -262,7 +296,7 @@ img.thumbborder { } .subnav .nav-tabs .dropdown-toggle .caret, .subnav .nav-pills .dropdown-toggle .caret { - border-top-color: #777; + border-top-color: #000; } .subnav .nav > .active > a .caret, @@ -315,10 +349,6 @@ pre.linenums ol { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */ } .subnav-fixed .nav { width: 1170px;