Skip to content

Commit

Permalink
disable foundation
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgeatgu committed Jul 6, 2023
1 parent f037388 commit aab2c77
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 70 deletions.
2 changes: 1 addition & 1 deletion decidim-admin/app/packs/entrypoints/decidim_admin.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "stylesheets/decidim/admin/application.scss";
/* @import "stylesheets/decidim/admin/application.scss"; */
@import "stylesheets/decidim/admin/redesigned_application.scss";
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
$card-padding-small: 1rem;

.card{
@apply bg-transparent border-0;

Expand Down Expand Up @@ -32,7 +30,7 @@ $card-padding-small: 1rem;
}

.card-footer{
padding: $card-padding;
padding: 1rem;
border-top: 1px solid rgba(black, .1);

.button--remove{
Expand All @@ -43,28 +41,16 @@ $card-padding-small: 1rem;
.card--list__item{
display: flex;
align-items: center;
padding-left: $card-padding-small;
padding-left: 1rem;

.card--list--mini &{
padding-left: $card-padding-small;
}

@include breakpoint(medium){
padding-left: $card-padding;
padding-left: 1rem;
}
}

.card--list__icon{
display: none;
fill: $anchor-color;

@include breakpoint(medium){
margin-right: 1rem;
display: block;
width: 30px;
height: 30px;
flex-shrink: 0;
}
fill: currentColor;
}

.card--list__text{
Expand Down Expand Up @@ -94,11 +80,6 @@ $card-padding-small: 1rem;
@apply bg-transparent px-0 py-2;
}

.card-divider--reduced{
// height adjust
padding: (($global-padding * .5) + rem-calc(.7)) $global-padding;
}

.card.with-overflow{
overflow: visible;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,27 +33,27 @@

& > li.is-dropdown-submenu-parent > a{
padding-right: 1rem;
background-color: $button-background;
color: $white;
background-color: #000;
color: #fff;

&::after{
border-top-color: $white;
border-top-color: #fff;
}

&:hover{
background-color: $button-background-hover;
color: $white;
background-color: #000;
color: #fff;
}
}

li.is-active > a,
li.is-active li.is-submenu-item > a:hover{
background-color: $primary-color;
color: $white;
background-color: #000;
color: #fff;
}

.menu.vertical li.is-active.opens-right > a::after{
border-left-color: $white;
border-left-color: #fff;
}
}
}
Expand All @@ -77,7 +77,7 @@
}

&.action-icon--remove{
color: lighten(#e66a5d, 24);
color: #e66a5d;
margin-left: .3rem;

&:hover{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,17 @@ body{
.layout-nav{
@apply shrink-0 max-w-[340px];

@include breakpoint(mediumlarge down){
position: absolute;
top: 0;
bottom: 0;
transform: translateX(-100%);
transition: transform .3s;
z-index: 1;
}

@include breakpoint(small down){
max-width: 100%;
width: 100%;
transform: translateX(-100%);

.secondary-nav{
width: calc(100% - 120px);
}
}

&.is-nav-open{
transform: translateX(0);
}
}

.layout-content{
@apply flex-grow max-w-full;
@apply flex-grow max-w-full bg-gray-5;

svg{
@apply w-4 h-4 fill-secondary inline-block;
}
}

.container{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
}

.logs__log__actions-dropdown{
color: $muted;
padding: rem-calc(0 10);

&::after{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//Vars
$process-title-height: 3rem;
/* $process-title-height: 3rem; */

//Styles
.secondary-nav{
width: 220px;
min-height: 100%;
float: left;
background-color: $white;
background-color: #fff;
box-shadow: 6px 6px 10px rgba(black, .04);

ul{
Expand All @@ -18,19 +18,14 @@ $process-title-height: 3rem;
display: block;
padding: .5rem 1rem;
margin: 0 .5rem;
color: $body-font-color;
/* color: $body-font-color; */

&:hover,
&:focus{
color: lighten($body-font-color, 20);
/* color: lighten($body-font-color, 20); */
}
}

li.is-active > a{
background-color: $lighter-gray;
border-radius: $global-radius;
}

li > ul{
margin-left: 1rem;
font-size: 90%;
Expand Down Expand Up @@ -61,7 +56,7 @@ $process-title-height: 3rem;
display: block;
padding: .5rem 1rem;
margin: 0 .5rem;
color: $body-font-color;
/* color: $body-font-color; */
}

.process-title,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
}

a.is-tab-error{
color: $alert-color;
color: red;
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Foundation button overrides */
/* Foundation button overrides
.button {
&.small {
padding-top: 0.5rem;
Expand Down Expand Up @@ -84,3 +84,4 @@
flex: 0.2 1 auto;
text-align: right;
}
*/
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
&-selector {
@apply grid grid-cols-2 md:flex gap-4 md:gap-1 justify-end [&~*]:mt-6 [&_button]:w-full;

[aria-expanded="true"] {
/* [aria-expanded="true"]{
@apply button__secondary;
}
} */
}

&-item {
Expand Down
4 changes: 2 additions & 2 deletions decidim-forms/app/packs/stylesheets/decidim/forms/forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
&__step-heading {
@apply space-y-4;

h3 {
/* h3{
@apply h3;
}
} */

div {
@apply text-gray-2 text-lg;
Expand Down

0 comments on commit aab2c77

Please sign in to comment.