Skip to content

Commit

Permalink
all: fixes pagination issues, closes thomaspark#37
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomaspark
thomaspark committed Oct 24, 2012
1 parent 5ed00c9 commit 127e1f5
Show file tree
Hide file tree
Showing 21 changed files with 225 additions and 127 deletions.
32 changes: 19 additions & 13 deletions amelia/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5164,27 +5164,33 @@ div.subnav-fixed {
.pagination ul {
background-color: #3cb9c6;
background-image: none;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.pagination .disabled a,
.pagination .disabled a:hover {
color: rgba(255, 255, 255, 0.9);
}
.pagination li a:hover {
.pagination ul > li > a:hover {
background-color: rgba(255, 255, 255, 0.4);
color: #e8d069;
}
.pagination .active a,
.pagination .active a:hover {
background-color: rgba(255, 255, 255, 0.4);
color: rgba(255, 255, 255, 0.9);
}
.pagination ul,
.pagination li:first-child a,
.pagination li:last-child a {
.pagination ul > li:first-child > a,
.pagination ul > li:last-child > a {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.pagination ul > .disabled > a,
.pagination ul > .disabled > a:hover,
.pagination ul > .disabled > span,
.pagination ul > .disabled > span:hover {
color: rgba(255, 255, 255, 0.9);
}
.pagination ul > .active > a,
.pagination ul > .active > a:hover,
.pagination ul > .active > span,
.pagination ul > .active > span:hover {
background-color: rgba(255, 255, 255, 0.4);
color: rgba(255, 255, 255, 0.9);
}
.pager li > a {
background-color: #3CB9C6;
}
Expand Down
10 changes: 5 additions & 5 deletions amelia/bootstrap.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 17 additions & 11 deletions amelia/bootswatch.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,26 +323,32 @@ div.subnav {
ul {
background-color: @paginationBackground;
background-image: none;
.border-radius(0);
}

.disabled a, .disabled a:hover {
color: @textColor;
}

li a:hover {
ul > li > a:hover {
background-color: rgba(255, 255, 255, 0.4);
color: @linkColor;
}

.active a, .active a:hover {
background-color: rgba(255, 255, 255, 0.4);
ul > li:first-child > a,
ul > li:last-child > a {
.border-radius(0);
}

ul > .disabled > a,
ul > .disabled > a:hover,
ul > .disabled > span,
ul > .disabled > span:hover {
color: @textColor;
}

ul,
li:first-child a,
li:last-child a {
.border-radius(0);
ul > .active > a,
ul > .active > a:hover,
ul > .active > span,
ul > .active > span:hover {
background-color: rgba(255, 255, 255, 0.4);
color: @textColor;
}
}

Expand Down
18 changes: 12 additions & 6 deletions cyborg/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5164,18 +5164,24 @@ div.subnav .nav .open .dropdown-menu li > a:hover {
-moz-box-shadow: none;
box-shadow: none;
}
.pagination a {
.pagination ul > li > a,
.pagination ul > li > span {
border: 0;
font-size: 14px;
}
.pagination a:hover,
.pagination .active a {
.pagination ul > li > a:hover {
background-color: #33b5e5;
color: #ffffff;
}
.pagination .disabled span,
.pagination .disabled a,
.pagination .disabled a:hover {
.pagination ul > .active > a,
.pagination ul > .active > span {
background-color: #33b5e5;
color: #ffffff;
}
.pagination ul > .disabled > a,
.pagination ul > .disabled > a:hover,
.pagination ul > .disabled > span,
.pagination ul > .disabled > span:hover {
background-color: rgba(0, 0, 0, 0.2);
}
.pager a {
Expand Down
7 changes: 4 additions & 3 deletions cyborg/bootstrap.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 14 additions & 5 deletions cyborg/bootswatch.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,23 +342,32 @@ div.subnav {
}

.pagination {

ul {
.box-shadow(none);
}

a {
ul > li > a,
ul > li > span {
border: 0;
font-size: 14px;
}

a:hover, .active a {
ul > li > a:hover {
background-color: @blue;
color: @white;
}

.disabled span,
.disabled a,
.disabled a:hover {
ul > .active > a,
ul > .active > span {
background-color: @blue;
color: @white;
}

ul > .disabled > a,
ul > .disabled > a:hover,
ul > .disabled > span,
ul > .disabled > span:hover {
background-color: rgba(0, 0, 0, 0.2);
}
}
Expand Down
27 changes: 16 additions & 11 deletions readable/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5110,26 +5110,31 @@ div.subnav-fixed {
-moz-box-shadow: none;
box-shadow: none;
}
.pagination ul > li > a {
padding: 12px 14px 8px;
line-height: 1;
}
.pagination ul > li.active > a,
.pagination ul > li.active > a:hover {
color: #282828;
background-color: #F5F5F5;
}
.pagination ul > li > a,
.pagination ul > li.disabled > a,
.pagination ul > li.disabled > a:hover {
.pagination ul > li > span {
padding: 12px 14px 8px;
background-color: #ffffff;
line-height: 1;
}
.pagination ul > li:first-child > a,
.pagination ul > li:last-child > a {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.pagination ul > .active > a,
.pagination ul > .active > a:hover,
.pagination ul > .active > span,
.pagination ul > .active > span:hover {
color: #282828;
background-color: #F5F5F5;
}
.pagination ul > .disabled > a,
.pagination ul > .disabled > a:hover,
.pagination ul > .disabled > span,
.pagination ul > .disabled > span:hover {
background-color: #ffffff;
}
.pager a {
-webkit-border-radius: 0;
-moz-border-radius: 0;
Expand Down
6 changes: 3 additions & 3 deletions readable/bootstrap.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 15 additions & 11 deletions readable/bootswatch.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,28 +290,32 @@ div.subnav {
.box-shadow(none);
}

ul > li > a {
ul > li > a,
ul > li > span {
padding: 12px 14px 8px;
background-color: @white;
line-height: 1;
}

ul > li:first-child > a,
ul > li:last-child > a {
.border-radius(0);
}

ul > li.active > a,
ul > li.active > a:hover {
ul > .active > a,
ul > .active > a:hover,
ul > .active > span,
ul > .active > span:hover {
color: @textColor;
background-color: #F5F5F5;
}

ul > li > a,
ul > li.disabled > a,
ul > li.disabled > a:hover {
ul > .disabled > a,
ul > .disabled > a:hover,
ul > .disabled > span,
ul > .disabled > span:hover {
background-color: @white;
}

ul > li:first-child > a,
ul > li:last-child > a {
.border-radius(0);
}
}

.pager {
Expand Down
26 changes: 20 additions & 6 deletions simplex/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5102,33 +5102,47 @@ div.subnav .nav > li.active > a:hover {
color: #d9230f;
}
.breadcrumb {
background-color: #ffffff;
border: 0px solid transparent;
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);
border: 0px solid transparent;
}
.breadcrumb li {
padding-top: 5px;
padding-top: 2px;
text-shadow: none;
}
.breadcrumb .active {
color: #555555;
}
.breadcrumb a {
text-shadow: none;
}
.breadcrumb a:hover {
text-decoration: none;
}
.pagination li > a {
padding: 4px 14px 0;
.pagination ul > li > a,
.pagination ul > li > span {
padding: 2px 14px 0;
color: #555555;
}
.pagination li > a:hover {
.pagination ul > li > a:hover,
.pagination ul > li > span:hover {
background-color: #fbebe9;
color: #d9230f;
}
.pagination li.active > a {
.pagination ul > .active > a,
.pagination ul > .active > span {
background-color: #fbebe9;
color: #d9230f;
}
.pagination ul > .disabled > a,
.pagination ul > .disabled > a:hover,
.pagination ul > .disabled > span,
.pagination ul > .disabled > span:hover {
background-color: transparent;
color: #555555;
}
.btn {
padding-top: .6em;
font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
Expand Down
8 changes: 5 additions & 3 deletions simplex/bootstrap.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 127e1f5

Please sign in to comment.