amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into task/3709/faq_tos_cms_template

Browse source
This commit is contained in:
PCoder 2017-08-20 01:37:54 +05:30
commit bc43d9225a
3 changed files with 76 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

49
datacenterlight/static/datacenterlight/css/landing-page.css
View file

@ -1096,19 +1096,6 @@ tech-sub-sec h2 {
padding: 0; padding: 0;
} }
.has-error .checkbox,
.has-error .checkbox-inline,
.has-error .control-label,
.has-error .help-block,
.has-error .radio,
.has-error .radio-inline,
.has-error.checkbox label,
.has-error.checkbox-inline label,
.has-error.radio label,
.has-error.radio-inline label {
color: #eb4d5c;
}
.form-group { .form-group {
margin: 0; margin: 0;
border-bottom: 1px solid rgba(128, 128, 128, 0.3); border-bottom: 1px solid rgba(128, 128, 128, 0.3);
@ -1535,4 +1522,40 @@ a#forgotpassword {
.w380 { .w380 {
max-width: 380px !important; max-width: 380px !important;
}
/* bootstrap danger color override from #a94442 */
.text-danger,
.has-error .help-block,
.has-error .control-label,
.has-error .radio,
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline,
.has-error.radio label,
.has-error.checkbox label,
.has-error.radio-inline label,
.has-error.checkbox-inline label,
.has-error .form-control,
.has-error .form-control-feedback,
.alert-danger,
.list-group-item-danger,
a.list-group-item-danger,
a.list-group-item-danger:hover,
a.list-group-item-danger:focus,
.panel-danger > .panel-heading {
color: #eb4d5c;
}
.has-error .input-group-addon {
color: #eb4d5c;
border-color: #eb4d5c;
}
a.list-group-item-danger.active,
a.list-group-item-danger.active:hover,
a.list-group-item-danger.active:focus {
background-color: #eb4d5c;
border-color: #eb4d5c;
}
.panel-danger > .panel-heading .badge {
background-color: #eb4d5c;
} }

38
hosting/static/hosting/css/landing-page.css
View file

@ -333,7 +333,7 @@ h6 {
} }
.auth-box .form .red { .auth-box .form .red {
color: #ea3a3a; color: #eb4d5c;
} }
.auth-box .form .btn { .auth-box .form .btn {
@ -747,3 +747,39 @@ a.unlink:hover {
.footer-light a:hover, .footer-light a:focus, .footer-light a:active { .footer-light a:hover, .footer-light a:focus, .footer-light a:active {
color: #ddd; color: #ddd;
} }
/* bootstrap danger color override from #a94442 */
.text-danger,
.has-error .help-block,
.has-error .control-label,
.has-error .radio,
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline,
.has-error.radio label,
.has-error.checkbox label,
.has-error.radio-inline label,
.has-error.checkbox-inline label,
.has-error .form-control,
.has-error .form-control-feedback,
.alert-danger,
.list-group-item-danger,
a.list-group-item-danger,
a.list-group-item-danger:hover,
a.list-group-item-danger:focus,
.panel-danger > .panel-heading {
color: #eb4d5c;
}
.has-error .input-group-addon {
color: #eb4d5c;
border-color: #eb4d5c;
}
a.list-group-item-danger.active,
a.list-group-item-danger.active:hover,
a.list-group-item-danger.active:focus {
background-color: #eb4d5c;
border-color: #eb4d5c;
}
.panel-danger > .panel-heading .badge {
background-color: #eb4d5c;
}

3
requirements.txt
View file

@ -86,3 +86,6 @@ git+https://github.com/ungleich/python-oca.git#egg=python-oca
djangorestframework djangorestframework
flake8==3.3.0 flake8==3.3.0
python-memcached==1.58 python-memcached==1.58
celery==4.0.2
redis==2.10.5
django-celery-results==1.0.1