Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
Yii Bootstrap 3
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Common
Yii Bootstrap 3
Commits
6a4ca171
Commit
6a4ca171
authored
Aug 01, 2012
by
niskac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated bootstrap less files
parent
e2ec139b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
92 additions
and
59 deletions
+92
-59
breadcrumbs.less
lib/bootstrap/less/breadcrumbs.less
+6
-8
button-groups.less
lib/bootstrap/less/button-groups.less
+12
-17
buttons.less
lib/bootstrap/less/buttons.less
+7
-4
dropdowns.less
lib/bootstrap/less/dropdowns.less
+1
-11
forms.less
lib/bootstrap/less/forms.less
+5
-2
grid.less
lib/bootstrap/less/grid.less
+12
-2
labels-badges.less
lib/bootstrap/less/labels-badges.less
+15
-0
mixins.less
lib/bootstrap/less/mixins.less
+0
-4
navbar.less
lib/bootstrap/less/navbar.less
+0
-0
responsive-navbar.less
lib/bootstrap/less/responsive-navbar.less
+1
-1
tables.less
lib/bootstrap/less/tables.less
+1
-1
variables.less
lib/bootstrap/less/variables.less
+32
-9
No files found.
lib/bootstrap/less/breadcrumbs.less
View file @
6a4ca171
...
...
@@ -4,13 +4,11 @@
.breadcrumb {
padding:
7px 14
px;
padding:
8px 15
px;
margin: 0 0 @baseLineHeight;
list-style: none;
#gradient > .vertical(@white, #f5f5f5);
border: 1px solid #ddd;
.border-radius(3px);
.box-shadow(inset 0 1px 0 @white);
background-color: #f5f5f5;
.border-radius(4px);
li {
display: inline-block;
.ie7-inline-block();
...
...
@@ -18,9 +16,9 @@
}
.divider {
padding: 0 5px;
color:
@grayLight
;
color:
#ccc
;
}
.active
a
{
color: @gray
Dark
;
.active {
color: @gray
Light
;
}
}
lib/bootstrap/less/button-groups.less
View file @
6a4ca171
...
...
@@ -34,11 +34,13 @@
}
.btn-group > .btn,
.btn-group > .dropdown-menu {
font-size:
13px
; // redeclare as part 2 of font-size inline-block hack
font-size:
@baseFontSize
; // redeclare as part 2 of font-size inline-block hack
}
// Reset fonts for other sizes
.btn-group > .btn-mini,
.btn-group > .btn-mini {
font-size: 11px;
}
.btn-group > .btn-small {
font-size: 12px;
}
...
...
@@ -106,22 +108,22 @@
// ----------------------
// Give the line between buttons some depth
.btn-group > .dropdown-toggle {
.btn-group > .
btn + .
dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
.box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
*padding-top: 4px;
*padding-bottom: 4px;
}
.btn-group > .btn-mini.dropdown-toggle {
.btn-group > .btn-mini
+
.dropdown-toggle {
padding-left: 5px;
padding-right: 5px;
}
.btn-group > .btn-small.dropdown-toggle {
.btn-group > .btn-small
+
.dropdown-toggle {
*padding-top: 4px;
*padding-bottom: 4px;
}
.btn-group > .btn-large.dropdown-toggle {
.btn-group > .btn-large
+
.dropdown-toggle {
padding-left: 12px;
padding-right: 12px;
}
...
...
@@ -162,22 +164,16 @@
// Reposition the caret
.btn .caret {
margin-top:
7
px;
margin-top:
8
px;
margin-left: 0;
}
.btn:hover .caret,
.open.btn-group .caret {
.opacity(100);
}
// Carets in other button sizes
.btn-mini .caret {
margin-top: 5px;
}
.btn-small .caret {
.btn-mini .caret,
.btn-small .caret,
.btn-large .caret {
margin-top: 6px;
}
.btn-large .caret {
margin-top: 6px;
border-left-width: 5px;
border-right-width: 5px;
border-top-width: 5px;
...
...
@@ -200,7 +196,6 @@
.caret {
border-top-color: @white;
border-bottom-color: @white;
.opacity(75);
}
}
...
...
lib/bootstrap/less/buttons.less
View file @
6a4ca171
...
...
@@ -12,9 +12,9 @@
.ie7-inline-block();
padding: 4px 14px;
margin-bottom: 0; // For input.btn
font-size:
13px
;
line-height:
20px
;
*line-height:
20px
;
font-size:
@baseFontSize
;
line-height:
@baseLineHeight
;
*line-height:
@baseLineHeight
;
text-align: center;
vertical-align: middle;
cursor: pointer;
...
...
@@ -95,7 +95,7 @@
// Mini
.btn-mini {
padding: 2px 6px;
font-size: @baseFontSize -
2
px;
font-size: @baseFontSize -
3
px;
line-height: @baseLineHeight - 4px;
}
...
...
@@ -107,6 +107,9 @@
padding-right: 0;
.box-sizing(border-box);
}
.btn-block + .btn-block {
margin-top: 5px;
}
// Alternate buttons
...
...
lib/bootstrap/less/dropdowns.less
View file @
6a4ca171
...
...
@@ -28,7 +28,6 @@
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
.opacity(30);
}
// Place the caret
...
...
@@ -36,15 +35,6 @@
margin-top: 8px;
margin-left: 2px;
}
.dropdown a:focus .caret,
.dropdown a:hover .caret,
.open .caret {
.opacity(100);
}
.navbar .nav .open > a {
color: @navbarLinkColorActive;
}
// The dropdown menu (ul)
// ----------------------
...
...
@@ -57,7 +47,7 @@
float: left;
min-width: 160px;
padding: 5px 0;
margin:
1
px 0 0; // override default ul
margin:
2
px 0 0; // override default ul
list-style: none;
background-color: @dropdownBackground;
border: 1px solid #ccc; // Fallback for IE7-8
...
...
lib/bootstrap/less/forms.less
View file @
6a4ca171
...
...
@@ -118,8 +118,7 @@ input[type="color"],
background-color: @inputBackground;
border: 1px solid @inputBorder;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@transition: border linear .2s, box-shadow linear .2s;
.transition(@transition);
.transition(~"border linear .2s, box-shadow linear .2s");
// Focus state
&:focus {
...
...
@@ -280,6 +279,10 @@ textarea[class*="span"],
.input-append .uneditable-input[class*="span"],
.input-prepend input[class*="span"],
.input-prepend .uneditable-input[class*="span"],
.row-fluid input[class*="span"],
.row-fluid select[class*="span"],
.row-fluid textarea[class*="span"],
.row-fluid .uneditable-input[class*="span"],
.row-fluid .input-prepend [class*="span"],
.row-fluid .input-append [class*="span"] {
display: inline-block;
...
...
lib/bootstrap/less/grid.less
View file @
6a4ca171
...
...
@@ -7,4 +7,15 @@
#grid > .core(@gridColumnWidth, @gridGutterWidth);
// Fluid (940px)
#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
\ No newline at end of file
#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
// Reset utility classes due to specificity
[class*="span"].hide,
.row-fluid [class*="span"].hide {
display: none;
}
[class*="span"].pull-right,
.row-fluid [class*="span"].pull-right {
float: right;
}
lib/bootstrap/less/labels-badges.less
View file @
6a4ca171
...
...
@@ -55,3 +55,18 @@ a {
&-inverse { background-color: @grayDark; }
&-inverse[href] { background-color: darken(@grayDark, 10%); }
}
// Quick fix for labels/badges in buttons
.btn {
.label,
.badge {
position: relative;
top: -1px;
}
}
.btn-mini {
.label,
.badge {
top: 0;
}
}
lib/bootstrap/less/mixins.less
View file @
6a4ca171
...
...
@@ -65,10 +65,6 @@
.ie7-restore-right-whitespace() {
*margin-right: .3em;
&:last-child {
*margin-left: 0;
}
}
// Sizing shortcuts
...
...
lib/bootstrap/less/navbar.less
View file @
6a4ca171
This diff is collapsed.
Click to expand it.
lib/bootstrap/less/responsive-navbar.less
View file @
6a4ca171
...
...
@@ -5,7 +5,7 @@
// TABLETS AND BELOW
// -----------------
@media (max-width:
979px
) {
@media (max-width:
@navbarCollapseWidth
) {
// UNFIX THE TOPBAR
// ----------------
...
...
lib/bootstrap/less/tables.less
View file @
6a4ca171
...
...
@@ -79,7 +79,7 @@ table {
.table-bordered {
border: 1px solid @tableBorder;
border-collapse: separate; // Done so we can round those corners!
*border-collapse: collapse
d
; // IE7 can't round corners anyway
*border-collapse: collapse; // IE7 can't round corners anyway
border-left: 0;
.border-radius(4px);
th,
...
...
lib/bootstrap/less/variables.less
View file @
6a4ca171
...
...
@@ -70,7 +70,7 @@
// -------------------------
@btnBackground: @white;
@btnBackgroundHighlight: darken(@white, 10%);
@btnBorder: #
ccc
;
@btnBorder: #
bbb
;
@btnPrimaryBackground: @linkColor;
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%);
...
...
@@ -154,16 +154,19 @@
// Navbar
// -------------------------
@navbarHeight: 40px;
@navbarBackground: #111;
@navbarBackgroundHighlight: #222;
@navbarCollapseWidth: 979px;
@navbarText: @grayLight;
@navbarLinkColor: @grayLight;
@navbarLinkColorHover: @white;
@navbarLinkColorActive: @navbarLinkColorHover;
@navbarHeight: 40px;
@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
@navbarBackgroundHighlight: #ffffff;
@navbarBorder: darken(@navbarBackground, 12%);
@navbarText: @gray;
@navbarLinkColor: @gray;
@navbarLinkColorHover: @grayDark;
@navbarLinkColorActive: @gray;
@navbarLinkBackgroundHover: transparent;
@navbarLinkBackgroundActive:
@navbarBackground
;
@navbarLinkBackgroundActive:
darken(@navbarBackground, 5%)
;
@navbarSearchBackground: lighten(@navbarBackground, 25%);
@navbarSearchBackgroundFocus: @white;
...
...
@@ -171,6 +174,26 @@
@navbarSearchPlaceholderColor: #ccc;
@navbarBrandColor: @navbarLinkColor;
// Inverted navbar
@navbarInverseBackground: #111111;
@navbarInverseBackgroundHighlight: #222222;
@navbarInverseBorder: #252525;
@navbarInverseText: @grayLight;
@navbarInverseLinkColor: @grayLight;
@navbarInverseLinkColorHover: @white;
@navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
@navbarInverseLinkBackgroundHover: transparent;
@navbarInverseLinkBackgroundActive: @navbarInverseBackground;
@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
@navbarInverseSearchBackgroundFocus: @white;
@navbarInverseSearchBorder: @navbarInverseBackground;
@navbarInverseSearchPlaceholderColor: #ccc;
@navbarInverseBrandColor: @navbarInverseLinkColor;
// Hero unit
// -------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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