Skip to content

Commit

Permalink
fix icons.less
Browse files Browse the repository at this point in the history
  • Loading branch information
@olton
olton committed Mar 16, 2013
1 parent 3fcce55 commit a31c348
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 8 deletions.
4 changes: 2 additions & 2 deletions less/icons.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ a {
font-size: 4/3em;
}

button, .button, .page-control > ul > li {
a, button, .button, .page-control > ul > li {
[class^="icon-"],
[class*=" icon-"] {
vertical-align: -10%;
Expand Down Expand Up @@ -130,7 +130,7 @@ ol.icons {
}
}

button, .button, .page-control > ul > li {
a, button, .button, .page-control > ul > li {
[class^="icon-"],
[class*=" icon-"] {
margin-right: 5px;
Expand Down
5 changes: 3 additions & 2 deletions less/pagecontrol.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
z-index: 5;
width: 100%;
background-color: rgba(217, 217, 217, 0.16);
height: 30px;
height: 31px;

li:first-child {
margin-left: 20px;
Expand All @@ -28,6 +28,7 @@
float: left;
display: block;
text-align: center;
height: 100%;

img {
float: left;
Expand Down Expand Up @@ -70,7 +71,7 @@
}

.frames {
margin-top: 28px;
margin-top: 30px;
width: 100%;
min-height: 50px;
border: 1px #ccc solid;
Expand Down
15 changes: 13 additions & 2 deletions public/css/modern.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1305,27 +1305,33 @@ License: CC BY-SA 3.0 -- http://creativecommons.org/licenses/by-sa/3.0/
vertical-align: -10%;
font-size: 1.3333333333333333em;
}
.metrouicss a [class^="icon-"],
.metrouicss button [class^="icon-"],
.metrouicss .button [class^="icon-"],
.metrouicss .page-control > ul > li [class^="icon-"],
.metrouicss a [class*=" icon-"],
.metrouicss button [class*=" icon-"],
.metrouicss .button [class*=" icon-"],
.metrouicss .page-control > ul > li [class*=" icon-"] {
vertical-align: -10%;
font-size: 1.2em;
display: inline-block;
}
.metrouicss a [class^="icon-"].icon-large,
.metrouicss button [class^="icon-"].icon-large,
.metrouicss .button [class^="icon-"].icon-large,
.metrouicss .page-control > ul > li [class^="icon-"].icon-large,
.metrouicss a [class*=" icon-"].icon-large,
.metrouicss button [class*=" icon-"].icon-large,
.metrouicss .button [class*=" icon-"].icon-large,
.metrouicss .page-control > ul > li [class*=" icon-"].icon-large {
line-height: .9em;
}
.metrouicss a.big [class^="icon-"],
.metrouicss button.big [class^="icon-"],
.metrouicss .button.big [class^="icon-"],
.metrouicss .page-control > ul > li.big [class^="icon-"],
.metrouicss a.big [class*=" icon-"],
.metrouicss button.big [class*=" icon-"],
.metrouicss .button.big [class*=" icon-"],
.metrouicss .page-control > ul > li.big [class*=" icon-"] {
Expand Down Expand Up @@ -1377,17 +1383,21 @@ License: CC BY-SA 3.0 -- http://creativecommons.org/licenses/by-sa/3.0/
.metrouicss .icon-4x.icon-border {
border-width: 4px;
}
.metrouicss a [class^="icon-"],
.metrouicss button [class^="icon-"],
.metrouicss .button [class^="icon-"],
.metrouicss .page-control > ul > li [class^="icon-"],
.metrouicss a [class*=" icon-"],
.metrouicss button [class*=" icon-"],
.metrouicss .button [class*=" icon-"],
.metrouicss .page-control > ul > li [class*=" icon-"] {
margin-right: 5px;
}
.metrouicss a [class^="icon-"].right,
.metrouicss button [class^="icon-"].right,
.metrouicss .button [class^="icon-"].right,
.metrouicss .page-control > ul > li [class^="icon-"].right,
.metrouicss a [class*=" icon-"].right,
.metrouicss button [class*=" icon-"].right,
.metrouicss .button [class*=" icon-"].right,
.metrouicss .page-control > ul > li [class*=" icon-"].right {
Expand Down Expand Up @@ -6467,7 +6477,7 @@ License: CC BY-SA 3.0 -- http://creativecommons.org/licenses/by-sa/3.0/
z-index: 5;
width: 100%;
background-color: rgba(217, 217, 217, 0.16);
height: 30px;
height: 31px;
}
.metrouicss .page-control > ul:before,
.metrouicss .page-control > ul:after {
Expand All @@ -6484,6 +6494,7 @@ License: CC BY-SA 3.0 -- http://creativecommons.org/licenses/by-sa/3.0/
float: left;
display: block;
text-align: center;
height: 100%;
}
.metrouicss .page-control > ul li img {
float: left;
Expand Down Expand Up @@ -6522,7 +6533,7 @@ License: CC BY-SA 3.0 -- http://creativecommons.org/licenses/by-sa/3.0/
margin-left: 10px;
}
.metrouicss .page-control .frames {
margin-top: 28px;
margin-top: 30px;
width: 100%;
min-height: 50px;
border: 1px #ccc solid;
Expand Down
4 changes: 2 additions & 2 deletions public/pagecontrol.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<div class="menu-pull-bar"></div>

<ul>
<li class="active"><a href="#page1">Page 1</a></li>
<li class="active"><a href="#page1"><i class="icon-equalizer"></i>Page 1</a></li>
<li><a href="#page2">Page 2</a></li>
<li><a href="#page3">Page 3</a></li>
<li><a href="#page4">Page 4</a></li>
<li class="place-right"><a href="#page4"><i class="icon-cog nrm"></i></a></li>
</ul>

<div class="frames">
Expand Down

0 comments on commit a31c348

Please sign in to comment.