Skip to content
Browse files

Manually correcting merge conflict with style.css file

  • Loading branch information...
1 parent 2ead6cc commit 2ca4b870c7d0132e8f6c19cd8e9083b9b7b47b6f @rachelbaker committed
Showing with 9 additions and 489 deletions.
  1. +9 −489 style.css
View
498 style.css
@@ -1,10 +1,10 @@
/*
-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
-Version: .86
+Description: A semantic HTML/CSS framework base theme for WordPress Developers ported from Twitter Bootstrap
+Version: .87
=======
License: GNU General Public License
License URI: license.txt
@@ -14,491 +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: 60px;
-}
-
-@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);
-}
-
-
-
-.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;
-}
+Comfortable with LESS? Check out the /less folder where the bootstrapwp.less file is the master complier
-/* Image Styles
-----------------------------------------------------------------------------------------*/
+//////// 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
-[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;
-}
-
-/* Blog Post Specific Items
-----------------------------------------------------------------------------------------*/
-p.meta {
- font-size: 11px;
- line-height: 18px;
- color: #999;
-}
-
-/* Sidebar
-----------------------------------------------------------------------------------------*/
-div.widget {
- margin-bottom: 18px;
-}
-h4.widget-title {
- font-weight: bold;
- line-height: 18px;
- color: #999;
- text-transform: uppercase;
- margin-top: 9px;
-}
-.widget ul {
- margin: 0 0 9px 0;
-}
-.widget ul li {
- list-style: none;
-}
-
-.widget ul > li > a {
- display: block;
- padding: 3px 15px;
- margin-left: -15px;
- margin-right: -15px;
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-.widget ul > li > a:hover {
- color: white;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
- background-color: #08C;
-}
-/* Post Styles
-----------------------------------------------------------------------------------------*/
-sticky {
-}
-
-.entry-meta {
- clear: both;
- display: block;
-}
-
-.format-gallery .gallery-thumb {
- float: left;
- margin: 0 1em 0 0;
-}
-
-/* Search Form Styles
-----------------------------------------------------------------------------------------*/
-
-#searchform input#s {
- padding-left: 4px;
- padding-right: 4px;
- margin-right:4px;
- margin-bottom: 0;
- -webkit-border-radius: 14px;
- -moz-border-radius: 14px;
- border-radius: 14px;
- display: inline;
- float: left;
-}
-
-#searchsubmit {
- display: inline-block;
- padding: 5px 10px 6px;
- font-size: 13px;
- line-height: normal;
- color: #333;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
- background-color: #E6E6E6;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(white), color-stop(25%, white), to(#E6E6E6));
- background-image: -webkit-linear-gradient(white, white 25%, #E6E6E6);
- background-image: -moz-linear-gradient(top, white, white 25%, #E6E6E6);
- background-image: -ms-linear-gradient(white, white 25%, #E6E6E6);
- background-image: -o-linear-gradient(white, white 25%, #E6E6E6);
- background-image: linear-gradient(white, white 25%, #E6E6E6);
- background-repeat: no-repeat;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
- border: 1px solid #CCC;
- border-bottom-color: #BBB;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- cursor: pointer;
- -webkit-transition: 0.1s linear all;
- -moz-transition: 0.1s linear all;
- -ms-transition: 0.1s linear all;
- -o-transition: 0.1s linear all;
- transition: 0.1s linear all;
- -webkit-appearance: button;
-}
-
-/* Comment Styles
-----------------------------------------------------------------------------------------*/
-li.bypostauthor {
- border: 1px solid;
- border-color: #08C;
- display: block;
-}
-#respond {
- margin-top: 20px;
-}
-ol.commentlist {
- margin: 0 0 15px !important;
-}
-ol.commentlist img.avatar {
- margin: 8px 10px 0 0;
- padding: 4px;
- line-height: 1;
- border: 1px solid #DDD;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
- float: left;
-}
-ol.commentlist li {
- margin: 0;
- padding: 8px 0 8px 64px;
- list-style: none;
- overflow: hidden;
- position: relative;
-}
-ol.commentlist li header {
- margin: 0;
- line-height: 1.5em;
-}
-ol.commentlist li article nav {
- float: right;
-}
-ol.commentlist li ul {
- margin: 8px 0 0 !important;
-}
-ol.commentlist li li {
- border: 0;
- margin: 0 0 0 68px !important;
- padding: 0 0 8px;
-}
-ol.comment-list li .comment-content p {
- margin: 0 0 10px !important;
-}
-ol.comment-list li p.meta {
- font-weight: normal;
- background: transparent;
- padding: 0;
- font-style: italic;
- font-size: 0.9em;
- margin: 0 0 10px !important;
-}
-ol.comment-list li p.meta strong {
- font-weight: bold;
-}
-#respond {
- margin-bottom: 15px;
-}
-#respond input.text, #respond select, #respond textarea,
-.comment-form-author input,
-.comment-form-email input,
-.comment-form-url input {
- border: 1px solid #eee;
- background: #f6f6f6;
- color: #777;
- font-size: 1em;
- line-height: 1em;
- padding: 0.375em;
- width: 50%;
- margin: 0 4px 0 0;
- outline: 0;
- display: block;
-}
-
-#respond input.text:focus, #respond select:focus, #respond textarea:focus,
-.comment-form-author input:focus,
-.comment-form-email input:focus,
-.comment-form-url input:focus,
-.widget_search input#s:focus { border:1px solid #ccc; }
-.borderradius #respond input.text, .borderradius #respond select, .borderradius #respond textarea,
-.borderradius .comment-form-author input,
-.borderradius .comment-form-email input,
-.borderradius .comment-form-url input,
-.borderradius .widget_search input#s {
- -moz-border-radius:0.5em;
- -webkit-border-radius:0.5em;
- -khtml-border-radius:0.5em;
- -o-border-radius:0.5em;
- border-radius:0.5em;
-}
-#respond textarea {
- width: 98%;
- margin-right: 0;
-}
-#respond label {
- font-size: 1em;
- font-weight: bold;
- display: inline;
-}
-
-.button, #submit, .widget_search #searchsubmit, .reply .comment-reply-link {
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- color: white;
- padding: 4px 10px 4px;
- font-size: 13px;
- line-height: 18px;
- text-align: center;
- border: 1px solid #CCC;
- border-bottom-color: #BBB;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- cursor: pointer;
- background-color: #006DCC;
- background-image: -moz-linear-gradient(top, #08C, #04C);
- background-image: -ms-linear-gradient(top, #08C, #04C);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#08C), to(#04C));
- background-image: -webkit-linear-gradient(top, #08C, #04C);
- background-image: -o-linear-gradient(top, #08C, #04C);
- background-image: linear-gradient(top, #08C, #04C);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
- border-color: #04C #04C #002A80;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-
-.button:hover, #submit:hover, .widget_search #searchsubmit:hover, .reply .comment-reply-link:hover{
- color: #333333;
- text-decoration: none;
- background-color: #e6e6e6;
- background-position: 0 -15px;
- -webkit-transition: background-position 0.1s linear;
- -moz-transition: background-position 0.1s linear;
- -ms-transition: background-position 0.1s linear;
- -o-transition: background-position 0.1s linear;
- transition: background-position 0.1s linear;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- color: #ffffff;
- background-color: #0044cc;
-}
-.button:active, #submit:active, .widget_search #searchsubmit:active, .button.green:active {position: relative; top:1px;}
-
-/* Caption Styling
-----------------------------------------------------------------------------------------*/
-.wp-caption {
- padding: 9px;
-}
-.wp-caption-text {
- font-size: 10px;
- line-height: 14px;
-}
-.gallery-caption {
- padding: 9px;
-}
-/* Sticky Post Styles
-----------------------------------------------------------------------------------------*/
-.sticky {
- padding: 4px;
- border: 1px solid #DDD;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-/* Custom Elements Added
-----------------------------------------------------------------------------------------*/
-.masthead h2 {
- margin-bottom: 0;
- font-size: 60px;
- line-height: 1;
- letter-spacing: -1px;
- text-align: center;
- margin-bottom: 9px;
-}
+-------------------------------------------------- */

0 comments on commit 2ca4b87

Please sign in to comment.
Something went wrong with that request. Please try again.