FIX: elements

This commit is contained in:
Tony Air 2020-01-15 05:47:40 +07:00
parent 42fe37066f
commit 6cdc0fdca3
8 changed files with 107 additions and 73 deletions

45
dist/css/app.css vendored
View File

@ -15159,7 +15159,8 @@ textarea,
}
.col-block {
padding: 0.5rem;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
}
.btn:hover,
@ -15469,12 +15470,14 @@ input.time[readonly] {
.element {
position: relative;
padding: 4rem 0;
padding-top: 4rem;
padding-bottom: 4rem;
}
.element.dynamic__elements__image__elements__elementimage,
.element.site__elements__sliderelement {
padding: 0;
padding-top: 0;
padding-bottom: 0;
}
.element.dnadesign__elementallist__model__elementlist {
@ -15489,7 +15492,8 @@ input.time[readonly] {
}
.element.secondary {
padding: 2rem 0;
padding-top: 2rem;
padding-bottom: 2rem;
}
.element.page-header-element {
@ -15499,13 +15503,15 @@ input.time[readonly] {
}
.elements-sm,
.sidebar {
padding: 2rem 0;
.page-content-sidebar {
padding-top: 2rem;
padding-bottom: 2rem;
}
.elements-sm .element,
.sidebar .element {
padding: 2rem 0;
.page-content-sidebar .element {
padding-top: 2rem;
padding-bottom: 2rem;
}
.dynamic__elements__image__elements__elementimage .container-fluid,
@ -15522,12 +15528,8 @@ input.time[readonly] {
.site__elements__sliderelement .container-xl,
.site__elements__sliderelement .container-xxl,
.site__elements__sliderelement .container-xxxl {
padding: 0;
}
.page-content > .form-container {
position: relative;
padding: 4rem 0;
padding-left: 0;
padding-right: 0;
}
h1,
@ -16091,6 +16093,17 @@ h6,
background: none !important;
}
.typography ul,
.typography ol {
padding-left: 2rem;
}
.typography ul li,
.typography ol li {
position: relative;
padding-left: 0;
}
.typography ul {
list-style: none;
}
@ -16103,6 +16116,10 @@ h6,
content: '\2022';
display: inline-block;
margin-right: 0.5em;
position: absolute;
left: -0.75em;
font-size: 1.5em;
top: -0.25em;
}
.typography iframe {

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"name": "@a2nt/ss-bootstrap-ui-webpack-boilerplate",
"version": "1.5.6",
"version": "1.5.7",
"author": "Tony Air <tony@twma.pro>",
"license": "MIT",
"description": "This UI Kit allows you to build Bootstrap 4 webapp with some extra UI features. It's easy to extend and easy to convert HTML templates to CMS templates.",
@ -35,6 +35,8 @@
"bootstrap-offcanvas": "^1.0.0",
"bootstrap-table": "^1.15.3",
"bootstrap-timepicker": "^0.5.2",
"browserslist": "^4.8.3",
"caniuse-lite": "^1.0.30001019",
"core-util-is": "^1.0.2",
"croppie": "^2.6.4",
"exif-js": "^2.3.0",
@ -73,7 +75,7 @@
"copy-webpack-plugin": "^4.6.0",
"copyfiles": "^1.2.0",
"cross-env": "^5.1.6",
"css-loader": "^3.4.0",
"css-loader": "^3.4.1",
"eslint": "^4.18.1",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-jquery": "^1.5.1",

View File

@ -1,35 +1,35 @@
// Bootstrap
@import "~bootstrap/scss/root";
@import "~bootstrap/scss/reboot";
@import "~bootstrap/scss/type";
@import "~bootstrap/scss/images";
@import "~bootstrap/scss/code";
@import "~bootstrap/scss/grid";
@import "~bootstrap/scss/tables";
@import "~bootstrap/scss/forms";
@import "~bootstrap/scss/buttons";
@import "~bootstrap/scss/transitions";
@import "~bootstrap/scss/dropdown";
@import "~bootstrap/scss/button-group";
@import "~bootstrap/scss/input-group";
@import "~bootstrap/scss/custom-forms";
@import "~bootstrap/scss/nav";
@import "~bootstrap/scss/navbar";
@import "~bootstrap/scss/card";
@import "~bootstrap/scss/breadcrumb";
@import "~bootstrap/scss/pagination";
@import "~bootstrap/scss/badge";
@import "~bootstrap/scss/jumbotron";
@import "~bootstrap/scss/alert";
@import "~bootstrap/scss/progress";
@import "~bootstrap/scss/media";
@import "~bootstrap/scss/list-group";
@import "~bootstrap/scss/close";
@import "~bootstrap/scss/modal";
@import "~bootstrap/scss/tooltip";
@import "~bootstrap/scss/popover";
@import "~bootstrap/scss/carousel";
@import "~bootstrap/scss/utilities";
@import "~bootstrap/scss/print";
@import '~bootstrap/scss/root';
@import '~bootstrap/scss/reboot';
@import '~bootstrap/scss/type';
@import '~bootstrap/scss/images';
@import '~bootstrap/scss/code';
@import '~bootstrap/scss/grid';
@import '~bootstrap/scss/tables';
@import '~bootstrap/scss/forms';
@import '~bootstrap/scss/buttons';
@import '~bootstrap/scss/transitions';
@import '~bootstrap/scss/dropdown';
@import '~bootstrap/scss/button-group';
@import '~bootstrap/scss/input-group';
@import '~bootstrap/scss/custom-forms';
@import '~bootstrap/scss/nav';
@import '~bootstrap/scss/navbar';
@import '~bootstrap/scss/card';
@import '~bootstrap/scss/breadcrumb';
@import '~bootstrap/scss/pagination';
@import '~bootstrap/scss/badge';
@import '~bootstrap/scss/jumbotron';
@import '~bootstrap/scss/alert';
@import '~bootstrap/scss/progress';
@import '~bootstrap/scss/media';
@import '~bootstrap/scss/list-group';
@import '~bootstrap/scss/close';
@import '~bootstrap/scss/modal';
@import '~bootstrap/scss/tooltip';
@import '~bootstrap/scss/popover';
@import '~bootstrap/scss/carousel';
@import '~bootstrap/scss/utilities';
@import '~bootstrap/scss/print';
@import "_ui.carousel";
@import '_ui.carousel';

View File

@ -5,12 +5,14 @@
// add top/bottom paddings for basic elements
.element {
position: relative;
padding: $grid-gutter-element-height 0;
padding-top: $grid-gutter-element-height;
padding-bottom: $grid-gutter-element-height;
// remove paddings of the slideshow
&.dynamic__elements__image__elements__elementimage,
&.site__elements__sliderelement {
padding: 0;
padding-top: 0;
padding-bottom: 0;
}
// remove paddings for elemental list cuz inner elements will have paddings
@ -27,7 +29,8 @@
// Sidebar-like elements
&.secondary {
padding: ($grid-gutter-element-height / 2) 0;
padding-top: ($grid-gutter-element-height / 2);
padding-bottom: ($grid-gutter-element-height / 2);
}
// hide default page title cuz elemental object will be used to display titles
@ -39,12 +42,14 @@
}
.elements-sm,
.sidebar {
padding: ($grid-gutter-element-height / 2) 0;
.page-content-sidebar {
padding-top: ($grid-gutter-element-height / 2);
padding-bottom: ($grid-gutter-element-height / 2);
// Sidebar elements
.element {
padding: ($grid-gutter-element-height / 2) 0;
padding-top: ($grid-gutter-element-height / 2);
padding-bottom: ($grid-gutter-element-height / 2);
}
}
@ -52,12 +57,7 @@
.dynamic__elements__image__elements__elementimage,
.site__elements__sliderelement {
.container-fluid {
padding: 0;
padding-left: 0;
padding-right: 0;
}
}
// add top/bottom paddings for basic Include/Content.ss forms
.page-content > .form-container {
position: relative;
padding: $grid-gutter-element-height 0;
}

View File

@ -173,7 +173,8 @@ textarea,
// element col paddings
.col-block {
padding: $grid-gutter-height / 4;
padding-top: $grid-gutter-height / 4;
padding-bottom: $grid-gutter-height / 4;
}
// rewrite btn opacity on hover

View File

@ -4,19 +4,19 @@
//@import "~bootstrap-timepicker/css/bootstrap-timepicker.css";
// Your custom variables
@import "_variables";
@import '_variables';
@import "_components/_ui.bootstrap";
@import '_components/_ui.bootstrap';
// By default we prefer font awesome CDN
//@import "_components/_ui.fontawesome";
@import "_components/_ui.lightbox";
@import "_components/_ui.flyout";
@import '_components/_ui.lightbox';
@import '_components/_ui.flyout';
@import "_components/_ui.main";
@import "_components/_ui.form.basics";
@import "_components/_ui.elemental";
@import '_components/_ui.main';
@import '_components/_ui.form.basics';
@import '_components/_ui.elemental';
// Your custom styling
@import "_typography";
@import "_layout";
@import '_typography';
@import '_layout';

View File

@ -85,6 +85,15 @@ table {
}
}
ul,
ol {
padding-left: $grid-gutter-width;
li {
position: relative;
padding-left: 0;
}
}
ul {
list-style: none;
@ -95,6 +104,11 @@ ul {
content: '\2022';
display: inline-block;
margin-right: 0.5em;
position: absolute;
left: -0.75em;
font-size: 1.5em;
top: -0.25em;
}
}
}