Skip to content

Commit

Permalink
fix icons.less for input for ie
Browse files Browse the repository at this point in the history
  • Loading branch information
olton committed Mar 17, 2013
1 parent 2cd5623 commit 9880903
Show file tree
Hide file tree
Showing 6 changed files with 209 additions and 328 deletions.
235 changes: 90 additions & 145 deletions css/modern.css

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions less/calendar.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
width: 100%;
border-collapse: collapse;
margin: 0;
tr {
height: 1px;
}
}


tr:empty {
display: none;
}
Expand All @@ -22,6 +26,19 @@

td {
cursor: pointer;
position: relative;
height: 100%;

span {
font-size: 8px !important;
line-height: 10px;
position: absolute;
top: 0;
right: 0;
padding: 1px 3px;
.bg-color-red;
.fg-color-white;
}
}

.out {
Expand Down
54 changes: 19 additions & 35 deletions less/forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@
input[type=number]:not(:focus),
input[type=time]:not(:focus),
input[type=url]:not(:focus) {
& ~ [class^="btn-clear"], & ~ [class*="btn-reveal"], & ~ .helper {
& ~ [class^="btn-"], & ~ .helper {
display: none;
}
}
Expand All @@ -345,7 +345,7 @@
input[type=number]:focus,
input[type=time]:focus,
input[type=url]:focus {
& ~ [class^="btn-clear"], & ~ [class*="btn-reveal"], & ~ .helper {
& ~ [class^="btn-"], & ~ .helper {
display: block;
}
}
Expand All @@ -358,11 +358,16 @@
input[type=number]:not(:focus),
input[type=time]:not(:focus),
input[type=url]:not(:focus) {
& ~ [class^="btn-clear"]:active, & ~ [class*="btn-reveal"]:active, & ~ .helper:active {
& ~ [class^="btn-"]:active, & ~ .helper:active {
display: block;
}
}
}
input[type=text] {
& ~ .btn-search, & ~ .btn-date, {
display: block !important;
}
}
}

.input-control {
Expand All @@ -372,10 +377,8 @@

&.text, &.password {
.helper,
.btn-search,
.btn-date,
.btn-clear,
.btn-reveal {
[class^="btn-"] {
font-family: "iconFont" !important;
background: #fff;// @textbox_pass_inactive_icon 50% no-repeat;
top: 2px;
width: 26px !important;
Expand All @@ -392,9 +395,12 @@

&:before {
//content: "";
font-size: 12pt;
font-size: 10pt !important;
position: absolute;
#font > .normal;
color: #000 !important;
font-family: "iconFont" !important;
left: 6px;
top: 4px;
}


Expand Down Expand Up @@ -423,37 +429,15 @@
}
&.text {
.helper, .btn-clear {

&:before {
font-family: iconFont;
font-size: 12px;
content: "\e089";
left: 7px;
top: 3px;
}

}
}
&.text {
.btn-search {
&:before {
font-family: iconFont;
font-size: 12px;
content: "\e041";
left: 7px;
top: 3px;
}

.btn-search:before {
content: "\e041";
}
.btn-date {
&:before {
font-family: iconFont;
font-size: 12px;
content: "\e020";
left: 7px;
top: 3px;
}

.btn-date:before {
content: "\e020";
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion public/calendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@

<script>
$(function(){
$("#cal2").calendarSetEvent({date: '1972-12-22', text: 'Вах, вах,...'});
$("#cal2").calendarSetEvent({date: '1972-12-22', text: 'Event number one'});
$("#cal2").calendarSetEvent({date: '1972-12-22', text: 'Event number two'});
//alert($("#cal2").calendarGetEvents('1972-12-22'));
})
</script>
Expand Down
Loading

0 comments on commit 9880903

Please sign in to comment.