Skip to content

Commit

Permalink
Refs #141204 changed the following to the eea theme:
Browse files Browse the repository at this point in the history
- button.variables:
  - bump icon height to relativeMedium in order to have 16px for an icon
- container.variables:
  - use rem values for mobileGutter instead of the relative em
- input.variables:
  - input font weight should be normal not light
- segment.overrides:
  - secondary segment shouldn't be only 12px and bump discreet to 14px
  since font size of body is now 16
- main.overrides:
  - ensure login container is still 376px and help paragraph needs to be
  left aligned instead of auto coming from the reduced text feature
- main.variables:
  - updated textElementsSelectors to include not selectors by using the e() method
  - loginContainerMaxWidth is now used for the login container size
- site.variables:
  - bump unit sizes to use 16px base font instead of 14
  - headerFontWeight is now bold
  - slightly bump h1 to h5 sizes
  - bumped mini to massiveSize following the bumps in h1 to h6
  • Loading branch information
ichim-david committed Nov 10, 2021
1 parent 5125003 commit 06d8d86
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 33 deletions.
2 changes: 1 addition & 1 deletion theme/themes/eea/elements/button.variables
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
;

/* Icon */
@iconHeight: @relativeTiny;
@iconHeight: @relativeMedium;
@iconOpacity: 0.8;
@iconDistance: @relative6px;
@iconColor: '';
Expand Down
2 changes: 1 addition & 1 deletion theme/themes/eea/elements/container.variables
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/* Devices */
@mobileMinimumGutter: 0em;
@mobileWidth: auto;
@mobileGutter: 1em;
@mobileGutter: 1rem;

@tabletMinimumGutter: (@emSize * 1);
@tabletWidth: @tabletBreakpoint - (@tabletMinimumGutter * 2) - @scrollbarWidth;
Expand Down
2 changes: 1 addition & 1 deletion theme/themes/eea/elements/input.variables
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
--------------------*/

// Pastanaga variable
@inputFontWeight: 300;
@inputFontWeight: normal;

@inputFont: @pageFont;
@verticalPadding: @inputVerticalPadding;
Expand Down
4 changes: 2 additions & 2 deletions theme/themes/eea/elements/segment.overrides
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
}

.ui.secondary.segment {
font-size: @12px;
font-size: @16px;
}

.ui.discreet.segment {
color: @lightGrey;
font-size: @12px;
font-size: @14px;
}

.ui.form.segment {
Expand Down
25 changes: 18 additions & 7 deletions theme/themes/eea/extras/main.overrides
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
.addReducedTextBlock() when (@useReducedTextContainer = true) {
@{textContainerSelector} {
@{textContainerTextSelectors} {
max-width: @textContainerWidth;
margin-right: @textContainerTextRightMargin;
margin-left: @textContainerTextLeftMargin;
.addReducedTextElements() when (@reduceTextElementsSize = true) {
@{textElementsParentSelector} {
@{textElementsSelectors} {
max-width: @textElementsMaxWidth;
margin-right: @textElementsRightMargin;
margin-left: @textElementsLeftMargin;
}
}
}

.addReducedTextBlock();
.addReducedTextElements();

// login page keep the small size of login container
#page-login {
.container {
max-width: @loginContainerMaxWidth;
}
// reset left margin since help is a p tag
.help {
margin-left: 0 !important;
}
}
17 changes: 11 additions & 6 deletions theme/themes/eea/extras/main.variables
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// #2749 Pastanaga text block readability enhancements
@useReducedTextContainer: true;
@textContainerWidth: 800px;
@textContainerSelector: .content-area;
@textContainerTextSelectors: h1, h2, h3, h4, h5, h6, p, ol, ul;
@textContainerTextLeftMargin: auto !important;
@textContainerTextRightMargin: auto !important;
@reduceTextElementsSize: true;
@textElementsMaxWidth: 800px;
@textElementsParentSelector: .content-area;
@textElementsSelectors: e("h2, h3:not(.relatedItems-header), h4, h5, h6, p:not(.right):not(.left):not(.data-figure), ol, ul, blockquote, .slate-table");
@textElementsLeftMargin: auto !important;
@textElementsRightMargin: auto !important;

/* Mobile Menu Nav */
@mobileMenuNavAlignItems: center;
Expand All @@ -18,3 +18,8 @@
/* Mobile Menu Nav Item */
@mobileMenuNavItemJustifyContent: center;
@mobileMenuNavItemLineHeight: 1.25;

/*-------------------
login.less
--------------------*/
@loginContainerMaxWidth: 376px !important;
39 changes: 24 additions & 15 deletions theme/themes/eea/globals/site.variables
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,21 @@

@lightSecondaryColor : @lightBlack;
@headerLineHeight : 1.25;
@headerFontWeight : 500;
@headerFontWeight : 700;

@h1 : unit((28 / 14), rem);
@h2 : unit((24 / 14), rem);
@h3 : unit((18 / 14), rem);
@h4 : unit((15 / 14), rem);
@h5 : unit((14 / 14), rem);
@h1 : unit((32 / 16), rem);
@h2 : unit((28 / 16), rem);
@h3 : unit((21 / 16), rem);
@h4 : unit((18 / 16), rem);
@h5 : unit((16 / 16), rem);

/*--------------
Form Input
---------------*/

/* This adjusts the default form input across all elements */
@inputBackground : @white;
@inputVerticalPadding : @relative11px;
@inputVerticalPadding : @relative12px;
/* This adjusts the default form input across all elements */
@inputHorizontalPadding : 0;
@inputPadding : @inputVerticalPadding @inputHorizontalPadding;
Expand Down Expand Up @@ -110,14 +110,23 @@
This ensures these "ratios" remain constant despite changes in EM
*/

@miniSize : (11 / 14);
@tinySize : (12 / 14);
@smallSize : (13 / 14);
@mediumSize : (14 / 14);
@largeSize : (16 / 14);
@bigSize : (19 / 14);
@hugeSize : (22 / 14);
@massiveSize : (26 / 14);
//@miniSize : (3 / 12);
//@tinySize : (6 / 12);
//@smallSize : (12 / 12);
//@mediumSize : (18 / 12);
//@largeSize : (24 / 12);
//@bigSize : (36 / 12);
//@hugeSize : (48 / 12);
//@massiveSize : (60 / 12);

@miniSize : (11 / @emSize);
@tinySize : (12 / @emSize);
@smallSize : (14 / @emSize);
@mediumSize : (16 / @emSize);
@largeSize : (20 / @emSize);
@bigSize : (24 / @emSize);
@hugeSize : (28 / @emSize);
@massiveSize : (32 / @emSize);


/*-------------------
Expand Down

0 comments on commit 06d8d86

Please sign in to comment.