Skip to content

Commit

Permalink
Merge pull request joomla#99 from joomla/development-improvements
Browse files Browse the repository at this point in the history
- Remove display:grid for top and bottom positions -> improve display for mod_news on top-a
- Move rtl definition for footer to _footer.scss ([dir=rtl] & )
- Add margin to form control-group - joomla#92
- Add underline for links without class (e.g. in text) -> joomla#98
- Improve underline rules for links on menus -> joomla#97
- Change padding and position for mod-list on sidebar
- Improve links in mod-menu on sidebar
  • Loading branch information
richard67 authored Sep 24, 2020
2 parents f90d370 + 5ea9acf commit 4b79c51
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 30 deletions.
21 changes: 0 additions & 21 deletions templates/cassiopeia/scss/blocks/_css-grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -135,24 +135,3 @@
.system-debug {
grid-area: debug;
}

.container-top-a,
.container-top-b,
.container-bottom-a,
.container-bottom-b {
display: grid;
grid-gap: $cassiopeia-grid-gutter;
grid-template-columns: 1fr;

> * {
margin: 0;
}

@include media-breakpoint-up(sm) {
grid-template-columns: 1fr 1fr;
}

@include media-breakpoint-up(md) {
grid-template-columns: repeat(auto-fit, minmax(24%, 1fr));
}
}
9 changes: 9 additions & 0 deletions templates/cassiopeia/scss/blocks/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,13 @@
background: $white;
border-radius: $border-radius;
}

[dir=rtl] & {
background-image: $cassiopeia-header-grad-rtl;

.back-top {
margin-right: auto;
margin-left: 0;
}
}
}
22 changes: 22 additions & 0 deletions templates/cassiopeia/scss/blocks/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,29 @@ td .form-control {
bottom: 100%;
}

fieldset {
margin-bottom: $cassiopeia-grid-gutter*2;
+ fieldset {
margin-top: $cassiopeia-grid-gutter*2;
}

> * {
margin-bottom: 0
}

> * + * {
margin-top: $cassiopeia-grid-gutter*2;
}
}

.control-group {
margin: $cassiopeia-grid-gutter 0;
}
.container-popup [id="filter[search]-desc"] {
top: 100%;
bottom: auto;
}

.com-users-login__options {
margin-top: $cassiopeia-grid-gutter*2;
}
4 changes: 4 additions & 0 deletions templates/cassiopeia/scss/blocks/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ h6 {
a {
color: var(--cassiopeia-color-primary);

&:not([class]) {
text-decoration: underline;
}

&:hover,
&:focus {
color: var(--cassiopeia-color-hover);
Expand Down
27 changes: 27 additions & 0 deletions templates/cassiopeia/scss/blocks/_modifiers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -275,3 +275,30 @@
}
}
}

.mod-list {
padding-left: 0;
list-style-position: inside;

[dir=rtl] & {
padding-right: 0;
}
}

.mod-menu.nav {
li {
padding: ($cassiopeia-grid-gutter/2) 0;

a {
text-decoration: none;
}

&.active > a {
text-decoration: underline;
}

.mod-menu__sub {
padding-left: $cassiopeia-grid-gutter;
}
}
}
8 changes: 0 additions & 8 deletions templates/cassiopeia/scss/template-rtl.scss
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,3 @@ dd {
.btn-group > .btn-group:not(:first-child) {
@include border-right-radius(0);
}

.footer {
background-image: $cassiopeia-header-grad-rtl;
.back-top {
margin-right: auto;
margin-left: 0;
}
}
8 changes: 7 additions & 1 deletion templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,20 @@
@include media-breakpoint-down(md) {
width: 100%;
}
.active a {
.active > a {
text-decoration: underline;
}

span:hover,
a:hover {
text-decoration: underline;
}
}
> span,
> a {
flex: 1 0 0%;
overflow: hidden;
text-decoration: none;
text-overflow: ellipsis;
white-space: nowrap;
}
Expand Down

0 comments on commit 4b79c51

Please sign in to comment.