Skip to content

Commit

Permalink
Merge pull request #7 from kaogeek/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@junsudas
junsudas authored Jul 29, 2022
2 parents 635ac31 + 6c8fcb8 commit ce5182a
Show file tree
Hide file tree
Showing 18 changed files with 649 additions and 756 deletions.
138 changes: 81 additions & 57 deletions app/assets/stylesheets/_consul_settings.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,44 @@ $global-width: rem-calc(1200) !default;

$header-styles: (
small: (
"h1": ("font-size": 34),
"h2": ("font-size": 24),
"h3": ("font-size": 20),
"h4": ("font-size": 18),
"h5": ("font-size": 16),
"h6": ("font-size": 14),
"h1": (
"font-size": 34,
),
"h2": (
"font-size": 24,
),
"h3": (
"font-size": 20,
),
"h4": (
"font-size": 18,
),
"h5": (
"font-size": 16,
),
"h6": (
"font-size": 14,
),
),
medium: (
"h1": ("font-size": 44),
"h2": ("font-size": 34),
"h3": ("font-size": 24),
"h4": ("font-size": 19),
"h5": ("font-size": 16),
"h6": ("font-size": 13),
"h1": (
"font-size": 44,
),
"h2": (
"font-size": 34,
),
"h3": (
"font-size": 24,
),
"h4": (
"font-size": 19,
),
"h5": (
"font-size": 16,
),
"h6": (
"font-size": 13,
),
),
) !default;

Expand All @@ -57,69 +81,69 @@ $full-width-margin: unquote("#{$global-width / 2} - 50vw") !default;
// Scale up to offset Pracharath's font size.
// Its base font size is smaller than Source Sans Pro
// used by CONSUL.
$base-font-size: rem-calc(18) !default;
$base-line: rem-calc(26) !default;
$line-height: rem-calc(24) !default;
$tiny-font-size: rem-calc(12) !default;
$base-font-size: rem-calc(18) !default;
$base-line: rem-calc(26) !default;
$line-height: rem-calc(24) !default;
$tiny-font-size: rem-calc(12) !default;

$font-family-serif: Georgia, "Times New Roman", Times, serif !default;

$brand: #e67e44 !default;
$brand-secondary: darken($brand, 10%) !default;
$dark: $brand-secondary !default;
$brand: #e67e44 !default;
$brand-secondary: darken($brand, 10%) !default;
$dark: $brand-secondary !default;

$text: $black !default;
$text-medium: #515151 !default;
$text-light: #bfbfbf !default;
$text: $black !default;
$text-medium: #515151 !default;
$text-light: #bfbfbf !default;

$border: #dee0e3 !default;
$border: #dee0e3 !default;

$link: $brand !default;
$link-hover: darken($link, 20%) !default;
$link: $brand !default;
$link-hover: darken($link, 20%) !default;

$debates: $brand !default;
$debates: $brand !default;

$like: #7bd2a8 !default;
$unlike: #ef8585 !default;
$like: #7bd2a8 !default;
$unlike: #ef8585 !default;

$delete: #f04124 !default;
$check: #46db91 !default;
$delete: #f04124 !default;
$check: #46db91 !default;

$proposals: #ffa42d !default;
$proposals-dark: #794500 !default;
$proposals: #ffa42d !default;
$proposals-dark: #794500 !default;

$budget: #7e328a !default;
$budget-hover: #7571bf !default;
$budget: #7e328a !default;
$budget-hover: #7571bf !default;

$highlight: #e7f2fc !default;
$highlight-soft: #f3f8fd !default;
$light: #f5f7fa !default;
$featured: #ffdc5c !default;
$highlight: #e7f2fc !default;
$highlight-soft: #f3f8fd !default;
$light: #f5f7fa !default;
$featured: #ffdc5c !default;

$footer-border: #bfc1c3 !default;
$footer-border: #bfc1c3 !default;

$success-bg: #dff0d8 !default;
$success-border: #d6e9c6 !default;
$color-success: #3c763d !default;
$success-bg: #dff0d8 !default;
$success-border: #d6e9c6 !default;
$color-success: #3c763d !default;

$info-bg: #d9edf7 !default;
$info-border: #bce8f1 !default;
$color-info: #31708f !default;
$info-bg: #d9edf7 !default;
$info-border: #bce8f1 !default;
$color-info: #31708f !default;

$warning-bg: #fcf8e3 !default;
$warning-border: #faebcc !default;
$color-warning: #8a6d3b !default;
$warning-bg: #fcf8e3 !default;
$warning-border: #faebcc !default;
$color-warning: #8a6d3b !default;

$alert-bg: #f2dede !default;
$alert-border: #ebccd1 !default;
$color-alert: #a94442 !default;
$alert-bg: #f2dede !default;
$alert-border: #ebccd1 !default;
$color-alert: #a94442 !default;

$pdf-primary: #0300ff !default;
$pdf-secondary: #ff9e00 !default;
$pdf-primary: #0300ff !default;
$pdf-secondary: #ff9e00 !default;

$outline-focus: 3px solid #ffbf47 !default;
$outline-focus: 3px solid #ffbf47 !default;

$input-height: $line-height * 2 !default;
$input-height: $line-height * 2 !default;

$font-icon-margin: rem-calc(4) !default;
$icon-width: $line-height * 2 !default;
Expand All @@ -145,7 +169,7 @@ $sdg-colors: (
14: #0a97d9,
15: #56c02b,
16: #00689d,
17: #19486a
17: #19486a,
) !default;

// 3. Foundation overrides depending on CONSUL variables
Expand All @@ -154,7 +178,7 @@ $sdg-colors: (
$tab-background-active: $white !default;

$tab-item-font-size: $base-font-size !default;
$tab-item-padding: $line-height / 2 0 !default;
$tab-item-padding: $line-height / 2 0 !default;
$tab-content-border: $border !default;

$closebutton-color: $text !default;
Expand Down
10 changes: 6 additions & 4 deletions app/assets/stylesheets/_settings.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,12 @@ $button-padding: 0.85em 1em !default;
$button-margin: 0 0 $global-margin 0 !default;
$button-fill: solid !default;
$button-background: $primary-color !default;
$button-background-hover: scale-color(
$button-background,
$lightness: -15%
) !default;
// Override button button background hover for MFP-NEXT.
// $button-background-hover: scale-color(
// $button-background,
// $lightness: -15%
// ) !default;
$button-background-hover: #f57832 !default;
$button-color: $white !default;
$button-color-alt: $black !default;
// Override button border radius for MFP-NEXT.
Expand Down
53 changes: 53 additions & 0 deletions app/assets/stylesheets/custom/custom_debates.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,47 @@
}

.debates-list {
.advanced-search-form {
.date-filters {
width: 100%;
display: flex;
align-items: flex-end;
flex-direction: column;

@include breakpoint(medium) {
flex-direction: row;
}

.filter {
width: 100%;

@include breakpoint(medium) {
width: 33.33%;
}
}

.custom-date-filters {
width: 100%;
display: flex;
flex-direction: column;

@include breakpoint(medium) {
flex-direction: row;
width: 66.66%;
align-items: flex-end;
}

.filter {
width: 100%;

@include breakpoint(medium) {
width: 50%;
}
}
}
}
}

.debate {
.panel {
.row {
Expand Down Expand Up @@ -58,3 +99,15 @@
}
}
}

.trending-tag {
.tag-cloud {
a {
width: 100%;
text-align: center;
border-radius: 22px;
padding: 12px;
border: $input-border;
}
}
}
Loading

0 comments on commit ce5182a

Please sign in to comment.