diff --git a/README.md b/README.md index a5b6ba42a135..4b5f9041db1c 100755 --- a/README.md +++ b/README.md @@ -27,6 +27,13 @@ __Functions.php__ * Edited bootstrapwp_js_loader() to remove prettify.js script * Added new Bootstrap_Walker_Nav_Menu class to assign "dropdown-menu" class to navigation sub-menus +__Style.css__ + +* Removed content because it this file is not loaded via bootstrapwp_css_loader() +* Added note to add custom updates to the less/bswp-custom.less file to safely retain the ability to update the less files with future versions of Bootstrap or BootstrapWP +* Bumped version to .87 + + __JS Folder__ * Removed the individual .js files and replaced with single compiled `boostrap.js` file @@ -35,6 +42,11 @@ __CSS Folder__ * Removed folder entirely because main style file is compiled less file located at `less/bootstrapwp.css` +__LESS Folder__ + +* Updated LESS files from Twitter Bootstrap 2.04 branch +* Added bswp-docs.less file to pull in styles to allow doc pages to format correctly +* Added note to use bswp-custom.less file for any custom additions to allow for easy updating of styles. diff --git a/style.css b/style.css index ae6d664c965f..0f0c68d7508c 100755 --- a/style.css +++ b/style.css @@ -1,9 +1,9 @@ /* -Theme Name: Bootstrap for WordPress -Theme URI: http://www.rachelbaker.me +Theme Name: BootstrapWP +Theme URI: http://bootstrapwp.rachelbaker.me Author: Rachel Baker Author URI: http://www.rachelbaker.me -Description: A semantic HTML base theme for WordPress ported from Twitter Bootstrap +Description: A semantic HTML/CSS framework base theme for WordPress Developers ported from Twitter Bootstrap Version: .87 ======= License: GNU General Public License @@ -14,202 +14,11 @@ Use it to make something cool, have fun, and share what you've learned with othe */ /******************************************************** -Overriding some defaults from the Bootstrap defaults to improve/fix integration with WordPress --------------------------------------------------- */ -body { - padding-top: 0; -} - -@media (max-width: 979px) { - body { - padding-top: 0; - } -} - -/* Changing the navbar from 'fixed' to 'relative' to accomodate the WP-admin bar -----------------------------------------------------------------------------------------*/ -.navbar-relative { - position: relative; - width: 100%; - right: 0; - left: 0; - z-index: 10000; -} - -.dropdown { - position: relative; -} - -/* Swapping out styles: replacing 'active' with 'current-menu-item' -----------------------------------------------------------------------------------------*/ - -.navbar .nav .current-menu-item > a { - color: white; - text-decoration: none; - background-color: #222; - background-color: rgba(0, 0, 0, 0.5); -} - -/* Swapping out styles: replacing '.dropdown-menu' with 'sub-menu' -----------------------------------------------------------------------------------------*/ -/*.navbar .sub-menu { - top: 41px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -}*/ - -ul.sub-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - float: left; - display: none; - min-width: 160px; - padding: 4px 0; - margin: 1px 0 0; - list-style: none; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - *border-right-width: 2px; - *border-bottom-width: 2px; -} -.navbar li.open ul.sub-menu { - display: block; -} -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} +Comfortable with LESS? Check out the /less folder where the bootstrapwp.less file is the master complier +//////// IMPORTANT! Make custom edits/changes in the less/bswp-custom.less file +//////// to safely retain the ability to update the less files with future +//////// versions of Bootstrap or BootstrapWP - -.sub-menu a { - display: block; - padding: 3px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #333333; - white-space: nowrap; -} - -.sub-menu .divider { - height: 1px; - margin: 8px 1px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; - *width: 100%; - *margin: -5px 0 5px; -} - -.sub-menu li > a:hover, .sub-menu .active > a, .sub-menu .active > a:hover { - color: #fff; - text-decoration: none; - background-color: #0088cc; -} -.navbar .sub-menu li { - list-style: none; -} - -.navbar ..sub-menu:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 9px; -} -.navbar .sub-menu:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - position: absolute; - top: -6px; - left: 10px; -} -.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { - border-top-color: #fff; -} -.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; -} -.navbar .nav .active > .dropdown-toggle:hover { - color: #fff; -} -.navbar .nav.pull-right .sub-menu { - right: 0; -} -.navbar .nav.pull-right .sub-menu:before { - left: auto; - right: 12px; -} -.navbar .nav.pull-right .sub-menu:after { - left: auto; - right: 13px; -} -.navbar .nav.pull-right .sub-menu, -.navbar .nav .sub-menu.pull-right { - left: auto; - right: 0; -} -.navbar .nav.pull-right .sub-menu:before, -.navbar .nav .sub-menu.pull-right:before { - left: auto; - right: 12px; -} -.navbar .nav.pull-right .sub-menu:after, -.navbar .nav .sub-menu.pull-right:after { - left: auto; - right: 13px; -} - -/* Image Styles -----------------------------------------------------------------------------------------*/ - -[class^="icon-"] { - display: inline-block; - width: 14px; - height: 14px; - vertical-align: text-top; - background-image: url(img/glyphicons-halflings.png); - background-repeat: no-repeat; - *margin-right: .3em; -} -.icon-white { - background-image: url(img/glyphicons-halflings-white.png); -} -.alignleft { - display: inline; - float: left; -} -.alignright { - display: inline; - float: right; -} -.aligncenter { - clear: both; - display: block; - margin-left: auto; - margin-right: auto; -} - +-------------------------------------------------- */