From 8e2f77516491f5d783bdddfae4ae3bc108ae44d5 Mon Sep 17 00:00:00 2001
From: Aliullov Vlad <91639107+GoodDayForSurf@users.noreply.github.com>
Date: Fri, 25 Oct 2024 15:15:39 +0400
Subject: [PATCH] Remove all Bootstrap version except 5 in import page and
popup (#236)
Remove bootstrap < 5
---
.../import-bootstrap.component.css | 15 -----------
.../import-bootstrap.component.html | 26 +++++++------------
.../import-bootstrap.component.ts | 18 ++++---------
.../import-popup/import-popup.component.html | 14 +++-------
.../import-popup/import-popup.component.ts | 12 ---------
5 files changed, 17 insertions(+), 68 deletions(-)
diff --git a/src/app/import/import-bootstrap/import-bootstrap.component.css b/src/app/import/import-bootstrap/import-bootstrap.component.css
index 0f956c08..bef4d386 100644
--- a/src/app/import/import-bootstrap/import-bootstrap.component.css
+++ b/src/app/import/import-bootstrap/import-bootstrap.component.css
@@ -1,9 +1,3 @@
-.tabs {
- margin: 40px auto 0;
- border-color: #d4d8da;
- border-bottom-color: transparent;
-}
-
.file-uploader {
margin: 20px auto 0;
}
@@ -16,15 +10,6 @@
width: 270px;
}
-.tabpanel-item {
- padding-top: 20px;
-}
-
-:host ::ng-deep .tabs.dx-tabpanel .dx-tab {
- width: 280px;
- height: 56px;
-}
-
diff --git a/src/app/import/import-bootstrap/import-bootstrap.component.html b/src/app/import/import-bootstrap/import-bootstrap.component.html
index 327dfa4f..dbdc43d0 100644
--- a/src/app/import/import-bootstrap/import-bootstrap.component.html
+++ b/src/app/import/import-bootstrap/import-bootstrap.component.html
@@ -8,23 +8,15 @@
Bootstrap Variables
- Upload a Bootstrap theme file to apply its colors to a base DevExtreme theme.
- Choose the "variables.less" file for Bootstrap 3 and the "_variables.scss" file for Bootstrap 4/5.
+ Upload a Bootstrap 5 theme file to apply its colors to a base DevExtreme theme.
+
+ Choose the "_variables.scss" file.
-
-
- {{data.name}}
-
-
-
+
diff --git a/src/app/import/import-bootstrap/import-bootstrap.component.ts b/src/app/import/import-bootstrap/import-bootstrap.component.ts
index 3398202f..bff99e71 100644
--- a/src/app/import/import-bootstrap/import-bootstrap.component.ts
+++ b/src/app/import/import-bootstrap/import-bootstrap.component.ts
@@ -4,22 +4,14 @@ import { Component } from '@angular/core';
templateUrl: './import-bootstrap.component.html',
styleUrls: ['./import-bootstrap.component.css']
})
-
export class ImportBootstrapComponent {
- tabPanelData = [{
- name: 'Bootstrap 5',
+ bootstrapVariantsData = [{
+ text: 'Bootstrap 5',
+ value: 0,
version: 5,
acceptFormat: '.scss',
uploadButtonText: 'Upload SCSS Variables'
- }, {
- name: 'Bootstrap 4',
- version: 4,
- acceptFormat: '.scss',
- uploadButtonText: 'Upload SCSS Variables'
- }, {
- name: 'Bootstrap 3',
- version: 3,
- acceptFormat: '.less',
- uploadButtonText: 'Upload LESS Variables'
}];
+
+ selectedIndex = 0;
}
diff --git a/src/app/layouts/header/import-popup/import-popup.component.html b/src/app/layouts/header/import-popup/import-popup.component.html
index 8e4ff709..fa4ee14a 100644
--- a/src/app/layouts/header/import-popup/import-popup.component.html
+++ b/src/app/layouts/header/import-popup/import-popup.component.html
@@ -32,19 +32,11 @@
- Upload a Bootstrap theme file to apply its colors to a base DevExtreme theme.
- Choose the "variables.less" file for Bootstrap 3 and the "_variables.scss" file for Bootstrap 4.
+ Upload a Bootstrap 5 theme file to apply its colors to a base DevExtreme theme.
+
+ Choose the "_variables.scss" file.
-
-