Skip to content
Snippets Groups Projects
Commit 00620172 authored by Cindy's avatar Cindy Committed by bouhaddouzay
Browse files

[US TRTL-541] set font to all material in front common theme

parent e761c8ff
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 60 deletions
cas/cas-server/src/main/config/sass/_fonts.scss
+ 8
− 8
View file @ 00620172
......@@ -15,53 +15,53 @@
*/
@mixin login-title {
font-family: 'Mulish', sans-serif;
font-size: 28px;
font-weight: 300;
color: $charcoal-grey;
}
@mixin login-text-1 {
font-family: 'Mulish', sans-serif;
font-size: 20px;
font-weight: 300;
color: $charcoal-grey;
}
@mixin button-primary {
font-family: 'Mulish', sans-serif;
font-size: 15px;
font-weight: 500;
color: $white;
}
@mixin login-text-2 {
font-family: 'Mulish', sans-serif;
font-size: 15px;
color: $greyish-two;
}
@mixin login-helper {
font-family: 'Mulish', sans-serif;
font-size: 15px;
color: $cool-grey;
}
@mixin login-link {
font-family: 'Mulish', sans-serif;
font-size: 15px;
color: var(--vitamui-secondary);
}
@mixin vitamui-input-placeholder {
font-family: 'Mulish', sans-serif;
font-size: 15px;
text-align: left;
color: $greyish-two;
}
@mixin login-error {
font-family: 'Mulish', sans-serif;
font-size: 14px;
letter-spacing: -0.4px;
color: $red;
......
cas/cas-server/src/main/config/sass/cas.scss
+ 1
− 1
View file @ 00620172
......@@ -14,7 +14,7 @@
body {
margin: 0;
color: $charcoal-grey;
font-family: 'Mulish', sans-serif;
background: $pale-grey;
}
......
cas/cas-server/src/main/resources/static/css/cas.css
+ 0
− 9
View file @ 00620172
......@@ -56,27 +56,23 @@
background-color: #ffffff;
box-shadow: 0 0 80px 0 rgba(163, 163, 163, 0.3); }
.login-box h1 {
font-family: 'Mulish', sans-serif;
font-size: 28px;
font-weight: 300;
color: #485053; }
.login-box header p {
margin-bottom: 0px; }
.login-box p {
font-family: 'Mulish', sans-serif;
font-size: 20px;
font-weight: 300;
color: #485053;
line-height: 30px; }
.login-box p small {
font-family: 'Mulish', sans-serif;
font-size: 15px;
color: #a6a6a6;
font-weight: 400; }
.login-box strong {
font-weight: 500; }
.login-box a {
font-family: 'Mulish', sans-serif;
font-size: 15px;
color: var(--vitamui-secondary);
text-decoration: underline; }
......@@ -108,7 +104,6 @@
.login-box input[type=password][disabled] {
opacity: 0.4; }
.login-box .form-error {
font-family: 'Mulish', sans-serif;
font-size: 14px;
letter-spacing: -0.4px;
color: #C10000; }
......@@ -117,7 +112,6 @@
vertical-align: middle;
margin-right: 10px; }
.login-box button.vitamui-primary {
font-family: 'Mulish', sans-serif;
font-size: 15px;
font-weight: 500;
color: #ffffff;
......@@ -136,7 +130,6 @@
.login-box button.vitamui-primary[disabled] {
opacity: 0.4; }
.login-box .helper {
font-family: 'Mulish', sans-serif;
font-size: 15px;
color: #aab0b3;
text-align: right;
......@@ -234,7 +227,6 @@
color: var(--vitamui-secondary);
font-size: 110px; }
.password-recovery .cancel-link {
font-family: 'Mulish', sans-serif;
font-size: 15px;
color: #aab0b3;
text-decoration: underline;
......@@ -451,7 +443,6 @@
body {
margin: 0;
color: #485053;
font-family: 'Mulish', sans-serif;
background: #f7f8fb; }
* {
......
ui/ui-frontend-common/src/app/modules/account/account-information-tab/account-information-tab.component.scss
+ 2
− 2
View file @ 00620172
......@@ -11,7 +11,7 @@
label {
font-size: 14px;
font-family:'Mulish', sans-serif;
color:var(--vitamui-grey-600);
font-weight: normal;
}
......@@ -19,7 +19,7 @@ label {
span
{
font-size: 16px;
font-family:'Mulish', sans-serif;
color:var(--vitamui-grey-900);
font-weight: bold;
}
......
ui/ui-frontend-common/src/app/modules/account/account.component.scss
+ 4
− 4
View file @ 00620172
......@@ -15,7 +15,7 @@ h2 {
mat-tab-group {
margin-top: 40px;
font-family: 'Mulish',sans-serif;
}
:host::ng-deep {
......@@ -32,7 +32,7 @@ mat-tab-group {
}
.mat-tab-label {
font-family: 'Mulish',sans-serif;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
margin-right: 5px;
......@@ -59,13 +59,13 @@ mat-tab-group {
}
.mat-tab-body-content {
font-family: 'Mulish',sans-serif;
height: 100%;
overflow: hidden;
}
.mat-tab-body-content {
font-family: 'Mulish',sans-serif;
height: 100%;
overflow: hidden;
}
......
ui/ui-frontend-common/src/app/modules/components/editable-field/level-input/level-input.component.scss
+ 1
− 1
View file @ 00620172
......@@ -64,7 +64,7 @@ input {
}
input {
font-family: 'Mulish', sans-serif;
background: none;
border: none;
transition: margin $anim-timing;
......
ui/ui-frontend-common/src/app/modules/components/header/item-select/item-select.component.scss
+ 4
− 4
View file @ 00620172
:host::ng-deep {
.selected-item-label, .unselected-item-label {
font-family: 'Mulish', sans-serif;
color: var(--vitamui-grey-600);
font-size: 16px;
}
......@@ -43,18 +43,18 @@
}
mat-select {
font-family: 'Mulish', sans-serif;
color: var(--vitamui-grey-900);
font-size: 16px;
}
.mat-option-text {
font-family: 'Mulish', sans-serif;
color: var(--vitamui-grey-900);
}
.mat-option {
font-family: 'Mulish', sans-serif;
color: var(--vitamui-grey-900);
}
......
ui/ui-frontend-common/src/app/modules/components/header/menu/menu.component.scss
+ 1
− 1
View file @ 00620172
......@@ -7,7 +7,7 @@
--headerHeight: 72px;
font-weight: 400;
font-size: 16px;
font-family:'Mulish', sans-serif;
.mat-tab-group.mat-primary .mat-ink-bar, .mat-tab-nav-bar.mat-primary .mat-ink-bar{
background: var(--vitamui-primary);
......
ui/ui-frontend-common/src/app/modules/components/order-dropdown/order-option/order-option.component.scss
+ 1
− 1
View file @ 00620172
......@@ -19,7 +19,7 @@
color: #666666;
font-size: 14px;
font-weight: bold;
font-family: 'Mulish', sans-serif;
white-space: nowrap;
width: 100%;
......
ui/ui-frontend-common/src/app/modules/components/vitamui-autocomplete/vitamui-autocomplete.component.scss
+ 2
− 3
View file @ 00620172
......@@ -5,7 +5,6 @@ $animation-time: 150ms;
.vitamui-autocomplete {
position: relative;
font-family: "Mulish", sans-serif;
> input {
background: $white;
......@@ -52,7 +51,7 @@ $animation-time: 150ms;
}
.input-label {
font-family: "Mulish", sans-serif;
font-size: 14px;
align-items: center;
letter-spacing: 0.1px;
......@@ -73,7 +72,7 @@ $animation-time: 150ms;
> input {
padding-top: 30px;
font-family: "Mulish", sans-serif;
font-size: 14px;
font-weight: bold;
color: var(--vitamui-grey-900);
......
ui/ui-frontend-common/src/app/modules/components/vitamui-common-select/vitamui-common-select.component.scss
+ 6
− 6
View file @ 00620172
......@@ -3,7 +3,7 @@
:host::ng-deep {
.selected-label,
.unselected-label {
font-family: "Mulish", sans-serif;
color: var(--vitamui-grey-600);
font-size: 14px;
}
......@@ -43,11 +43,11 @@
padding: 8px 30px;
transition: border-color 150ms ease-out;
vertical-align: top;
font-family: "Mulish", sans-serif;
}
.mat-form-field {
font-family: "Mulish", sans-serif;
font-weight: 400;
width: 100%;
}
......@@ -99,18 +99,18 @@
}
mat-select {
font-family: "Mulish", sans-serif;
color: var(--vitamui-grey-900);
font-size: 14px;
}
.mat-option-text {
font-family: "Mulish", sans-serif;
color: var(--vitamui-grey-900);
}
.mat-option {
font-family: "Mulish", sans-serif;
color: var(--vitamui-grey-900);
}
......
ui/ui-frontend-common/src/app/modules/components/vitamui-display-node/vitamui-display-node.component.scss
+ 2
− 2
View file @ 00620172
@import '../../../../sass/variables/colors';
.parent-label {
font-family: 'Mulish', sans-serif;
font-size: 14px;
font-weight: normal;
text-overflow: ellipsis;
......@@ -10,7 +10,7 @@
}
ul, li {
font-family: 'Mulish', sans-serif;
margin-top: 0;
margin-bottom: 0;
list-style: none;
......
ui/ui-frontend-common/src/app/modules/components/vitamui-input/vitamui-input-positive-number.component.scss
+ 1
− 1
View file @ 00620172
......@@ -72,7 +72,7 @@ input {
color: $charcoal-grey;
font-size: 14px;
font-weight: 500;
font-family: 'Mulish', sans-serif;
background: none;
border: none;
transition: margin $anim-timing;
......
ui/ui-frontend-common/src/app/modules/components/vitamui-input/vitamui-input.component.scss
+ 1
− 1
View file @ 00620172
......@@ -86,7 +86,7 @@ input {
color: var(--vitamui-grey-900);
font-size: 14px;
font-weight: 500;
font-family: 'Mulish', sans-serif;
background: none;
border: none;
transition: margin $anim-timing;
......
ui/ui-frontend-common/src/app/modules/components/vitamui-input/vitamui-textarea.component.scss
+ 2
− 2
View file @ 00620172
......@@ -72,7 +72,7 @@ textarea {
color: var(--vitamui-grey-700);
font-size: 14px;
font-weight: 500;
font-family: 'Mulish', sans-serif;
background: none;
border: none;
transition: margin $anim-timing;
......@@ -83,7 +83,7 @@ textarea {
label {
color: var(--vitamui-grey-600);
font-family: 'Mulish', sans-serif;
font-size: 14px;
position: absolute;
line-height: 48px;
......
ui/ui-frontend-common/src/sass/_button.scss
+ 1
− 1
View file @ 00620172
......@@ -70,7 +70,7 @@
height: 50px;
font-style: normal;
font-weight: bold;
font-family: 'Mulish', sans-serif;
line-height: 20px;
letter-spacing: .5px;
border-radius: 50px;
......
ui/ui-frontend-common/src/sass/_editable-field.scss
+ 4
− 4
View file @ 00620172
......@@ -51,7 +51,7 @@ $anim-timing: 150ms ease-out;
}
.editable-field-content {
font-family: 'Mulish', sans-serif;
display: flex;
flex-direction: column;
align-items: stretch;
......@@ -60,7 +60,7 @@ $anim-timing: 150ms ease-out;
max-width: 100%;
.editable-field-label {
font-family: 'Mulish', sans-serif;
position: absolute;
font-size: 12px;
color: var(--vitamui-grey-400);
......@@ -87,7 +87,7 @@ $anim-timing: 150ms ease-out;
}
.editable-field-control > input {
font-family: 'Mulish', sans-serif;
border: none!important;
margin-top: 5px;
......@@ -97,7 +97,7 @@ $anim-timing: 150ms ease-out;
}
.editable-field-control > textarea {
font-family: 'Mulish', sans-serif;
border: none!important;
&:focus {
......
ui/ui-frontend-common/src/sass/_form.scss
+ 2
− 2
View file @ 00620172
......@@ -5,7 +5,7 @@
padding: 5px;
vertical-align: top;
margin-bottom: 10px;
font-family: 'Mulish', sans-serif;
label {
font-size: 12px;
......@@ -24,7 +24,7 @@
font-size: 12px;
font-weight: 400;
color: $red;
font-family: 'Mulish', sans-serif;
}
input[type=text].vitamui-input,
......
ui/ui-frontend/projects/identity/src/sass/_material-theme.scss → ui/ui-frontend-common/src/sass/_material-theme.scss
+ 1
− 6
View file @ 00620172
@import '~@angular/material/theming';
@import '~ui-frontend-common/sass/variables/colors';
@import './variables/colors';
// Plus imports for other components in your app.
// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once!
@include mat-core();
// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue. Available color palettes: https://www.google.com/design/spec/style/color.html
......
ui/ui-frontend-common/src/sass/_navbar.scss
+ 1
− 1
View file @ 00620172
......@@ -43,7 +43,7 @@
border-radius: 10px;
background-color: rgba(255, 255, 255, 0.85);
padding: 0 20px 0 20px;
font-family: 'Mulish', sans-serif;
font-size: 16px;
font-weight: 500;
line-height: 1em;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment