Skip to content

Commit

Permalink
Merged in feature/BKL-39-CreateQuestion (pull request #19)
Browse files Browse the repository at this point in the history
Feature/BKL-39 CreateQuestion
  • Loading branch information
AndreasEngelmark committed Feb 28, 2022
2 parents 6d724e0 + e740453 commit 8c1c784
Show file tree
Hide file tree
Showing 41 changed files with 322 additions and 210 deletions.
52 changes: 27 additions & 25 deletions web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,33 @@
@import "~bootstrap-icons/font/bootstrap-icons.css"; // Import bootstrap icons

// Colors
@import "colors";
@import "colors-signifly";
@import "colors.scss";
@import "signifly-variables/colors.scss";

// Variables
@import "signifly-variables/variables.scss";

// Components
@import "mixins";
@import "helper-classes";
@import "comment";
@import "teasers";
@import "documents";
@import "tabs";
@import "fields";
@import "icons";
@import "search";
@import "terms";
@import "navbar";
@import "toc";
@import "member-view";
@import "media-library";
@import "paragraphs/step-by-step";
@import "paragraphs/highlighted-content";
@import "paragraphs/text-and-image";
@import "paragraphs/info-block";
@import "taxonomy-colors";
@import "collapse";
@import "_user";
@import "mixins.scss";
@import "helper-classes.scss";
@import "comment.scss";
@import "teasers.scss";
@import "documents.scss";
@import "tabs.scss";
@import "fields.scss";
@import "icons.scss";
@import "search.scss";
@import "navbar.scss";
@import "toc.scss";
@import "member-view.scss";
@import "media-library.scss";
@import "paragraphs/step-by-step.scss";
@import "paragraphs/highlighted-content.scss";
@import "paragraphs/text-and-image.scss";
@import "paragraphs/info-block.scss";
@import "taxonomy-colors.scss";
@import "collapse.scss";
@import "_user.scss";

// Generel overrides
body {
Expand Down Expand Up @@ -65,6 +67,6 @@ img {
height: auto;
}

// Novataris components
// Novataris components from Signifly redesign
@import "bootstrap-custom/bootstrap-custom-index.scss";
@import "custom/custom-index.scss";
@import "signifly-custom/custom-index.scss";
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../colors-signifly.scss";
@import "../../signifly-variables/colors.scss";

$content-types-colors: (
"os2loop_documents_collection": $tag-blue,
Expand Down
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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../colors-signifly.scss";
@import "../../signifly-variables/colors.scss";

$input-btn-padding-x-lg: 30px;
$input-btn-padding-x-md: 20px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../colors-signifly.scss";
@import "../../variables-signifly.scss";
@import "../../signifly-variables/colors.scss";
@import "../../signifly-variables/variables.scss";

.navbar-nav .dropdown-menu {
margin-top: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../colors-signifly";
@import "../..//signifly-variables/colors.scss";

// extending custom checkbox containers
// source: https://www.w3schools.com/bootstrap4/bootstrap_forms_custom.asp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../colors-signifly.scss";
@import "../../signifly-variables/colors.scss";

// This "component" will contain all that has to do with inputfields, textareas and selectors.
// This is due to all these fields being a sub-components of the form-group.
Expand Down
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../colors-signifly";
@import "../../variables-signifly.scss";
@import "../..//signifly-variables/colors.scss";
@import "../../signifly-variables/variables.scss";

.navbar {
.brand-logo {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
@import "../../colors-signifly.scss";
@import "../../signifly-variables/colors.scss";

ul.pagination {
@extend .m-0, .p-0;

li {
@extend .m-0, .p-0;
}
}

.page-link {
&:focus,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../colors-signifly.scss";
@import "../../signifly-variables/colors.scss";

.text-sm {
color: $gray-600;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../colors-signifly.scss";
@import "../../signifly-variables/colors.scss";

// Custom spacers
$spacers: (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../colors-signifly.scss";
@import "../signifly-variables/colors.scss";

$primary: $loop-green;
$secondary: #6c757d;
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

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";
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;
}
}
}
}
}
}
Loading

0 comments on commit 8c1c784

Please sign in to comment.