Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OIS-24: applied mixins in order to support RTL #42

Merged
merged 1 commit into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/admin-buq/components/AdminBuqForm/_admin-buq-form.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../../common/mixins';

$accent-color: #49baeb;
$light-grey: #bebebe;

Expand Down Expand Up @@ -77,10 +79,10 @@ $light-grey: #bebebe;
content: "\f06a";
font-family: FontAwesome;
display: inline-block;
margin-left: -2em;
@include margin-left(-2em);
margin-top: 0.5em;
position: fixed;
text-align: right;
@include text-align(right);
}
}

Expand Down
25 changes: 12 additions & 13 deletions src/admin-buq/components/AdminBuqPage/_admin-buq-page.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.admin-buq {

.admin-buq-row {
display: flex;
flex-direction: row;
Expand All @@ -9,7 +8,7 @@
margin-right: 0px;
}

.admin-buq-main {
.admin-buq-main {
overflow: auto;
display: flex;
flex-direction: column;
Expand All @@ -27,9 +26,9 @@
padding: 1em 2em;

.breadcrumb {
padding-left: 0;
padding-top: 0;
font-size: 14px;
@include padding-left(0);
padding-top: 0;
font-size: 14px;
}
}

Expand All @@ -40,23 +39,23 @@
}

.admin-buq-navigation {
border-bottom: #D9D9D9 1px solid;
border-bottom: #d9d9d9 1px solid;
margin-bottom: 1em;
list-style: none;
display: flex;
padding-left: 0;
@include padding-left(0);

.admin-buq-link {
background-color: #E4E4E4;
background-color: #e4e4e4;
padding: 10px 15px;
border-radius: 4px 4px 0 0;
margin-right: 2px;
@include margin-right(2px);
cursor: pointer;
}

.admin-buq-link.active {
background-color: #FFFFFF;
border: #D9D9D9 1px solid;
background-color: #ffffff;
border: #d9d9d9 1px solid;
border-bottom: none;
color: $link-color;
}
Expand Down Expand Up @@ -84,8 +83,8 @@
}

.admin-buq-table-add-button {
margin-right: 5px;
margin-left: auto;
@include margin-right(5px);
@include margin-left(auto);
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/admin-buq/components/Modal/_modal.scss
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
.modal {
position: fixed;
top: 0;
left: 0;
@include left(0);
width:100%;
height: 100%;
background: rgba(0, 0, 0, 0.6);
}

.modal-main {
position:fixed;
background: white;
height: auto;
top:50%;
left:50%;
transform: translate(-50%,-50%);
@include left(50%);
//TODO: apply here a mixin once the ui-components is merged translate-xy(-50%,-50%);
transform: translate(-50%, -50%);
width: 600px;
margin: 30px auto;
}

.display-block {
display: block;
}

.display-none {
display: none;
}

5 changes: 1 addition & 4 deletions src/admin-data-import/_admin-data-import.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,7 @@ input::file-selector-button {
display: block;
padding: 8px 16px;
border-radius: 4px;
border-top: #e4e4e4 1px solid;
border-right: #e4e4e4 1px solid;
border-left: #e4e4e4 1px solid;
border-bottom: #e4e4e4 1px solid;
border: #e4e4e4 1px solid;
color: #333333;
text-shadow: 0 0 0.1em #ffffff;
background: #e4e4e4 linear-gradient(to bottom, #fefefe, #f1f1f1 10%, #e4e4e4);
Expand Down
2 changes: 1 addition & 1 deletion src/admin-role-form/_type-form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dl.type-form {

dd {
flex: 1 1 calc(100% - 200px - 1em);
margin-left: 1em;
@include margin-left(1em);
}

& > dt:not(:first-of-type),
Expand Down
2 changes: 1 addition & 1 deletion src/admin-user-form/_user-password-modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

//Hack to bypass classes set by the ngModel validation
input[type=password].number {
text-align: left;
@include text-align(left);
}

}
8 changes: 4 additions & 4 deletions src/buq/_buq.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
padding: 1em 2em;

.breadcrumb {
padding-left: 0;
@include padding-left(0);
font-size: 14px;
}
}
Expand Down Expand Up @@ -42,7 +42,7 @@
.suggestions-results {
z-index: 1;
position: absolute;
left: 0;
@include left(0);
max-height: 7em;
}
}
Expand All @@ -66,13 +66,13 @@
white-space: break-spaces;
transform: translate(-30%, 115%);
bottom: 0;
padding: 8px 15px 8px 8px;
@include padding(8px, 15px, 8px, 8px);
height: fit-content;
width: 200px;

&:before {
top: -25%;
left: 28%;
@include left(28%);
border-width: 8px;
border-color: transparent transparent #fff transparent;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
margin-top: 16px;

th {
padding-right: 48px;
@include padding-right(48px);
}

.proceed {
Expand Down
20 changes: 10 additions & 10 deletions src/buq/components/prepareBuq/_prepare-buq-page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
&.is-required:after {
color: $brand-danger;
content: '*';
margin-left: 0.25em;
@include margin-left(0.25em);
}
}

.prepare-buq-button {
width: 100%;
display: flex;
Expand All @@ -56,19 +56,19 @@
border: 0;
background: #ffffff;
padding: 1em 2em;

.breadcrumb {
padding-top: 1.5em;
padding-left: 0;
@include padding-left(0);
font-size: 14px;
}
}

.prepare-buq-page-title {
border-bottom: #bebebe 1px solid;
padding: 3.2px 0em;
}

.prepare-buq-table-actions {
display: flex;
justify-content: center;
Expand Down Expand Up @@ -107,7 +107,7 @@

.comments-input-title {
margin-bottom: 3px;
margin-left: 5px;
@include margin-left(5px);
}
}

Expand Down Expand Up @@ -135,7 +135,7 @@
.react-table{
th{
white-space: nowrap;
padding-right: 8px;
@include padding-right(8px);
}
}
}
Expand Down Expand Up @@ -219,10 +219,10 @@
&.is-required:after {
color: $brand-danger;
content: '*';
margin-left: 0.25em;
@include margin-left(0.25em);
}
}

.approve-buq-button {
width: 100%;
display: flex;
Expand Down
Loading
Loading