Skip to content

Commit

Permalink
[!!!][TASK] update Appearance and Layout wrapper labels/classes, make…
Browse files Browse the repository at this point in the history
… it more semantic
  • Loading branch information
dmh committed May 5, 2017
1 parent 2631abb commit b9103e1
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 44 deletions.
4 changes: 2 additions & 2 deletions Configuration/FluidStyledContent/FluidContent.pagets
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ TCEFORM.tt_content.frame_class {
TCEFORM.tt_content.frame_class {
addItems {
gray-background = Gray Background
blue-mountain-wrp = Blue Mountain Wrapper
blue-mountain-header = Blue Mountain Header Text
main-color-wrp = Main Color Wrapper
large-header = Large Header Text
inverse = Inverse color (text/links/buttons)
saturated-inverse = Inverse and saturate color
}
Expand Down
4 changes: 2 additions & 2 deletions Configuration/GridElements/PageTS/AdvColumnGrid.pagets
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ TCEFORM.tt_content.layout {
gridelements_pi1 {
addItems {
--div-- = Gridelements layouts:
501 = Blue Mountain Mosaic odd
502 = Blue Mountain Mosaic even
501 = Main Color Mosaic odd
502 = Main Color Mosaic even
503 = Gray Mosaic odd
504 = Gray Mosaic even
}
Expand Down
4 changes: 2 additions & 2 deletions Configuration/TypoScript/Library/lib.fluidContent.setupts
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ lib.contentElement {
800 {
classMappings {
# Specific layout for GridElements (Label => theme_t3kit/Configuration/GridElements/PageTS/AdvColumnGrid.pagets)
501 = mosaic-blue-mountain-odd
502 = mosaic-blue-mountain-even
501 = mosaic-main-color-odd
502 = mosaic-main-color-even
503 = mosaic-gray-odd
504 = mosaic-gray-even
}
Expand Down
26 changes: 17 additions & 9 deletions felayout_t3kit/dev/styles/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,24 @@
@import "main/contentElements/simpleAccordion.less";
@import "main/contentElements/heroImage.less";

// appearance
@import "main/appearance/wrapperStyle/blueMountainWrp.less";
@import "main/appearance/wrapperStyle/blueMountainHeader.less";
@import "main/appearance/wrapperStyle/inverse.less";
@import "main/appearance/wrapperStyle/saturatedInverse.less";
@import "main/appearance/wrapperStyle/grayBackground.less";
// ========================
// appearance wrappers
// ========================
// general
@import "main/appearance/general/mainColorWrp.less";
@import "main/appearance/general/largeHeader.less";
@import "main/appearance/general/inverse.less";
@import "main/appearance/general/saturatedInverse.less";
@import "main/appearance/general/grayBackground.less";

// gridLayouts
@import "main/appearance/gridLayoutStyle/mosaicGray.less";
@import "main/appearance/gridLayoutStyle/mosaicBlueMountain.less";
// ========================
// layout wrappers
// ========================
// gridelements
@import "main/layout/gridelements/mosaicGray.less";
@import "main/layout/gridelements/mosaicMainColor.less";

// nav
@import "main/nav/breadcrumbs.less";
@import "main/nav/subNavigation.less";
@import "main/nav/dropdownMenuWithColumns.less";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// =================================
// General appearance wrappers
// =================================

// gray-background class
.gray-background {
background: tint(@main-text-color, 90%);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// =================================
// General appearance wrappers
// =================================

.inverse a {
color: tint(@main-color, 90%);

Expand Down
11 changes: 11 additions & 0 deletions felayout_t3kit/dev/styles/main/appearance/general/largeHeader.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// =================================
// General appearance wrappers
// =================================

.large-header {
h2 {
font-size: 48px;
font-weight: 400;
font-style: italic;
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
.blue-mountain-wrp {
// =================================
// General appearance wrappers
// =================================

.main-color-wrp {
background: @main-color;
}

.blue-mountain-wrp a {
.main-color-wrp a {
color: tint(@main-text-color, 100%);

&.active,
Expand All @@ -22,12 +26,12 @@
}
}

.blue-mountain-wrp p {
.main-color-wrp p {
color: shade(@main-text-color, 100%);
-webkit-font-smoothing: antialiased;
}

.blue-mountain-wrp {
.main-color-wrp {
h1,
h2,
h3,
Expand All @@ -38,19 +42,19 @@
}
}

.blue-mountain-wrp .icons {
.main-color-wrp .icons {
color: tint(@main-color, 90%);
border-color: tint(@main-color, 50%);
}

.blue-mountain-wrp .big-icon-text-btn__sham-link {
.main-color-wrp .big-icon-text-btn__sham-link {
color: tint(@main-color, 90%);
}

.blue-mountain-wrp .icon-text-btn__sham-link {
.main-color-wrp .icon-text-btn__sham-link {
color: tint(@main-color, 90%);
}

.blue-mountain-wrp .img-text-link__sham-link {
.main-color-wrp .img-text-link__sham-link {
color: tint(@main-color, 90%);
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// =================================
// General appearance wrappers
// =================================

.saturated-inverse a {
color: tint(@main-color, 90%);

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// layout wrappers for gridelements
.mosaic-gray-odd {
& > .row {
& > div {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.mosaic-blue-mountain-odd {
// layout wrappers for gridelements
.mosaic-main-color-odd {
& > .row {
& > div {
&:nth-child(odd) {
Expand Down Expand Up @@ -62,7 +63,7 @@
}
}

.mosaic-blue-mountain-even {
.mosaic-main-color-even {
& > .row {
& > div {
&:nth-child(odd) {
Expand Down Expand Up @@ -126,25 +127,25 @@
}
}

.mosaic-blue-mountain-even .row > div,
.mosaic-blue-mountain-odd .row > div {
.mosaic-main-color-even .row > div,
.mosaic-main-color-odd .row > div {
padding: 0 30px;
}

.mosaic-blue-mountain-even .row > div .big-icon-text-btn__wrp,
.mosaic-blue-mountain-odd .row > div .big-icon-text-btn__wrp {
.mosaic-main-color-even .row > div .big-icon-text-btn__wrp,
.mosaic-main-color-odd .row > div .big-icon-text-btn__wrp {
margin: 0 -30px;
padding: 0 30px;
}

.mosaic-blue-mountain-even .row > div .icon-text-btn__wrp,
.mosaic-blue-mountain-odd .row > div .icon-text-btn__wrp {
.mosaic-main-color-even .row > div .icon-text-btn__wrp,
.mosaic-main-color-odd .row > div .icon-text-btn__wrp {
margin: 0 -30px;
padding: 0 30px;
}

.mosaic-blue-mountain-even .row > div .img-text-link__wrp,
.mosaic-blue-mountain-odd .row > div .img-text-link__wrp {
.mosaic-main-color-even .row > div .img-text-link__wrp,
.mosaic-main-color-odd .row > div .img-text-link__wrp {
margin: 0 -30px;
padding: 0 30px;
}

0 comments on commit b9103e1

Please sign in to comment.