Permalink
Browse files

merge

  • Loading branch information...
2 parents c541d22 + e477ab5 commit 6b1a70385c85d6a2fb65a099a8c19d03082a311d @banacorn committed Feb 19, 2013
Showing with 26 additions and 20 deletions.
  1. +2 −3 Makefile
  2. +5 −5 docs/assets/css/bootstrap-responsive.css
  3. +0 −1 less/bootstrap.less
  4. +5 −3 less/navbar.less
  5. +14 −8 less/variables.less
View
@@ -10,7 +10,6 @@ HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\
#
# BUILD DOCS
#
-
build:
@echo "\n${HR}"
@echo "Building Bootstrap..."
@@ -38,7 +37,7 @@ build:
@echo "Thanks for using Bootstrap,"
@echo "<3 @mdo and @fat\n"
-quickbuild:
+buildcss:
@./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
@echo "Compiling LESS with Recess... ${CHECK} Done"
@@ -125,7 +124,7 @@ gh-pages: bootstrap docs
watch:
echo "Watching less files..."; \
- watchr -e "watch('less/.*\.less') { system 'make quickbuild' }"
+ watchr -e "watch('less/.*\.less') { system 'make buildcss' }"
.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js
@@ -993,14 +993,14 @@
display: none;
}
.nav-collapse .nav .nav-header {
- color: #777777;
+ color: #f8f8f8;
text-shadow: none;
}
.nav-collapse .nav > li > a,
.nav-collapse .dropdown-menu a {
padding: 9px 15px;
font-weight: bold;
- color: #777777;
+ color: #f8f8f8;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
@@ -1019,7 +1019,7 @@
.nav-collapse .nav > li > a:focus,
.nav-collapse .dropdown-menu a:hover,
.nav-collapse .dropdown-menu a:focus {
- background-color: #f2f2f2;
+ background-color: #334455;
}
.navbar-inverse .nav-collapse .nav > li > a,
.navbar-inverse .nav-collapse .dropdown-menu a {
@@ -1072,8 +1072,8 @@
float: none;
padding: 10px 15px;
margin: 10px 0;
- border-top: 1px solid #f2f2f2;
- border-bottom: 1px solid #f2f2f2;
+ border-top: 1px solid #334455;
+ border-bottom: 1px solid #334455;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
View
@@ -14,7 +14,6 @@
// CSS Reset
@import "reset.less";
-
// Grid system and page structure
@import "scaffolding.less";
@import "grid.less";
View
@@ -22,7 +22,8 @@
min-height: @navbarHeight;
padding-left: 20px;
padding-right: 20px;
- #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
+ // #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
+ background: @navbarBackground;
border: 1px solid @navbarBorder;
.border-radius(@baseBorderRadius);
.box-shadow(0 1px 4px rgba(0,0,0,.065));
@@ -392,7 +393,8 @@
.navbar-inverse {
.navbar-inner {
- #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
+ // #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
+ background: @navbarInverseBackground;
border-color: @navbarInverseBorder;
}
@@ -532,4 +534,4 @@
// Prevent floats from breaking the navbar
.clearfix();
-}
+}
View
@@ -14,14 +14,15 @@
@grayDark: #333;
@gray: #555;
@grayLight: #999;
-@grayLighter: #eee;
+@grayLighter: #f8f8f8;
@white: #fff;
// Accent colors
// -------------------------
-@blue: #049cdb;
-@blueDark: #0064cd;
+@blue: #345;
+// @blue: #049cdb;
+@blueDark: darken(@blue, 10%);
@green: #46a546;
@red: #9d261d;
@yellow: #ffc40d;
@@ -181,12 +182,16 @@
@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
@navbarHeight: 40px;
-@navbarBackgroundHighlight: #ffffff;
-@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
+@navbarBackgroundHighlight: lighten(@blue, 5%);
+// @navbarBackgroundHighlight: #ffffff;
+@navbarBackground: @blue;
+// @navbarBackground: darken(@navbarBackgroundHighlight, 5%);
@navbarBorder: darken(@navbarBackground, 12%);
-@navbarText: #777;
-@navbarLinkColor: #777;
+@navbarText: @grayLighter;
+@navbarLinkColor: @grayLighter;
+// @navbarText: #777;
+// @navbarLinkColor: #777;
@navbarLinkColorHover: @grayDark;
@navbarLinkColorActive: @gray;
@navbarLinkBackgroundHover: transparent;
@@ -223,7 +228,8 @@
// Hero unit
// -------------------------
-@heroUnitBackground: @grayLighter;
+@heroUnitBackground: @white;
+
@heroUnitHeadingColor: inherit;
@heroUnitLeadColor: inherit;

0 comments on commit 6b1a703

Please sign in to comment.