Skip to content

Commit

Permalink
assets/*: update rating colours add to variable, change btns in comme…
Browse files Browse the repository at this point in the history
…nts to be consistent, increace alert lightening to work wi new colours fixes #38
  • Loading branch information
philli-m committed Oct 12, 2023
1 parent 166480d commit e9c3683
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 11 deletions.
4 changes: 2 additions & 2 deletions adhocracy-plus/assets/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ $brand-secondary: #000000 !default;
$brand-tertiary: $brand-primary !default;

/* Don't use variables but hex-values here as they should not be overwritten on organisation pages */
$brand-success: #2fae7a !default;
$brand-success: #23865e !default;
$brand-info: $brand-primary !default; // $brand-primary from platform.scss
$brand-warning: #ffc107 !default;
$brand-danger: $brand-primary !default;
$brand-danger: #9b1d20 !default;

$primary: $brand-primary !default;
$secondary: $brand-secondary !default;
Expand Down
16 changes: 16 additions & 0 deletions adhocracy-plus/assets/scss/components/_a4-comments.scss
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,34 @@

.a4-comments__action-bar__btn {
margin-left: 0.2 * $spacer !important;
text-decoration: underline;

@extend .btn--small;

&:first-child {
margin-left: 0 !important;
}

&:hover {
text-decoration: none;
}
}

.a4-comments__border--highlighted {
border-left: 2px solid $brand-primary;
}

.btn.btn--none.a4-comments__read-btn {
text-decoration: underline;
margin-bottom: 0.5 * $spacer;

&:hover,
&:active {
text-decoration: none;
background-color: inherit;
}
}

.a4-comments__text,
.a4-comments__author {
margin: 1.2 * $spacer 0 1.2 * $spacer 0;
Expand Down
4 changes: 2 additions & 2 deletions adhocracy-plus/assets/scss/components/_alerts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ $messages-margin-bottom: 25px;
}

.alert--success {
background-color: lighten($brand-success, 45);
background-color: lighten($brand-success, 55);
color: $text-color;
}

.alert--error,
.alert--danger {
background-color: lighten($brand-danger, 44);
background-color: lighten($brand-danger, 55);
color: $text-color;
}

Expand Down
6 changes: 0 additions & 6 deletions adhocracy-plus/assets/scss/components/_header_upper.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@
font-weight: bold;
}

// so it doesn't look misallighned when menu open
.header-upper__mobile-toggle.show {
z-index: 1001;
background: transparent;
}

.header-upper__mobile-toggle:after {
z-index: 5;
font-family: "Font Awesome 5 Free", sans-serif;
Expand Down
2 changes: 1 addition & 1 deletion adhocracy-plus/assets/scss/components/_rating.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
}

.rating-up {
@include rating-button($brand-primary);
@include rating-button($brand-success);
}

.rating-down {
Expand Down

0 comments on commit e9c3683

Please sign in to comment.