Skip to content

Commit

Permalink
CSS improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
fsbraun committed May 27, 2023
1 parent 270e84d commit f3624d3
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 81 deletions.
2 changes: 1 addition & 1 deletion djangocms_frontend/static/djangocms_frontend/css/base.css

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion private/sass/base.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
@charset "utf-8";

@import "components/variables";
// Bootstrap5 (parts)
@import "import_bootstrap";
// our components
@import "components/variables";
@import "components/icons";
@import "components/button-group";
@import "components/grid-layout";
Expand Down
2 changes: 1 addition & 1 deletion private/sass/components/_button-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
.frontend-button-group-icons,
.frontend-grid-icons {
.icon {
font-size: 21px;
font-size: 24px;
}

// custom icon sizes
Expand Down
83 changes: 5 additions & 78 deletions private/sass/components/_grid-layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,75 +19,6 @@
}
}

.djangocms-frontend-row {
.form-row.field-row_cols_xs {
position: relative;
display: flex;
padding: 0;
min-width: 800px;

.field-box,
.fieldBox {
position: relative;
width: 86px !important;
>:first-child {
with: 100px !important;
}
flex: none;
padding: 15px 10px;
margin: 0 !important;
border-bottom: 1px solid #eee;
float: left !important;

input {
text-align: right;
padding-right: 5px !important;
box-sizing: border-box;
width: 100%;
}

label {
font-size: 12px !important;
font-weight: normal !important;
color: #ccc !important;
position: absolute;
left: 15px;
bottom: 17px;
text-transform: lowercase;
}

.disabled {
color: #ccc;
background: #eee;
}

&:last-child {
border-right: none;
}
}

.errors {
margin-bottom: 0;
}

.field-box-label {
display: flex;
margin-top: auto;
color: #999;

a {
width: 100%;
margin-top: auto;
}

.icon {
position: relative;
top: 3px;
}
}
}
}

.djangocms-frontend-row,
.djangocms-frontend-column {
.form-row.field-xs_col,
Expand All @@ -100,20 +31,21 @@
padding: 0;
min-width: 800px;

.field-box:first-child {
width: 100px !important;
}
.field-box,
.fieldBox {
position: relative;
box-sizing: content-box;
width: 86px !important;
>:first-child {
width: 100px !important;
}
flex: none;
padding: 15px 10px;
margin: 0 !important;
border-bottom: 1px solid #eee;
float: left !important;

input {
input:not([type="checkbox"]) {
text-align: right;
padding-right: 5px !important;
box-sizing: border-box;
Expand Down Expand Up @@ -161,11 +93,6 @@
width: 100%;
margin-top: auto;
}

.icon {
position: relative;
top: 3px;
}
}

//&.field-xs_col .field-box-label a,
Expand Down
3 changes: 3 additions & 0 deletions private/sass/components/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ $django-dark-select: #00363a;
$django-dark-color: #eee;
$django-fg: #333;
$white: #fff;

$font-size-base: 0.8125rem;
$nav-link-padding-y: 0.3rem;

0 comments on commit f3624d3

Please sign in to comment.