bootstrap-overrides.css in artfully_ose-1.1.0.rc1

- old
+ new

@@ -1,16 +1,9 @@
 
 /*
  * Wonk for asset pipeline
  */
-[class^="icon-"],
-[class*=" icon-"] {
-  background-image: url("/assets/glyphicons-halflings.png");
-}
-.icon-white {
-  background-image: url("/assets/glyphicons-halflings-white.png");
-}
 
 .navbar-inner, .navbar .fill {
   background-color: #175c71;
   background-repeat: repeat-x;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#2086a6), to(#175c71));
@@ -41,18 +34,19 @@
 
 .navbar-inner-admin .nav > li > a {
   color: #FFFFFF;
 }
 
-.navbar a.brand {
+.navbar a.artfully-brand {
   background-image: url('/assets/pages/logo-white-topbar.png');
   background-repeat: no-repeat;
   background-position: 18px 7px;
   text-indent: 5000px;
   display: block;
   width: 85px;
 }
+
 .navbar .divider-vertical {
   background-color: #175c71;
   border-color: #2086a6;
 }
 
@@ -60,16 +54,16 @@
   background-color: #ccc;
   background-image: none;
   font-weight: normal;
 }
 
-.feedback-footer .navbar-inner .container {
+.feedback-footer .navbar-inner .container, .navbar.marketing .navbar-inner .container {
   background-image: url('/assets/falogo_footer.png');
   background-repeat: no-repeat;
   background-position: 0px center;
-  padding-top: 15px;
-  padding-bottom: 15px;
+  padding-top: 9px;
+  padding-bottom: 11px;
   padding-left: 95px;
   width: 1030px;
 }
 
 .feedback-footer .navbar-inner a {
@@ -115,10 +109,14 @@
   margin-top: 45px;
   padding: 35px 0 36px;
   border-top: 1px solid #E5E5E5;
 }
 
+.footer .powered-by {
+  float: right;
+}
+
 .footer ul li {
   float: left;
   margin-right: 10px;
 }
 .footer a {
@@ -238,11 +236,11 @@
   -webkit-border-radius: 0 0 4px 4px;
   -moz-border-radius: 0 0 4px 4px;
   border-radius: 0 0 4px 4px;
 }
 .icon-gray {
-  background-image: url("/assets/glyphicons-halflings-gray.png");
+  color: gray;
 }
 
 .btn-primary {
   background-color: #175c71;
   background-repeat: repeat-x;
@@ -264,6 +262,46 @@
   background-color: #175c71;
 }
 .btn-primary:active,
 .btn-primary.active {
   background-color: #004099 \9;
-}
\ No newline at end of file
+}
+
+.form-vertical .input-append,
+.form-vertical .input-prepend,
+.form-vertical .input-prepend input {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
+.control {
+  margin-bottom: 5px;
+}
+
+.input-prepend .add-on,
+.input-append .add-on,
+.input-prepend .btn,
+.input-append .btn {
+  margin-left: -1px;
+}
+
+.input-prepend .add-on,
+.input-prepend .btn {
+  margin-right: -5px;
+}
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
+}