From 12da7f19fe820d2105f43d3ba0bfbf50dbcdff34 Mon Sep 17 00:00:00 2001 From: Alexanderius Date: Mon, 16 Dec 2024 14:25:02 +0500 Subject: [PATCH] [add] initial bootstrap 5 --- .../SampleApp.Classic/Styles/Main.min.css | 3 +- .../SampleApp.Classic/Styles/Main.scss | 13 +++++- .../SampleApp.Classic/Styles/MessageBox.scss | 6 +-- .../SampleApp.Classic/Styles/Navbar.scss | 17 ++++++-- .../SampleApp.Classic/Templates/Master.tpl | 1 - .../SampleApp.Classic/Templates/Navbar.tpl | 21 ++++----- .../SampleApp.Classic/package-lock.json | 43 ++++++++++++++----- src/SampleApps/SampleApp.Classic/package.json | 4 +- 8 files changed, 71 insertions(+), 37 deletions(-) diff --git a/src/SampleApps/SampleApp.Classic/Styles/Main.min.css b/src/SampleApps/SampleApp.Classic/Styles/Main.min.css index 9e2008dc..9b71815b 100644 --- a/src/SampleApps/SampleApp.Classic/Styles/Main.min.css +++ b/src/SampleApps/SampleApp.Classic/Styles/Main.min.css @@ -1,2 +1 @@ -div.Title{padding:0.5em;background-color:#363636;font-size:2em}img.Logo{vertical-align:middle;width:2.5em;margin-right:0.8em}.navbar{background:#dc5f33;color:#fff;border:0;border-radius:0;-webkit-box-shadow:0 0;box-shadow:0 0}.navbar a,.navbar .navbar-text{color:#fff !important}.navbar a:hover,.navbar .navbar-toggle:hover,.navbar .navbar:focus{background-color:#c5562e !important}.navbar .navbar-toggle{background-color:#dc5f33 !important}.navbar .icon-bar{background-color:#fff !important}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{color:#dad8d8;background-color:#292929;border:1px solid #3a3a3a;border-radius:0}input[placeholder],input[placeholder][type="password"]{color:#dad8d8}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{background-color:#292929;color:#fff;border:1px solid #636363;-webkit-box-shadow:0 0;box-shadow:0 0}.btn{background:#dc5f33;color:#fff;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) #3a3a3a;-webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.2) inset,0px 1px 2px rgba(0,0,0,0.05);box-shadow:0px 1px 0px rgba(255,255,255,0.2) inset,0px 1px 2px rgba(0,0,0,0.05)}.btn:hover{background-color:#c5562e;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) #3a3a3a;-webkit-transition:background-position 0.2s linear 0s;transition:background-position 0.2s linear 0s;color:#fff}.btn:active,.btn:focus{background-color:#c5562e !important;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) #3a3a3a !important;color:#fff !important}input[type="checkbox"]{vertical-align:middle;position:relative;bottom:4px}label{font-weight:normal !important}.list-group-item{background-color:#292929;border:1px solid #3a3a3a}div.MessageBox{padding:4em;font-size:1.4em;text-align:center}div.inline-message-box,div.inline-error-message-box{padding:0.5em}div.inline-error-message-box{color:#FF4753}body{background:#171717 !important;color:#dad8d8 !important;font:1.6em "Segoe UI", tahoma, arial, helvetica, sans-serif !important;margin:1em !important;padding:0 !important}.ExecutionTimeFooter{border-top:1px solid #3a3a3a;text-align:center;margin-top:1em;padding-top:0.3em}div.Http404MessageBox{color:#0d85c9;padding:4em 2em 4em 2em}a{color:#dc5f33}a:hover{color:#c5562e} -/*# sourceMappingURL=Main.min.css.map */ \ No newline at end of file +div.Title{padding:.5em;background-color:#363636;font-size:2em}img.Logo{vertical-align:middle;width:2.5em;margin-right:.8em}.navbar{background:#dc5f33;color:#fff;border:0;border-radius:0;box-shadow:0 0;padding:0}.navbar a,.navbar .navbar-text,.navbar .navbar-brand{display:block;color:#fff !important;padding:15px 15px;text-decoration:none;margin:0}.navbar a:hover,.navbar .navbar-toggle:hover,.navbar .navbar:focus{background-color:#c5562e !important}.navbar .navbar-toggle{background-color:#dc5f33 !important}.navbar .icon-bar{background-color:#fff !important}textarea,input[type=text],input[type=password],input[type=datetime],input[type=datetime-local],input[type=date],input[type=month],input[type=time],input[type=week],input[type=number],input[type=email],input[type=url],input[type=search],input[type=tel],input[type=color],.uneditable-input{color:#dad8d8;background-color:#292929;border:1px solid #3a3a3a;border-radius:0}input[placeholder],input[placeholder][type=password]{color:#dad8d8}textarea:focus,input[type=text]:focus,input[type=password]:focus,input[type=datetime]:focus,input[type=datetime-local]:focus,input[type=date]:focus,input[type=month]:focus,input[type=time]:focus,input[type=week]:focus,input[type=number]:focus,input[type=email]:focus,input[type=url]:focus,input[type=search]:focus,input[type=tel]:focus,input[type=color]:focus,.uneditable-input:focus{background-color:#292929;color:#fff;border:1px solid #636363;box-shadow:0 0}.btn{background:#dc5f33;color:#fff;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) #3a3a3a;box-shadow:0px 1px 0px rgba(255,255,255,.2) inset,0px 1px 2px rgba(0,0,0,.05)}.btn:hover{background-color:#c5562e;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) #3a3a3a;transition:background-position .2s linear 0s;color:#fff}.btn:active,.btn:focus{background-color:#c5562e !important;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) #3a3a3a !important;color:#fff !important}input[type=checkbox]{vertical-align:middle;position:relative;bottom:4px}label{font-weight:normal !important}.list-group-item{background-color:#292929;border:1px solid #3a3a3a}div.MessageBox{padding:4em;font-size:1.4em;text-align:center}div.inline-message-box,div.inline-error-message-box{padding:.5em}div.inline-error-message-box{color:#ff4753}html{font-size:10px}body{background:#171717 !important;color:#dad8d8 !important;font:1.6em "Segoe UI",tahoma,arial,helvetica,sans-serif !important;margin:1em !important;padding:0 !important}.ExecutionTimeFooter{border-top:1px solid #3a3a3a;text-align:center;margin-top:1em;padding-top:.3em}div.Http404MessageBox{color:#0d85c9;padding:4em 2em}a{color:#dc5f33}a:hover{color:#c5562e}/*# sourceMappingURL=Main.min.css.map */ \ No newline at end of file diff --git a/src/SampleApps/SampleApp.Classic/Styles/Main.scss b/src/SampleApps/SampleApp.Classic/Styles/Main.scss index a3127cad..9010b451 100644 --- a/src/SampleApps/SampleApp.Classic/Styles/Main.scss +++ b/src/SampleApps/SampleApp.Classic/Styles/Main.scss @@ -4,10 +4,19 @@ @import "Panels"; @import "MessageBox"; +html { + font-size: 10px; +} + body { background: $back-color !important; color: $primary-text-color !important; - font: 1.6em "Segoe UI", tahoma, arial, helvetica, sans-serif !important; + font: + 1.6em "Segoe UI", + tahoma, + arial, + helvetica, + sans-serif !important; margin: 1em !important; padding: 0 !important; } @@ -30,4 +39,4 @@ a { a:hover { color: $primary-color-active; -} \ No newline at end of file +} diff --git a/src/SampleApps/SampleApp.Classic/Styles/MessageBox.scss b/src/SampleApps/SampleApp.Classic/Styles/MessageBox.scss index dea3feb2..5694ad2a 100644 --- a/src/SampleApps/SampleApp.Classic/Styles/MessageBox.scss +++ b/src/SampleApps/SampleApp.Classic/Styles/MessageBox.scss @@ -11,6 +11,6 @@ div.inline-message-box { } div.inline-error-message-box { - @extend div.inline-message-box; - color: #FF4753; -} \ No newline at end of file + @extend .inline-message-box; + color: #ff4753; +} diff --git a/src/SampleApps/SampleApp.Classic/Styles/Navbar.scss b/src/SampleApps/SampleApp.Classic/Styles/Navbar.scss index 26b5bd8b..6d451a80 100644 --- a/src/SampleApps/SampleApp.Classic/Styles/Navbar.scss +++ b/src/SampleApps/SampleApp.Classic/Styles/Navbar.scss @@ -1,4 +1,4 @@ -@import 'Variables'; +@import "Variables"; .navbar { background: $primary-color; @@ -6,12 +6,21 @@ border: 0; border-radius: 0; box-shadow: $no-box-shadow; + padding: 0; - a, .navbar-text { + a, + .navbar-text, + .navbar-brand { + display: block; color: $primary-color-opposite !important; + padding: 15px 15px; + text-decoration: none; + margin: 0; } - a:hover, .navbar-toggle:hover, .navbar:focus { + a:hover, + .navbar-toggle:hover, + .navbar:focus { background-color: $primary-color-active !important; } @@ -22,4 +31,4 @@ .icon-bar { background-color: $primary-color-opposite !important; } -} \ No newline at end of file +} diff --git a/src/SampleApps/SampleApp.Classic/Templates/Master.tpl b/src/SampleApps/SampleApp.Classic/Templates/Master.tpl index a65f6cf7..125f47c4 100644 --- a/src/SampleApps/SampleApp.Classic/Templates/Master.tpl +++ b/src/SampleApps/SampleApp.Classic/Templates/Master.tpl @@ -13,7 +13,6 @@ -
diff --git a/src/SampleApps/SampleApp.Classic/Templates/Navbar.tpl b/src/SampleApps/SampleApp.Classic/Templates/Navbar.tpl index 5db7dfbf..ccbf2659 100644 --- a/src/SampleApps/SampleApp.Classic/Templates/Navbar.tpl +++ b/src/SampleApps/SampleApp.Classic/Templates/Navbar.tpl @@ -1,16 +1,13 @@ -