mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-08 17:22:31 +03:00
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
This commit is contained in:
Mark Otto
+121
-104
@@ -12,25 +12,53 @@
|
||||
padding-left: 0; // Override default ul/ol
|
||||
list-style: none;
|
||||
.clearfix();
|
||||
}
|
||||
.nav > li {
|
||||
display: block;
|
||||
}
|
||||
.nav > li > a {
|
||||
position: relative;
|
||||
display: block;
|
||||
padding: 10px 15px;
|
||||
}
|
||||
.nav > li > a:hover,
|
||||
.nav > li > a:focus {
|
||||
text-decoration: none;
|
||||
background-color: @grayLighter;
|
||||
}
|
||||
> li {
|
||||
display: block;
|
||||
> a {
|
||||
position: relative;
|
||||
display: block;
|
||||
padding: 10px 15px;
|
||||
&:hover,
|
||||
&:focus {
|
||||
text-decoration: none;
|
||||
background-color: @grayLighter;
|
||||
}
|
||||
}
|
||||
|
||||
// Redeclare pull classes because of specifity
|
||||
// Todo: consider making these utilities !important to avoid this bullshit
|
||||
.nav > .pull-right {
|
||||
float: right;
|
||||
// Nav states and addons
|
||||
// --------------------------------------------------
|
||||
|
||||
// Disabled state
|
||||
// -------------------------
|
||||
|
||||
// Gray out text
|
||||
&.disabled > a {
|
||||
color: @grayLight;
|
||||
}
|
||||
// Nuke hover effects
|
||||
&.disabled > a:hover,
|
||||
&.disabled > a:focus {
|
||||
color: @grayLight;
|
||||
text-decoration: none;
|
||||
background-color: transparent;
|
||||
cursor: default;
|
||||
}
|
||||
// Space the headers out when they follow another list item (link)
|
||||
&+ .nav-header {
|
||||
margin-top: 9px;
|
||||
}
|
||||
}
|
||||
|
||||
// Redeclare pull classes because of specifity
|
||||
// Todo: consider making these utilities !important to avoid this bullshit
|
||||
> .pull-right {
|
||||
float: right;
|
||||
}
|
||||
|
||||
// Dividers (basically an hr) within the dropdown
|
||||
.divider {
|
||||
.nav-divider();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -44,63 +72,79 @@
|
||||
// Give the tabs something to sit on
|
||||
.nav-tabs {
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
.nav-tabs > li {
|
||||
float: left;
|
||||
// Make the list-items overlay the bottom border
|
||||
margin-bottom: -1px;
|
||||
}
|
||||
// Actual tabs (as links)
|
||||
.nav-tabs > li > a {
|
||||
margin-right: 2px;
|
||||
line-height: @line-height-base;
|
||||
border: 1px solid transparent;
|
||||
border-radius: @border-radius-base @border-radius-base 0 0;
|
||||
&:hover {
|
||||
border-color: @grayLighter @grayLighter #ddd;
|
||||
> li {
|
||||
float: left;
|
||||
// Make the list-items overlay the bottom border
|
||||
margin-bottom: -1px;
|
||||
|
||||
// Actual tabs (as links)
|
||||
> a {
|
||||
margin-right: 2px;
|
||||
line-height: @line-height-base;
|
||||
border: 1px solid transparent;
|
||||
border-radius: @border-radius-base @border-radius-base 0 0;
|
||||
&:hover {
|
||||
border-color: @grayLighter @grayLighter #ddd;
|
||||
}
|
||||
}
|
||||
|
||||
// Active state, and it's :hover to override normal :hover
|
||||
&.active > a,
|
||||
&.active > a:hover,
|
||||
&.active > a:focus {
|
||||
color: @gray;
|
||||
background-color: @body-bg;
|
||||
border: 1px solid #ddd;
|
||||
border-bottom-color: transparent;
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
// pulling this in mainly for less shorthand
|
||||
&.nav-justified {
|
||||
.nav-justified;
|
||||
.nav-tabs-justified;
|
||||
}
|
||||
}
|
||||
// Active state, and it's :hover to override normal :hover
|
||||
.nav-tabs > .active > a,
|
||||
.nav-tabs > .active > a:hover,
|
||||
.nav-tabs > .active > a:focus {
|
||||
color: @gray;
|
||||
background-color: @body-bg;
|
||||
border: 1px solid #ddd;
|
||||
border-bottom-color: transparent;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
|
||||
// Pills
|
||||
// -------------------------
|
||||
.nav-pills {
|
||||
> li {
|
||||
float: left;
|
||||
|
||||
.nav-pills > li {
|
||||
float: left;
|
||||
// Links rendered as pills
|
||||
> a {
|
||||
border-radius: 5px;
|
||||
}
|
||||
+ li {
|
||||
> a {
|
||||
margin-left: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
// Active state
|
||||
&.active > a,
|
||||
&.active > a:hover,
|
||||
&.active > a:focus {
|
||||
color: #fff;
|
||||
background-color: @component-active-bg;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Links rendered as pills
|
||||
.nav-pills > li > a {
|
||||
border-radius: 5px;
|
||||
}
|
||||
.nav-pills > li + li > a {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
// Active state
|
||||
.nav-pills > .active > a,
|
||||
.nav-pills > .active > a:hover,
|
||||
.nav-pills > .active > a:focus {
|
||||
color: #fff;
|
||||
background-color: @component-active-bg;
|
||||
}
|
||||
|
||||
// Stacked pills
|
||||
.nav-stacked > li {
|
||||
float: none;
|
||||
}
|
||||
.nav-stacked > li + li > a {
|
||||
margin-top: 2px;
|
||||
margin-left: 0; // no need for this gap between nav items
|
||||
.nav-stacked {
|
||||
> li {
|
||||
float: none;
|
||||
+ li {
|
||||
> a {
|
||||
margin-top: 2px;
|
||||
margin-left: 0; // no need for this gap between nav items
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Justified nav links
|
||||
@@ -108,49 +152,31 @@
|
||||
|
||||
.nav-justified {
|
||||
width: 100%;
|
||||
> li {
|
||||
float: none;
|
||||
display: table-cell;
|
||||
width: 1%;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
.nav-justified > li {
|
||||
float: none;
|
||||
display: table-cell;
|
||||
width: 1%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
// Move borders to anchors instead of bottom of list
|
||||
.nav-justified.nav-tabs {
|
||||
.nav-tabs-justified () {
|
||||
border-bottom: 0;
|
||||
> li > a {
|
||||
border-bottom: 1px solid #ddd;
|
||||
|
||||
// Override margin from .nav-tabs
|
||||
margin-right: 0;
|
||||
}
|
||||
> .active > a {
|
||||
border-bottom-color: @body-bg;
|
||||
}
|
||||
}
|
||||
// Override margin from .nav-tabs
|
||||
.nav-justified > li > a {
|
||||
margin-right: 0;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Nav states and addons
|
||||
// --------------------------------------------------
|
||||
|
||||
// Disabled state
|
||||
// -------------------------
|
||||
|
||||
// Gray out text
|
||||
.nav > .disabled > a {
|
||||
color: @grayLight;
|
||||
}
|
||||
// Nuke hover effects
|
||||
.nav > .disabled > a:hover,
|
||||
.nav > .disabled > a:focus {
|
||||
color: @grayLight;
|
||||
text-decoration: none;
|
||||
background-color: transparent;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
// Nav headers (for dropdowns and lists)
|
||||
// -------------------------
|
||||
|
||||
@@ -164,15 +190,6 @@
|
||||
text-shadow: 0 1px 0 rgba(255,255,255,.5);
|
||||
text-transform: uppercase;
|
||||
}
|
||||
// Space them out when they follow another list item (link)
|
||||
.nav li + .nav-header {
|
||||
margin-top: 9px;
|
||||
}
|
||||
|
||||
// Dividers (basically an hr) within the dropdown
|
||||
.nav .divider {
|
||||
.nav-divider();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
+43
-32
@@ -8,36 +8,47 @@
|
||||
list-style: none;
|
||||
text-align: center;
|
||||
.clearfix();
|
||||
li {
|
||||
display: inline;
|
||||
> a,
|
||||
> span {
|
||||
display: inline-block;
|
||||
padding: 5px 14px;
|
||||
background-color: @pagination-bg;
|
||||
border: 1px solid @pagination-border;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
> a:hover,
|
||||
> a:focus {
|
||||
text-decoration: none;
|
||||
background-color: @pagination-active-bg;
|
||||
}
|
||||
}
|
||||
|
||||
.next {
|
||||
> a,
|
||||
> span {
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
|
||||
.previous {
|
||||
> a,
|
||||
> span {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
|
||||
.disabled {
|
||||
> a,
|
||||
> a:hover,
|
||||
> a:focus,
|
||||
> span {
|
||||
color: @grayLight;
|
||||
background-color: @pagination-bg;
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
.pager li {
|
||||
display: inline;
|
||||
}
|
||||
.pager li > a,
|
||||
.pager li > span {
|
||||
display: inline-block;
|
||||
padding: 5px 14px;
|
||||
background-color: @pagination-bg;
|
||||
border: 1px solid @pagination-border;
|
||||
border-radius: 15px;
|
||||
}
|
||||
.pager li > a:hover,
|
||||
.pager li > a:focus {
|
||||
text-decoration: none;
|
||||
background-color: @pagination-active-bg;
|
||||
}
|
||||
.pager .next > a,
|
||||
.pager .next > span {
|
||||
float: right;
|
||||
}
|
||||
.pager .previous > a,
|
||||
.pager .previous > span {
|
||||
float: left;
|
||||
}
|
||||
.pager .disabled > a,
|
||||
.pager .disabled > a:hover,
|
||||
.pager .disabled > a:focus,
|
||||
.pager .disabled > span {
|
||||
color: @grayLight;
|
||||
background-color: #fff;
|
||||
cursor: default;
|
||||
}
|
||||
@@ -6,8 +6,6 @@
|
||||
table {
|
||||
max-width: 100%;
|
||||
background-color: @table-bg;
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
}
|
||||
th {
|
||||
text-align: left;
|
||||
|
||||
Reference in New Issue
Block a user