]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Fuck a color purple
authorMark Otto <otto@github.com>
Fri, 26 Jul 2013 07:04:15 +0000 (00:04 -0700)
committerMark Otto <otto@github.com>
Fri, 26 Jul 2013 07:04:15 +0000 (00:04 -0700)
assets/css/docs.css
assets/ico/apple-touch-icon-114-precomposed.png
assets/ico/apple-touch-icon-144-precomposed.png
assets/ico/apple-touch-icon-57-precomposed.png
assets/ico/apple-touch-icon-72-precomposed.png
assets/ico/favicon.png

index f1864a6c28b1774ebd464eb7b9839975538ee32b..b658a5f7250b408d2d1940a367875ae10cbb8da8 100644 (file)
@@ -15,15 +15,15 @@ body {
 
 /* Custom docs button */
 .btn-bs {
-  color: #b94a48;
+  color: #563d7c;
   background-color: #fff;
   border-color: #e5e5e5;
 }
 .btn-bs:hover,
 .btn-bs:active {
   color: #fff;
-  background-color: #b94a48;
-  border-color: #b94a48;
+  background-color: #563d7c;
+  border-color: #563d7c;
 }
 
 /* Temp CSS until RC2 */
@@ -39,13 +39,13 @@ body {
 -------------------------------------------------- */
 
 .bs-docs-nav {
-  background-color: #b94a48;
+  background-color: #563d7c;
 }
 .bs-docs-nav .navbar-brand {
   color: #fff;
 }
 .bs-docs-nav .navbar-nav > li > a {
-  color: #e6cac8;
+  color: #cdbfe3;
 }
 .bs-docs-nav .navbar-nav > li > a:hover {
   color: #fff;
@@ -53,14 +53,14 @@ body {
 .bs-docs-nav .navbar-nav > .active > a,
 .bs-docs-nav .navbar-nav > .active > a:hover {
   color: #fff;
-  background-color: #993c3a;
+  background-color: #463265;
 }
 .bs-docs-nav .navbar-toggle {
-  border-color: #b94a48;
+  border-color: #563d7c;
 }
 .bs-docs-nav .navbar-toggle:hover {
-  background-color: #993c3a;
-  border-color: #993c3a;
+  background-color: #463265;
+  border-color: #463265;
 }
 
 /* Old docs callout */
@@ -152,7 +152,7 @@ body {
   border-bottom: 1px solid #e5e5e5;
 }
 .bs-header h1 {
-  color: #b94a48;
+  color: #563d7c;
 }
 .bs-header p {
   font-weight: 300;
@@ -239,9 +239,9 @@ body {
 .bs-sidebar .nav > .active:hover > a,
 .bs-sidebar .nav > .active:focus > a {
   font-weight: 500;
-  color: #b94a48;
+  color: #563d7c;
   background-color: transparent;
-  border-right: 1px solid #b94a48;
+  border-right: 1px solid #563d7c;
 }
 
 /* Nav: second level (shown on .active) */
@@ -308,9 +308,8 @@ body {
   padding-bottom: 10px;
   background-color: #eee;
   border: 1px solid #ddd;
-  /* Todo: reconcile these */
-  background-color: rgba(185,74,72,.15);
-  border: 1px solid rgba(185,74,72,.2);
+  background-color: rgba(86,61,124,.15);
+  border: 1px solid rgba(86,61,124,.2);
 }
 
 
index 4bce6da0baa2d3bb4e0c63df054e0988532f8a9c..9d08f7d1fc771f8bbfd3f82ce4db10ed2d742687 100644 (file)
Binary files a/assets/ico/apple-touch-icon-114-precomposed.png and b/assets/ico/apple-touch-icon-114-precomposed.png differ
index 0b6baa106a5a64e41871c8e0bc06bb960e978dad..1d2cb98f3645672158cb495680b653bcc8c982de 100644 (file)
Binary files a/assets/ico/apple-touch-icon-144-precomposed.png and b/assets/ico/apple-touch-icon-144-precomposed.png differ
index 31625ad400ecc28364304d38fe9b89af67d41d6d..292e738499f2a7bcd9c02a79223c66ce3f4413c8 100644 (file)
Binary files a/assets/ico/apple-touch-icon-57-precomposed.png and b/assets/ico/apple-touch-icon-57-precomposed.png differ
index fc8a855eabee65bdedac6fb81b8982128b126889..6ef2d552aedc60c91bf5c4d0e1eb01e735e79a00 100644 (file)
Binary files a/assets/ico/apple-touch-icon-72-precomposed.png and b/assets/ico/apple-touch-icon-72-precomposed.png differ
index 2a5db926567034140197e7d2c4590defc90fa268..a5ddaba17f50e876f7df2e5d895bdf2ca5f419b3 100644 (file)
Binary files a/assets/ico/favicon.png and b/assets/ico/favicon.png differ