Merge pull request #32 from softon/master

Added missing loading.gif and corrected css errors in custom.css
pull/42/head
Aigars Silkalns 2016-02-26 16:53:13 +02:00
commit b94d466519
2 changed files with 10 additions and 15 deletions

View File

@ -256,17 +256,14 @@ body.nav-md .container.body .right_col {
}
/** ------------------------------------------ **/
blue,
.blue {
color: #3498DB;
}
purple,
.purple {
color: #9B59B6;
}
green,
.green {
color: #1ABB9C;
}
@ -275,12 +272,10 @@ green,
color: #9CC2CB;
}
red,
.red {
color: #E74C3C;
}
dark,
.dark {
color: #34495E;
}
@ -2275,7 +2270,7 @@ a.star {
width: 33px;
}
.list-btn-mail > cn {
.list-btn-mail > .cn {
background: none repeat scroll 0 0 #39B3D7;
border-radius: 12px;
color: #FFFFFF;
@ -3214,14 +3209,14 @@ select.parsley-error {
.daterangepicker_end_input {
float: left;
padding-left: 11px
padding-left: 11px;
}
.daterangepicker th.month {
width: auto;
}
//----
.daterangepicker .daterangepicker_start_input label,
.daterangepicker .daterangepicker_end_input label {
color: #333;
@ -3298,7 +3293,7 @@ select.parsley-error {
border: none;
}
//----
.daterangepicker.single .ranges,
.daterangepicker.single .calendar {
float: none;
@ -3355,7 +3350,7 @@ textarea:focus {
filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid: DXImageTransform.Microsoft.gradient(enabled false);
filter: progid: DXImageTransform.Microsoft.gradient(enabled=false);
border: 1px solid #cccccc;
border-bottom-color: #b3b3b3;
-webkit-border-radius: 4px;
@ -4110,7 +4105,7 @@ html > body > .ui-pnotify {
/* ********* profile/social **************************** */
.social-sidebar,
social-body {
.social-body {
float: right;
}
@ -5303,7 +5298,7 @@ ul.project_files li a i {
right: 0;
bottom: 0;
left: 0;
background: #fff url("../img/loading.gif") no-repeat center center;
background: #fff url("../images/loading.gif") no-repeat center center;
opacity: .75;
filter: alpha(opacity=75);
z-index: 20140628;
@ -5847,7 +5842,7 @@ form:after {
border: 1px solid #A878AF;
outline: none;
}
}
#username { background-position: 10px 10px !important }
#password { background-position: 10px -53px !important }
.login_content form div a {
@ -5880,7 +5875,7 @@ form:after {
border-top: 1px solid #CFD5D9;
padding: 15px 0;
}
login_content form input[type="submit"],#content form .submit{float: left; margin-left: 38px;}
.login_content form input[type="submit"],#content form .submit{float: left; margin-left: 38px;}
.button a {
background: url(http://cssdeck.com/uploads/media/items/8/8bcLQqF.png) 0 -112px no-repeat;
color: #7E7E7E;
@ -5989,7 +5984,7 @@ header{width:100%;}
display: inline-block;
width: 20px;
height: 20px;
background-image: url("../../assets/img/icons.png");
background-image: url("../images/icons.png");
vertical-align: middle;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB