Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2312 cleanup styles of site builder and separate sass generated files #2346

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

#2312 cleanup styles of site builder and separate sass generated files #2346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7991178
#2312 cleanup styles of sitebuilder and separate sass generated files
TheHadiAhmadi Dec 18, 2024
1d17267
#2312 cleanup
TheHadiAhmadi Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/FluentCMS/Templates/Blank/Layouts/AdminLayout.head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap"
rel="stylesheet">
<link rel="stylesheet" href="/_content/FluentCMS.Web.UI.Components/css/flowbite.min.css" />
<link rel="stylesheet" href="/_content/FluentCMS.Web.UI.Components/css/admin.min.css" />
<link rel="stylesheet" href="/files/css/app.css" />
<link rel="apple-touch-icon" sizes="180x180" href="/files/images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/files/images/favicon-32x32.png">
Expand Down
2 changes: 1 addition & 1 deletion src/FluentCMS/Templates/Default/Layouts/AdminLayout.head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap"
rel="stylesheet">
<link rel="stylesheet" href="/_content/FluentCMS.Web.UI.Components/css/flowbite.min.css" />
<link rel="stylesheet" href="/_content/FluentCMS.Web.UI.Components/css/admin.min.css" />
<link rel="stylesheet" href="/files/css/app.css" />
<link rel="apple-touch-icon" sizes="180x180" href="/files/images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/files/images/favicon-32x32.png">
Expand Down
2 changes: 1 addition & 1 deletion src/FluentCMS/Templates/Portfolio/Layouts/AdminLayout.head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap"
rel="stylesheet">
<link rel="stylesheet" href="/_content/FluentCMS.Web.UI.Components/css/flowbite.min.css" />
<link rel="stylesheet" href="/_content/FluentCMS.Web.UI.Components/css/admin.min.css" />
<link rel="stylesheet" href="/files/css/app.css" />
<link rel="apple-touch-icon" sizes="180x180" href="/files/images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/files/images/favicon-32x32.png">
Expand Down
37 changes: 1 addition & 36 deletions ...eb.UI.Components/Styles/Flowbite/App.scss → ....UI.Components/Styles/Flowbite/Admin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,4 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

$prefix: "f-";
$colors: (
"primary": "blue",
"success": "green",
"info": "cyan",
"danger": "red",
"warning": "yellow",
"secondary": "gray",
);

html {
font-family: Inter, ui-sans-serif, system-ui, -apple-system, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
}

// BODY

body {
@apply bg-gray-50;
}

.dark body {
@apply bg-gray-800;
color-scheme: dark;
}

.hidden {
display: none;
}
@import './Base';

