forked from os2loop/os2loop
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged in feature/BKL-39-CreateQuestion (pull request #19)
Feature/BKL-39 CreateQuestion
- Loading branch information
Showing
41 changed files
with
322 additions
and
210 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/badge/badge.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ustom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/button-group/button-group.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
@import "../../colors-signifly.scss"; | ||
@import "../../signifly-variables/colors.scss"; | ||
|
||
.btn-group { | ||
> .btn { | ||
|
2 changes: 1 addition & 1 deletion
2
web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/button/button.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...ofiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/dropdown/dropdown.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...om/os2loop/themes/os2loop_theme/assets/bootstrap-custom/form-check/form-check-custom.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ustom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/form-control/form-control.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/navbar/nav.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
@import "../../colors-signifly.scss"; | ||
@import "../../signifly-variables/colors.scss"; | ||
|
||
.nav-item { | ||
padding: 0; | ||
|
4 changes: 2 additions & 2 deletions
4
web/profiles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/navbar/navbar.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 9 additions & 1 deletion
10
...es/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/pagination/pagination.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...es/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/typography/typography.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...iles/custom/os2loop/themes/os2loop_theme/assets/bootstrap-custom/variables/variables.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
web/profiles/custom/os2loop/themes/os2loop_theme/assets/color-templates/default.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 0 additions & 122 deletions
122
web/profiles/custom/os2loop/themes/os2loop_theme/assets/custom/comment-form.scss
This file was deleted.
Oops, something went wrong.
16 changes: 0 additions & 16 deletions
16
web/profiles/custom/os2loop/themes/os2loop_theme/assets/custom/custom-index.scss
This file was deleted.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
web/profiles/custom/os2loop/themes/os2loop_theme/assets/custom/filter-types.scss
This file was deleted.
Oops, something went wrong.
25 changes: 25 additions & 0 deletions
25
web/profiles/custom/os2loop/themes/os2loop_theme/assets/signifly-custom/custom-index.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
// helpers | ||
@import "helpers/mixins.scss"; | ||
|
||
// layout | ||
@import "layout/block.scss"; | ||
@import "layout/title.scss"; | ||
@import "layout/user.scss"; | ||
@import "layout/container-fluid-addition.scss"; // TODO: move this to bootstrap | ||
|
||
// elements | ||
@import "elements/icons.scss"; | ||
@import "elements/anonymous-author-fieldset.scss"; | ||
@import "elements/autocomplete-deluxe.scss"; | ||
@import "elements/btn-file-attachment.scss"; | ||
|
||
// forms | ||
@import "forms/comment-form.scss"; | ||
@import "forms/user-form.scss"; | ||
@import "forms/node-os2loop-question-form.scss"; | ||
|
||
// search | ||
@import "search/filter-types.scss"; | ||
@import "search/search-input.scss"; | ||
@import "search/search-result-wrapper.scss"; | ||
@import "search/search-result-item.scss"; |
70 changes: 70 additions & 0 deletions
70
...2loop/themes/os2loop_theme/assets/signifly-custom/elements/anonymous-author-fieldset.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
// TODO: this should probably not be be using id's | ||
@mixin anonymous-author-fieldset($wrapper-id) { | ||
$base-id: str-slice($wrapper-id, 1, -10); | ||
|
||
fieldset##{$wrapper-id} { | ||
div##{$base-id} { | ||
@extend .d-inline-flex; | ||
|
||
> div { | ||
@extend .mb-0; | ||
|
||
// _should_ correspond to value 1 (Ja) | ||
&:first-child { | ||
@extend .order-2; | ||
|
||
label { | ||
border-radius: 0 $border-radius $border-radius 0; | ||
border-left: none; | ||
} | ||
} | ||
|
||
// _should_ correspond to value 0 (Ja) | ||
&:last-child { | ||
@extend .order-1; | ||
|
||
label { | ||
border-radius: $border-radius 0 0 $border-radius; | ||
} | ||
} | ||
|
||
input { | ||
// hide the radio buttons | ||
position: absolute !important; | ||
height: 1px; | ||
width: 1px; | ||
border: 0; | ||
overflow: hidden; | ||
|
||
// handle switching between the radio buttons | ||
&:checked { | ||
+ label { | ||
background-color: $loop-green; | ||
color: $loop-white; | ||
} | ||
} | ||
} | ||
|
||
label { | ||
// styled to match .btn (-ish) | ||
background-color: $loop-white; | ||
border: 1px solid $gray-400; | ||
transition: $btn-transition; | ||
|
||
min-width: 50px; | ||
padding: $btn-padding-y $btn-padding-x; | ||
text-align: center; | ||
|
||
font-size: $font-size-sm; | ||
line-height: 1; | ||
|
||
&:hover { | ||
cursor: pointer; | ||
// TODO: add this to variables | ||
background-color: #eff5f4; | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} |
File renamed without changes.
Oops, something went wrong.