Compare commits

..

No commits in common. "3d23ba55d4c1c300d49cf91868cf65bb8307b5a6" and "b7ec209761cac635ba8312dbb07bf831ebc32933" have entirely different histories.

7 changed files with 90 additions and 115 deletions

View file

@ -26,7 +26,6 @@
// Additional Modules and variables // Additional Modules and variables
// in dependency to other basic styles // in dependency to other basic styles
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@import "modules/io/io_module";
@import "modules/navigation/nav_module"; @import "modules/navigation/nav_module";
@import "modules/editor/editor_module"; @import "modules/editor/editor_module";
@import "modules/explanation/explanation_module"; @import "modules/explanation/explanation_module";

View file

@ -154,7 +154,7 @@ button {
} }
.button_io { .button_io {
@extend %basic; @extend %basic_button;
border: $width_border_io solid $color_border_button; border: $width_border_io solid $color_border_button;
padding: $padding_basic; padding: $padding_basic;
color: $color_text_button; color: $color_text_button;
@ -164,7 +164,7 @@ button {
// border-color: #0059F6; // border-color: #0059F6;
border-color: transparent; border-color: transparent;
color: white; color: white;
background-color: $color_action_basic; background-color: $foxtrot_color;
} }
&[disabled="disabled"], &[disabled="disabled"],
@ -179,7 +179,7 @@ button {
} }
.button_clear { .button_clear {
@extend %basic; @extend %basic_button;
padding: 0; padding: 0;
border: 0; border: 0;
background-color: transparent; background-color: transparent;

View file

@ -144,18 +144,6 @@ aside {
button { button {
@extend .button_io; @extend .button_io;
} }
.a_button {
display: flex;
}
ul.vertical li {
margin-bottom: $space_half;
.a_button > *:last-child {
margin-left: auto;
}
}
} }
} }
@ -215,33 +203,7 @@ h6 {
// Header // Header
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
header { header {}
&.io {
z-index: map.get($z-indexes, "content-top");
&>*:last-child *:last-child {
margin-right: 0;
}
&>*:first-child *:first-child {
margin-left: 0;
}
nav,
ul {
@extend %flex-inline;
align-items: stretch;
}
nav:last-child {
margin-left: auto;
}
h1 {
margin: 0;
}
}
}
.header_page { .header_page {
overflow: auto; overflow: auto;
@ -256,8 +218,84 @@ header {
} }
} }
header // Footer header,
aside,
footer {
&.io {
.span_solo {
border: $width_border_io solid transparent;
padding: $padding_basic;
}
}
}
header.io,
aside.io {
padding: $space_basic;
input,
button,
textarea,
select {
margin-inline: $space_half;
}
input {
@extend .input_io;
}
textarea {
@extend .io_textarea;
}
select {
@extend .io_select;
}
button {
@extend .button_io;
}
}
header,
footer {
&.io {
@extend %flex-inline;
align-items: stretch;
}
}
header.io {
z-index: map.get($z-indexes, "content-top");
&>*:last-child *:last-child {
margin-right: 0;
}
&>*:first-child *:first-child {
margin-left: 0;
}
nav,
ul {
@extend %flex-inline;
align-items: stretch;
}
nav li {
margin: 0;
}
nav:last-child {
margin-left: auto;
}
h1 {
margin: 0;
}
}
// Footer
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
footer { footer {
&.io { &.io {

View file

@ -276,7 +276,7 @@ span {
} }
.span_solo { .span_solo {
@extend %basic; @extend %solo;
} }
// Linebreaks // Linebreaks

View file

@ -20,11 +20,6 @@
} }
} }
%size_io_button {
border: $width_border_io solid transparent;
padding: $padding_basic;
}
.di_none { .di_none {
display: none !important; display: none !important;
} }

View file

@ -44,6 +44,14 @@
font-weight: 300; font-weight: 300;
} }
%basic_button {
@extend %basic;
}
%solo {
@extend %basic;
}
%short { %short {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

View file

@ -1,65 +0,0 @@
header,
aside,
footer {
&.io {
nav li {
margin: 0;
}
nav > div:not(.spacer),
nav > span,
.a_button {
@extend %basic;
@extend %size_io_button;
}
.a_button {
color: $color_text_io;
background-color: $color_back_io;
&:active,
&:focus,
&:hover {
background-color: transparentize($color_highlight_basic, 0.8);
}
}
}
}
header,
aside {
&.io {
padding: $space_basic;
input,
button,
textarea,
select {
margin-inline: $space_half;
}
input {
@extend .input_io;
}
textarea {
@extend .io_textarea;
}
select {
@extend .io_select;
}
button {
@extend .button_io;
}
}
}
header,
footer {
&.io {
@extend %flex-inline;
align-items: stretch;
}
}