ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 16:48:04 +02:00
Code Issues Releases Wiki Activity

merge header - form error

Browse Source
This commit is contained in:
diminator 2015-10-13 11:39:42 +02:00
parent 097e158e50
commit 24011b773b
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/components/header.js
View File

@ -73,7 +73,10 @@ let Header = React.createClass({
else{ else{
setTitle('ascribe'); setTitle('ascribe');
} }
if (whitelabel.subdomain !== 'www'){
if (whitelabel.subdomain &&
whitelabel.subdomain !== 'www'
&& whitelabel.logo){
return (<img className="img-brand" src={whitelabel.logo}/>); return (<img className="img-brand" src={whitelabel.logo}/>);
} }
return ( return (

16
sass/ascribe_custom_style.scss
View File

@ -5,6 +5,8 @@ $ascribe-light-blue: #D3DEE4;
$ascribe-white: #F8F8F8; $ascribe-white: #F8F8F8;
$ascribe-pink: #D10074; $ascribe-pink: #D10074;
$ascribe-blue-border: rgba(0, 60, 105, 0.1); $ascribe-blue-border: rgba(0, 60, 105, 0.1);
$ascribe-red-error: rgb(169, 68, 66);
$ascribe--fg-color: $ascribe-dark-blue; $ascribe--fg-color: $ascribe-dark-blue;
$ascribe--bg-color: $ascribe-dark-blue; $ascribe--bg-color: $ascribe-dark-blue;
@ -542,6 +544,18 @@ fieldset[disabled] .btn-secondary.active {
border-left-color: $ascribe--button-default-color !important; border-left-color: $ascribe--button-default-color !important;
background-color: rgba($ascribe--button-default-color, .05); background-color: rgba($ascribe--button-default-color, .05);
} }
.is-error {
> div {
> span {
color: rgba($ascribe-red-error, 1) !important;
}
}
&:hover {
border-left: 3px solid rgba(169, 68, 66, .5)!important;
}
}
.ascribe-property-wrapper:hover { .ascribe-property-wrapper:hover {
//border-left-color: rgba($ascribe--button-default-color, .5); //border-left-color: rgba($ascribe--button-default-color, .5);
border-left-color: rgba($ascribe-blue, .5); border-left-color: rgba($ascribe-blue, .5);
@ -568,7 +582,7 @@ fieldset[disabled] .btn-secondary.active {
} }
} }
> span:not(.glyphicon) { > span:not(.glyphicon) {
color: $ascribe-pink; color: $ascribe--button-default-color;
//font-weight: normal !important; //font-weight: normal !important;
} }

10
sass/ascribe_property.scss
View File

@ -1,3 +1,5 @@
$ascribe-red-error: rgb(169, 68, 66);
.ascribe-property-wrapper { .ascribe-property-wrapper {
background-color: white; background-color: white;
border-left: 3px solid rgba(0, 0, 0, 0); border-left: 3px solid rgba(0, 0, 0, 0);
@ -24,12 +26,12 @@
} }
.is-error { .is-error {
background-color: rgba(169, 68, 66, .05); background-color: rgba($ascribe-red-error, .03);
border-left: 3px solid rgba(169, 68, 66, 1); border-left: 3px solid rgba($ascribe-red-error, 1);
> div { > div {
> span { > span {
color: rgba(169, 68, 66, 1); color: rgba($ascribe-red-error, 1);
font-size: .9em; font-size: .9em;
margin-right: 1em; margin-right: 1em;
} }
@ -41,7 +43,7 @@
} }
&:hover { &:hover {
border-left: 3px solid rgba(169, 68, 66, 1); border-left: 3px solid rgba($ascribe-red-error, 1);
} }
} }