Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
305374ab
Commit
305374ab
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
clear up nav variables
parent
a613a8eb
1 merge request
!1952
Tabulation navigation with Typeahead
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
+3
-2
docs/assets/css/bootstrap.css
less/navbar.less
+2
-2
less/navbar.less
less/variables.less
+21
-1
less/variables.less
with
26 additions
and
5 deletions
+26
-5
docs/assets/bootstrap.zip
+
0
-
0
View file @
305374ab
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
3
-
2
View file @
305374ab
...
...
@@ -310,8 +310,9 @@ h4,
h5
,
h6
{
margin
:
0
;
font-weight
:
bold
;
color
:
#333333
;
font-family
:
''
;
font-weight
:
normal
;
color
:
''
;
text-rendering
:
optimizelegibility
;
}
h1
small
,
...
...
This diff is collapsed.
Click to expand it.
less/navbar.less
+
2
-
2
View file @
305374ab
...
...
@@ -233,9 +233,9 @@
// Active nav items
.navbar .nav .active > a,
.navbar .nav .active > a:hover {
color: @navbarLinkColor
Ho
ve
r
;
color: @navbarLinkColor
Acti
ve;
text-decoration: none;
background-color: @navbarBackground;
background-color: @navbar
Link
Background
Active
;
}
// Dividers (basically a vertical hr)
...
...
This diff is collapsed.
Click to expand it.
less/variables.less
+
21
-
1
View file @
305374ab
...
...
@@ -105,10 +105,12 @@
// COMPONENT VARIABLES
// --------------------------------------------------
// Z-index master list
// -------------------------
// Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :)
@zindexDropdown: 1000;
...
...
@@ -118,32 +120,46 @@
@zindexModalBackdrop: 1040;
@zindexModal: 1050;
// Sprite icons path
// -------------------------
@iconSpritePath: "../img/glyphicons-halflings.png";
@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
// Input placeholder text color
// -------------------------
@placeholderText: @grayLight;
// Hr border color
// -------------------------
@hrBorder: @grayLighter;
// Navbar
// -------------------------
@navbarHeight: 40px;
@navbarBackground: @grayDarker;
@navbarBackgroundHighlight: @grayDark;
@navbarLinkBackgroundHover: transparent;
@navbarText: @grayLight;
@navbarLinkColor: @grayLight;
@navbarLinkColorHover: @white;
@navbarLinkColorActive: @navbarLinkColorHover;
@navbarLinkBackgroundHover: transparent;
@navbarLinkBackgroundActive: @navbarBackground;
// Hero unit
// -------------------------
@heroUnitBackground: #312f2e;
@heroUnitHeadingColor: @white;
@heroUnitLeadColor: @white;
// Form states and alerts
// -------------------------
@warningText: #c09853;
@warningBackground: #fcf8e3;
@warningBorder: darken(spin(@warningBackground, -10), 3%);
...
...
@@ -162,15 +178,19 @@
// GRID
// --------------------------------------------------
// Default 940px grid
// -------------------------
@gridColumns: 12;
@gridColumnWidth: 60px;
@gridGutterWidth: 20px;
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// Fluid grid
// -------------------------
@fluidGridColumnWidth: 6.382978723%;
@fluidGridGutterWidth: 2.127659574%;
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets