Skip to content

Commit

Permalink
Updated styling of toggler; Added 'toggle all' text; Added toggles fo…
Browse files Browse the repository at this point in the history
…r each container; #1163
  • Loading branch information
TheMaaarc committed Mar 21, 2017
1 parent d84d915 commit 4ccfbc2
Show file tree
Hide file tree
Showing 9 changed files with 848 additions and 731 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ The changelog contains informations about bug fixes, new features or bc breaking

### Added

- [#1163](https://github.com/luyadev/luya/issues/1163) Styling of the toggler. Added toggles for each container.
- [#1245](https://github.com/luyadev/luya/issues/1245) Added gulp workflow to cms/admin.
- [#1245](https://github.com/luyadev/luya/issues/1245) Added gulp workflow to cms/admin.
- [#724](https://github.com/luyadev/luya/issues/724) Removed compass configs in admin module and added gulp workflow.
- [#1243](https://github.com/luyadev/luya/issues/1243#issuecomment-288064499) Enabled all flags
Expand Down
22 changes: 21 additions & 1 deletion modules/admin/src/resources/dist/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -8578,14 +8578,34 @@ input[type='checkbox']:checked + .input__label:before, input[type='checkbox']:ch
menu-dropdown,
.menu-dropdown {
display: block;
margin-left: -25px; }
margin: 10px 0 10px -25px; }

.menu-dropdown__category {
display: inline-block;
vertical-align: top;
min-width: 250px;
padding-left: 25px; }

.menu-dropdown__container {
margin: 10px 0; }

.menu-dropdown__title,
.menu-dropdown__toggle-all {
cursor: pointer;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none; }
.menu-dropdown__title i,
.menu-dropdown__toggle-all i {
display: inline-block;
vertical-align: middle; }
.menu-dropdown__title span,
.menu-dropdown__toggle-all span {
vertical-align: middle;
margin-top: 3px;
display: inline-block; }

.menu-dropdown__list {
position: relative; }
.menu-dropdown__list .menu-dropdown__list .menu-dropdown__item {
Expand Down
105 changes: 64 additions & 41 deletions modules/admin/src/resources/scss/components/_menu-dropdown.scss
Original file line number Diff line number Diff line change
@@ -1,57 +1,80 @@
menu-dropdown,
.menu-dropdown {
display: block;
margin-left: -25px;
display: block;
margin: 10px 0 10px -25px;
}

.menu-dropdown__category {
display: inline-block;
vertical-align: top;
min-width: 250px;
padding-left: 25px;
display: inline-block;
vertical-align: top;
min-width: 250px;
padding-left: 25px;


}

.menu-dropdown__container {
margin: 10px 0;
}

.menu-dropdown__title,
.menu-dropdown__toggle-all {
cursor: pointer;
user-select: none;

i {
display: inline-block;
vertical-align: middle;
}

span {
vertical-align: middle;
margin-top: 3px;
display: inline-block;
}
}

.menu-dropdown__list {
position: relative;

.menu-dropdown__list .menu-dropdown__item {
padding-left: 15px;

&:before {
content: "";
position: absolute;
background-color: map_get($grey, "darken-1");
height: 100%;
width: 2px;
left: 11px;
top: -5px;
}
&:after {
content: "";
position: absolute;
background-color: map_get($grey, "darken-1");
height: 2px;
width: 8px;
left: 11px;
top: 11px;
}

&:last-of-type:before {
height: 17px;
}
}
position: relative;

.menu-dropdown__list .menu-dropdown__item {
padding-left: 15px;

&:before {
content: "";
position: absolute;
background-color: map_get($grey, "darken-1");
height: 100%;
width: 2px;
left: 11px;
top: -5px;
}
&:after {
content: "";
position: absolute;
background-color: map_get($grey, "darken-1");
height: 2px;
width: 8px;
left: 11px;
top: 11px;
}

&:last-of-type:before {
height: 17px;
}
}
}

.menu-dropdown__item {
position: relative;
position: relative;

label {
width: 100%;
}
label {
width: 100%;
}
}

.menu-dropdown__label {
width: 100%;
overflow: hidden;
white-space: nowrap;
width: 100%;
overflow: hidden;
white-space: nowrap;
}
66 changes: 64 additions & 2 deletions modules/cms/src/admin/resources/dist/css/cmsadmin.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@charset "UTF-8";
/**
* Base colors
*/
Expand Down Expand Up @@ -99,13 +100,13 @@
.module-cmsadmin .accordion__entry--open > .accordion__body--empty:after {
display: block;
content: "";
background: url("../img/empty-placeholder-arrow.png") top left no-repeat;
background: url("../../img/empty-placeholder-arrow.png") top left no-repeat;
width: 100px;
height: 40px;
position: absolute;
background-size: cover;
opacity: 0.5;
right: 200px;
right: 0;
bottom: -20px; }
.module-cmsadmin .accordion__body .accordion__body--empty:after {
display: none; }
Expand Down Expand Up @@ -800,3 +801,64 @@
.module-cmsadmin zaa-wysiwyg ol,
.module-cmsadmin zaa-wysiwyg ol li {
list-style-type: decimal; }

/**
* Prefix every module style with the module class
*/
.block-styles b, .block-styles strong {
font-weight: 700; }

.block-styles i {
font-style: italic; }

.block-styles u {
text-decoration: underline; }

.block-styles h1, .block-styles h2, .block-styles h3, .block-styles h4, .block-styles h5 {
margin: 0; }

.block-styles h1 {
font-size: 2rem;
line-height: 2.4rem; }

.block-styles h2 {
font-size: 1.8rem;
line-height: 2.2rem; }

.block-styles h3 {
font-size: 1.6rem;
line-height: 2rem; }

.block-styles h4 {
font-size: 1.4rem;
line-height: 1.8rem; }

.block-styles h5 {
font-size: 1.2rem;
line-height: 1.6rem; }

.block-styles p, .block-styles span {
font-size: 1rem;
line-height: 1.2rem;
margin: 0; }

.block-styles blockquote {
font-style: italic; }
.block-styles blockquote:before {
display: inline-block;
content: "«";
margin-right: 5px; }
.block-styles blockquote:after {
display: inline-block;
content: "»";
margin-left: 5px; }

.block-styles ul, .block-styles ol {
padding: 0;
margin-left: 30px; }

.block-styles ul, .block-styles ul li {
list-style-type: disc; }

.block-styles ol, .block-styles ol li {
list-style-type: decimal; }
Loading

0 comments on commit 4ccfbc2

Please sign in to comment.