// COMPONENTS
@import "./Components/Accordion";
Expand Down Expand Up @@ -77,7 +46,3 @@ body {
@import './Components/Toast';
@import './Components/Tooltip';
@import './Components/Typography';


@import './Plugins/Block';
@import './Plugins/IFrame';
32 changes: 32 additions & 0 deletions src/Frontend/FluentCMS.Web.UI.Components/Styles/Flowbite/Base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

$prefix: "f-";
$colors: (
"primary": "blue",
"success": "green",
"info": "cyan",
"danger": "red",
"warning": "yellow",
"secondary": "gray",
);

html {
font-family: Inter, ui-sans-serif, system-ui, -apple-system, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
}

// BODY

body {
@apply bg-gray-50;
}

.dark body {
@apply bg-gray-800;
color-scheme: dark;
}

.hidden {
display: none;
}
5 changes: 5 additions & 0 deletions src/Frontend/FluentCMS.Web.UI.Components/Styles/Flowbite/Plugins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import './Base';

@import './Plugins/Block';
@import './Plugins/IFrame';
@import './Plugins/RichText';
0 ...end/FluentCMS.Web.UI/wwwroot/css/html.css → ...nts/Styles/Flowbite/Plugins/RichText.scss
View file
Open in desktop
File renamed without changes.
86 changes: 42 additions & 44 deletions ...Web.UI/wwwroot/css/sitebuilder.editor.css → ...mponents/Styles/Flowbite/SiteBuilder.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
@import './toolbar.css';
@import './Base.scss';

@import './SiteBuilder/Toolbar';

* {
box-sizing: border-box;
}

.f-toolbar-container {
.#{$prefix}-toolbar-container {
margin-right: var(--scrollbar-width);
}

.f-page-editor-toggler {
.#{$prefix}page-editor-toggler {
position: fixed;
transition: all 0.3s ease;
top: 0;
Expand All @@ -22,7 +24,7 @@
z-index: 100;
}

.f-page-editor-toggler .f-page-editor-toggler-button {
.#{$prefix}page-editor-toggler .#{$prefix}page-editor-toggler-button {
cursor: pointer;
width: 2rem;
height: 2rem;
Expand All @@ -41,13 +43,13 @@ body {
margin: 0;
}

.f-page-editor {
.#{$prefix}page-editor {
width: 100%;
overflow: hidden;
height: 100vh;
}

.f-page-editor-iframe-wrapper {
.#{$prefix}page-editor-iframe-wrapper {
background-color: #EBEBEB;
position: relative;
height: calc(100% - 40px);
Expand All @@ -59,7 +61,7 @@ body {
justify-content: center;
}

.f-page-editor-iframe {
.#{$prefix}page-editor-iframe {
position: absolute;
/* transition: all 0.1s ease; */
top: 0;
Expand All @@ -71,7 +73,7 @@ body {
border: none;
}

.f-page-editor-iframe-resizer {
.#{$prefix}page-editor-iframe-resizer {
border-radius: 2px;
box-shadow: 0 0 8px -4px rgb(129, 129, 129);
display: none;
Expand All @@ -84,7 +86,7 @@ body {
bottom: 50%;
cursor: grab;
}
.f-page-editor-iframe-resizer:hover {
.#{$prefix}page-editor-iframe-resizer:hover {
background-color: #d4d4d4;
height: 64px;
width: 12px;
Expand All @@ -95,7 +97,7 @@ body {
cursor: grab;
}

.f-page-editor-iframe-resizer::before, .f-page-editor-iframe-resizer::after {
.#{$prefix}page-editor-iframe-resizer::before, .#{$prefix}page-editor-iframe-resizer::after {
content: '';
background-color: #aaaaaa;
position: absolute;
Expand All @@ -105,19 +107,19 @@ body {
bottom: 8px;
}

.f-page-editor-iframe-resizer:hover::after, .f-page-editor-iframe-resizer:hover::before {
.#{$prefix}page-editor-iframe-resizer:hover::after, .#{$prefix}page-editor-iframe-resizer:hover::before {
background-color: #c0c0c0;
}

.f-page-editor-iframe-resizer::before {
.#{$prefix}page-editor-iframe-resizer::before {
left: 3px;
}

.f-page-editor-iframe-resizer::after {
.#{$prefix}page-editor-iframe-resizer::after {
right: 3px;
}

[data-responsive-mode] .f-page-editor-iframe {
[data-responsive-mode] .#{$prefix}page-editor-iframe {
left: auto;
right: auto;
top: 1rem;
Expand All @@ -131,11 +133,7 @@ body {
display: flex;
}

.f-page-editor-sidebar-open .f-page-editor-iframe-wrapper {
/* width: calc(100% - 240px); */
}

.f-page-editor-header {
.#{$prefix}page-editor-header {
width: 100%;
height: 40px;
background-color: rgb(24, 24, 24);
Expand All @@ -146,22 +144,22 @@ body {
box-sizing: border-box;
}

.f-page-editor-header-separator {
.#{$prefix}page-editor-header-separator {
transition: all 0.3s ease;
width: 0;
}

.f-page-editor-sidebar-close .f-page-editor-header-separator {
.#{$prefix}page-editor-sidebar-close .#{$prefix}page-editor-header-separator {
/* width: 240px; */
}

.f-page-editor-header-button-list {
.#{$prefix}page-editor-header-button-list {
display: flex;
gap: 4px;
/* justify-content: space-between; */
}

.f-page-editor-header-button {
.#{$prefix}page-editor-header-button {
padding: 4px 8px;
display: flex;
align-items: center;
Expand All @@ -171,102 +169,102 @@ body {
color: white;
border: 1px solid #505050;
}
.f-page-editor-header-button svg {
.#{$prefix}page-editor-header-button svg {
width: 16px;
height: 16px;
}

.f-page-editor-header-button-primary {
.#{$prefix}page-editor-header-button-primary {
background-color: #2558a5;
border: 1px solid #3b48bd;
}

.f-page-editor-header-button-primary:hover {
.#{$prefix}page-editor-header-button-primary:hover {
background-color: #2c6bc9;

}


.f-page-editor-sidebar-open .f-page-editor-toggler {
.#{$prefix}page-editor-sidebar-open .#{$prefix}page-editor-toggler {
right: 240px;
margin-right: -1px;
}

.f-page-editor-toggler .f-page-editor-toggler-button:hover {
.#{$prefix}page-editor-toggler .#{$prefix}page-editor-toggler-button:hover {
background-color: #dbdbdb;
}

.f-page-editor-toggler .f-page-editor-toggler-button-primary {
.#{$prefix}page-editor-toggler .#{$prefix}page-editor-toggler-button-primary {
color: white;
background-color: #2558a5;
border: none;
}

.f-page-editor-toggler .f-page-editor-toggler-button-primary:hover {
.#{$prefix}page-editor-toggler .#{$prefix}page-editor-toggler-button-primary:hover {
background-color: #2c6bc9;
}

.f-plugin-container {
.#{$prefix}plugin-container {
position: relative;
}

.f-page-editor-forms {
.#{$prefix}page-editor-forms {
display: none;
}

.f-only-sidebar-opened {
.#{$prefix}only-sidebar-opened {
display: none;
}

.f-page-editor-sidebar-open .f-only-sidebar-opened {
.#{$prefix}page-editor-sidebar-open .#{$prefix}only-sidebar-opened {
display: inherit;
}

.f-page-editor-sidebar-open .f-only-sidebar-closed {
.#{$prefix}page-editor-sidebar-open .#{$prefix}only-sidebar-closed {
display: none;
}

.f-page-editor-sidebar-close .f-only-sidebar-opened {
.#{$prefix}page-editor-sidebar-close .#{$prefix}only-sidebar-opened {
display: none;
}

.f-page-editor-sidebar-close .f-only-sidebar-closed {
.#{$prefix}page-editor-sidebar-close .#{$prefix}only-sidebar-closed {
display: inherit;
}

/* Dark mode */

.dark .f-page-editor-sidebar {
.dark .#{$prefix}page-editor-sidebar {
background-color: #242424;
border-color: #303030;
color-scheme: dark;
}


.dark .f-plugin-definition-item {
.dark .#{$prefix}plugin-definition-item {
background-color: #383838;
border-color: #404040;
color: white;
}
.dark .f-plugin-definition-item:hover {
.dark .#{$prefix}plugin-definition-item:hover {
background-color: #444444;
border-color: #707070;
}

.dark .f-page-editor-toggler-button {
.dark .#{$prefix}page-editor-toggler-button {
background-color: #505050;
border-color: #404040;
color: white;
fill: white;
}
.dark .f-page-editor-toggler-button:hover {
.dark .#{$prefix}page-editor-toggler-button:hover {
background-color: #606060;
border-color: #404040;
}
.dark .f-page-editor-toggler-button-primary {
.dark .#{$prefix}page-editor-toggler-button-primary {
background-color: #2e3bb3;
}
.dark .f-page-editor-toggler-button-primary:hover {
.dark .#{$prefix}page-editor-toggler-button-primary:hover {

background-color: #3b48bd;
}
Expand Down
Loading