TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working

Browse Source 
Remise en place du chartage CSS du composant datepicker et ajout de la
mixin gradient
This commit is contained in:
mespeche
2013-08-30 16:01:40 +02:00
parent 031ba3d19c
commit 64698b1d3d
2 changed files with 6 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
templates/admin/default/assets/css/admin.less
View File

@@ -158,41 +158,13 @@ hr {
}
.btn-primary, .btn-large {
<<<<<<< HEAD
#gradient > .vertical(rgb(243,153,34), rgb(227,83,11));
=======
background: #e9730f;
background-image: linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%);
background-image: -o-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%);
background-image: -moz-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%);
background-image: -webkit-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%);
background-image: -ms-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%);
background-image: -webkit-gradient(
linear,
left bottom,
left top,
color-stop(0, rgb(227,83,11)),
color-stop(1, rgb(243,153,34))
);
>>>>>>> 180302e7cce643db7cda695b5cfaec3586ebb72c
box-shadow: inset 0px 0px 2px rgba(250,250,250,0.5), 0px 1px 3px rgba(0,0,0,0.2);
color: white;
}
.btn-large:hover, .btn-primary:hover {
background: #e9730f;
background-image: linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%);
background-image: -o-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%);
background-image: -moz-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%);
background-image: -webkit-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%);
background-image: -ms-linear-gradient(bottom, rgb(227,83,11) 0%, rgb(243,153,34) 100%);
background-image: -webkit-gradient(
linear,
left bottom,
left top,
color-stop(0, rgb(227,83,11)),
color-stop(1, rgb(243,153,34))
);
#gradient > .vertical(rgb(243,153,34), rgb(227,83,11));
box-shadow: inset 0px 0px 2px rgba(250,250,250,0.8), 0px 1px 3px rgba(0,0,0,0.2);
color: white;
}
@@ -790,7 +762,7 @@ label {
// Center the alert box (20px bottom margin) in the table cell
padding: 20px 20px 0 20px;
}
<<<<<<< HEAD
}
// -- Editable tweaks ---------------------------------------------------------
@@ -855,7 +827,7 @@ label {
}
&.active,
&.active:hover {
#gradient > .vertical(rgb(243,153,34), rgb(227,83,11));
#gradient > .vertical(rgb(243,153,34),rgb(227,83,11));
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
}
@@ -872,7 +844,7 @@ label {
background: @grayLighter;
}
&.active {
#gradient > .vertical(rgb(243,153,34), rgb(227,83,11));
#gradient > .vertical(rgb(243,153,34),rgb(227,83,11));
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
}
@@ -915,9 +887,4 @@ label {
button.add-on{
height: auto;
}
}
=======
}
>>>>>>> 180302e7cce643db7cda695b5cfaec3586ebb72c
}