Skip to content

Commit

Permalink
fix(css): minor fixes
Browse files Browse the repository at this point in the history
dropped line-height-computed
line-height-base is now line-height
boosted 3.2.1fixes
  • Loading branch information
ygatesoupe committed Dec 28, 2015
1 parent 2bad243 commit 8bacc50
Show file tree
Hide file tree
Showing 6 changed files with 260 additions and 264 deletions.
20 changes: 10 additions & 10 deletions scss/_o-checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
position: absolute;
left: -9999px;
}

/* on prépare le label */
.o-checkbox[type="checkbox"]:not(:checked) + label,
.o-checkbox[type="checkbox"]:checked + label{
Expand All @@ -18,15 +18,15 @@
display: inline-block;
font-style: normal;
font-weight: normal;
line-height: $line-height-computed;
line-height: $line-height;
border: 1px dotted transparent;
}

/* Align checkbox on the right*/
.o-checkbox-right.o-checkbox[type="checkbox"]:not(:checked) + label,
.o-checkbox-right.o-checkbox[type="checkbox"]:checked + label{
padding-left: 0;
padding-right: ($input-height-base * 0.75); /* fait un peu d'espace pour notre case à venir */
padding-right: ($input-height-base * 0.75); /* fait un peu d'espace pour notre case à venir */
}

/* Aspect des checkboxes */
Expand All @@ -35,8 +35,8 @@
.o-checkbox[type="checkbox"]:checked + label:before{
content: "";
position: absolute;
left:0;
width: ($input-height-base/2);
left:0;
width: ($input-height-base/2);
height: ($input-height-base/2); /* dim. de la case */
border: 2px solid $gray-light;
background-color: #fff;
Expand All @@ -49,18 +49,18 @@
right: 0;
}


/* Aspect général de la coche */
.o-checkbox[type="checkbox"]:not(:checked) + label:after,
.o-checkbox[type="checkbox"]:checked + label:after{
font-family: 'icon-orange' !important;
content: '\ea2b';
position: absolute;
top: 0;
top: 0;
left: 0;
font-size: $font-size-base;
color: $brand-orange-white;
width: ($input-height-base/2);
width: ($input-height-base/2);
height: ($input-height-base/2); /* dim. de la case */
text-align: center;
/*transition: all .2s; /* on prévoit une animation */
Expand Down Expand Up @@ -92,7 +92,7 @@

/* aspect désactivée */
.o-checkbox[type="checkbox"]:disabled:not(:checked) + label:before,
.o-checkbox[type="checkbox"]:disabled:checked + label:before{
.o-checkbox[type="checkbox"]:disabled:checked + label:before{
border-color: $gray-light-plus;
}
/* styles de la coche (si cochée/désactivée) */
Expand All @@ -105,7 +105,7 @@
.o-checkbox[type="checkbox"]:disabled + label{
color: $gray-light-plus;
}

/* aspect au focus de l'élément */
.o-checkbox[type="checkbox"]:checked:focus + label,
.o-checkbox[type="checkbox"]:not(:checked):focus + label{
Expand Down
4 changes: 2 additions & 2 deletions scss/_o-pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.o-pagination {
display: inline-block;
padding-left: 0;
margin: $line-height-computed 0;
margin: $line-height 0;
border-radius: $border-radius-base;

> li {
Expand All @@ -14,7 +14,7 @@
position: relative;
float: left; // Collapse white-space
padding: $padding-base-vertical $padding-base-horizontal;
line-height: $line-height-base;
line-height: $line-height;
text-decoration: none;
color: $pagination-color;
background-color: $pagination-bg;
Expand Down
2 changes: 1 addition & 1 deletion scss/_o-pointed_tab.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
font-family: $font-family-base;
font-size: $font-size-base;
font-weight: normal;
line-height: $line-height-base;
line-height: $line-height;
text-align: left;
background-color: $o-nav-tabs-bg;
color: $o-nav-tabs-color;
Expand Down
20 changes: 10 additions & 10 deletions scss/_o-radio.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
position: absolute;
left: -9999px;
}

/* on prépare le label */
.o-radio[type="radio"]:not(:checked) + label,
.o-radio[type="radio"]:checked + label{
Expand All @@ -18,15 +18,15 @@
display: inline-block;
font-style: normal;
font-weight: normal;
line-height: $line-height-computed;
line-height: $line-height;
border: 1px dotted transparent;
}

/* Align radio on the right*/
.o-radio-right.o-radio[type="radio"]:not(:checked) + label,
.o-radio-right.o-radio[type="radio"]:checked + label{
padding-left: 0;
padding-right: ($input-height-base * 0.75); /* fait un peu d'espace pour notre case à venir */
padding-right: ($input-height-base * 0.75); /* fait un peu d'espace pour notre case à venir */
}

/* Aspect des radioes */
Expand All @@ -35,8 +35,8 @@
.o-radio[type="radio"]:checked + label:before{
content: "";
position: absolute;
left:0;
width: ($input-height-base/2);
left:0;
width: ($input-height-base/2);
height: ($input-height-base/2); /* dim. de la case */
border: 3px solid $gray-light;
background-color: #fff;
Expand All @@ -50,17 +50,17 @@
right: 0;
}


/* Aspect général de la coche */
.o-radio[type="radio"]:not(:checked) + label:after,
.o-radio[type="radio"]:checked + label:after{
content: '';
position: absolute;
top: 0;
top: 0;
left: 0;
font-size: $font-size-base;
color: $brand-orange-white;
width: ($input-height-base/2);
width: ($input-height-base/2);
height: ($input-height-base/2); /* dim. de la case */
text-align: center;
/*transition: all .2s; /* on prévoit une animation */
Expand Down Expand Up @@ -91,7 +91,7 @@

/* aspect désactivée */
.o-radio[type="radio"]:disabled:not(:checked) + label:before,
.o-radio[type="radio"]:disabled:checked + label:before{
.o-radio[type="radio"]:disabled:checked + label:before{
border-color: $gray-light-plus;
}
/* styles de la coche (si cochée/désactivée) */
Expand All @@ -103,7 +103,7 @@
.o-radio[type="radio"]:disabled + label{
color: $gray-light-plus;
}

/* aspect au focus de l'élément */
.o-radio[type="radio"]:checked:focus + label,
.o-radio[type="radio"]:not(:checked):focus + label{
Expand Down
Loading

0 comments on commit 8bacc50

Please sign in to comment.