fix bootstrap css

5 files changed, 205 insertions, 224 deletions

diff --git a/assets/sass/main.scss b/assets/sass/main.scss
index 31829b8..d2e215f 100644
--- a/assets/sass/main.scss
+++ b/assets/sass/main.scss
@@ -38,8 +38,7 @@ $c_saturate7 : saturate($color_second, 90%);
 
   
 body{
-	font-family:"Montserrat",sans-serif;
-
+	font-family: "Montserrat",sans-serif;
 
     font-weight: 400;
     line-height: 1.5;
@@ -49,6 +48,10 @@ body{
         color: $c_dark4;
         text-decoration: none;
         background-color: transparent;
+        &:hover{
+            color: initial;
+            text-decoration: none;
+        };
     }
     
 
diff --git a/assets/sass/shortcodes/notice.scss b/assets/sass/shortcodes/notice.scss
index eb2dff9..b7baf21 100644
--- a/assets/sass/shortcodes/notice.scss
+++ b/assets/sass/shortcodes/notice.scss
@@ -9,135 +9,138 @@ $color_dark : #343a40 ;
 $color_white : #fff ;

 $color_transparent : transparent ;

 

+

 div.notices {

 	margin-top: 1rem;

     margin-bottom: 1rem;

-}

-

-div.notices > * {

-	background: white;

-	margin-top: 0px!important;

-    margin-bottom: 0px!important;

-    box-sizing: border-box;

-    box-shadow: inset 4px 0 0 black;

-    background-color: lighten(black,90%);

-	font-size: smaller;

-}

-div.notices > *:not(ul) {

-	/*box-shadow: inset 4px 0 0 black;*/

-	/*border-radius: .2rem;*/

-    padding: .5rem 1rem .5rem 1rem;

-}

-div.notices > ul {

-		

-}

-

 

-div.notices label{

-	font-size: 0.5em;

-	position: absolute;

-	margin-left: 0em;

-	margin-top: -1.8em;

-	font-weight: bold;

-	font-variant: small-caps;

-	letter-spacing: 0.6em;

-}

+	> :not(label) {

+		background: white;

+		margin-top: 0px!important;

+	    margin-bottom: 0px!important;

+	    box-sizing: border-box;

+	    box-shadow: inset 4px 0 0 black;

+	    background-color: lighten(black,90%);

+		font-size: smaller;

+		&:not(ul) {

+			/*box-shadow: inset 4px 0 0 black;*/

+			/*border-radius: .2rem;*/

+		    padding: .5rem 1rem .5rem 1rem;

+		}

+	}

 

-div.notices.note {

-	p {

-		box-shadow: inset 4px 0 0 $color_primary;

-		background: transparentize($color_primary, 0.95);

-		color: darken($color_primary,20%) !important; 

+	ul {}

+	label{

+		font-size: 0.5em;

+		position: absolute;

+		margin-left: 0em;

+		margin-top: -1.8em;

+		font-weight: bold;

+		font-variant: small-caps;

+		letter-spacing: 0.6em;

 	}

-	label{color: $color_primary;}

-}

 

-div.notices.primary {

-	p {

-		box-shadow: inset 4px 0 0 $color_primary;

-		background: transparentize($color_primary, 0.95);

-		color: darken($color_primary,20%) !important; 

+	&.note{

+		p {

+			box-shadow: inset 4px 0 0 $color_primary;

+			background: transparentize($color_primary, 0.95);

+			color: darken($color_primary,20%) !important; 

+		}

+		label{color: $color_primary;}	

+	}

+	&.primary {

+		p {

+			box-shadow: inset 4px 0 0 $color_primary;

+			background: transparentize($color_primary, 0.95);

+			color: darken($color_primary,20%) !important; 

+		}

+		label{color: $color_primary;}

 	}

-	label{color: $color_primary;}

-}

 

-div.notices.secondary {

-	p {

-		box-shadow: inset 4px 0 0 $color_secondary;

-		background: transparentize($color_secondary, 0.95);

-		color: darken($color_secondary,20%) !important; 

+	&.secondary {

+		p {

+			box-shadow: inset 4px 0 0 $color_secondary;

+			background: transparentize($color_secondary, 0.95);

+			color: darken($color_secondary,20%) !important; 

+		}

+		label{color: $color_secondary;}

 	}

-	label{color: $color_secondary;}

-}

 

-div.notices.success, div.notices.tip {

-	p {

-		box-shadow: inset 4px 0 0 $color_success;

-		background: transparentize($color_success, 0.95);

-		color: darken($color_success,20%) !important; 

+	&.success, &.tip {

+		p {

+			box-shadow: inset 4px 0 0 $color_success;

+			background: transparentize($color_success, 0.95);

+			color: darken($color_success,20%) !important; 

+		}

+		label{color: $color_success;}

 	}

-	label{color: $color_success;}

-}

 

-div.notices.danger {

-	p {

-		box-shadow: inset 4px 0 0 $color_danger;

-		background: transparentize($color_danger, 0.95);

-		color: darken($color_danger,20%) !important; 

+	&.danger {

+		p {

+			box-shadow: inset 4px 0 0 $color_danger;

+			background: transparentize($color_danger, 0.95);

+			color: darken($color_danger,20%) !important; 

+		}

+		label{color: $color_danger;}

 	}

-	label{color: $color_danger;}

-}

 

-div.notices.warning {

-	>* {

-		box-shadow: inset 4px 0 0 $color_warning;

-		background: transparentize($color_warning, 0.95);

-		color: darken($color_warning,20%) !important; 

+	&.warning {

+		>* {

+			box-shadow: inset 4px 0 0 $color_warning;

+			background: transparentize($color_warning, 0.95);

+			color: darken($color_warning,20%) !important; 

+		}

+		label{color: $color_warning;}

 	}

-	label{color: $color_warning;}

-}

 

-div.notices.info {

-	p {

-		box-shadow: inset 4px 0 0 $color_info;

-		background: transparentize($color_info, 0.95);

-		color: darken($color_info,20%) !important; 

+	&.info {

+		p {

+			box-shadow: inset 4px 0 0 $color_info;

+			background: transparentize($color_info, 0.95);

+			color: darken($color_info,20%) !important; 

+		}

+		label{color: $color_info;}

 	}

-	label{color: $color_info;}

-}

 

-div.notices.light {

-	p {

-		box-shadow: inset 4px 0 0 $color_light;

-		background: transparentize($color_light, 0.95);

-		color: darken($color_light,20%) !important; 

+	&.light {

+		p {

+			box-shadow: inset 4px 0 0 $color_light;

+			background: transparentize($color_light, 0.95);

+			color: darken($color_light,20%) !important; 

+		}

+		label{color: $color_light;}

 	}

-	label{color: $color_light;}

-}

-div.notices.dark {

-	p {

-		box-shadow: inset 4px 0 0 $color_dark;

-		background: transparentize($color_dark, 0.95);

-		color: darken($color_dark,20%) !important; 

+	&.dark {

+		p {

+			box-shadow: inset 4px 0 0 $color_dark;

+			background: transparentize($color_dark, 0.95);

+			color: darken($color_dark,20%) !important; 

+		}

+		label{color: $color_dark;}

 	}

-	label{color: $color_dark;}

-}

-div.notices.white {

-	p {

-		box-shadow: inset 4px 0 0 $color_white;

-		background: transparentize($color_white, 0.95);

-		color: whiteen($color_white,20%) !important; 

+	&.white {

+		p {

+			box-shadow: inset 4px 0 0 $color_white;

+			background: transparentize($color_white, 0.95);

+			color: whiteen($color_white,20%) !important; 

+		}

+		label{color: $color_white;}

 	}

-	label{color: $color_white;}

-}

-div.notices.transparent {

-	p {

-		box-shadow: inset 4px 0 0 $color_transparent;

-		background: transparentize($color_transparent, 0.95);

-		color: transparenten($color_transparent,20%) !important; 

+	&.transparent {

+		p {

+			box-shadow: inset 4px 0 0 $color_transparent;

+			background: transparentize($color_transparent, 0.95);

+			color: transparenten($color_transparent,20%) !important; 

+		}

+		label{color: $color_transparent;}

 	}

-	label{color: $color_transparent;}

 }

 

 

+

+

+

+

+

+

 	
\ No newline at end of file
diff --git a/exampleSite/resources/_gen/assets/scss/sass/main.scss_97a9b8e6852415b29a37632934745b8b.content b/exampleSite/resources/_gen/assets/scss/sass/main.scss_97a9b8e6852415b29a37632934745b8b.content
index 8057b34..2c9e14c 100644
--- a/exampleSite/resources/_gen/assets/scss/sass/main.scss_97a9b8e6852415b29a37632934745b8b.content
+++ b/exampleSite/resources/_gen/assets/scss/sass/main.scss_97a9b8e6852415b29a37632934745b8b.content
@@ -8,6 +8,9 @@ body {
     color: black;
     text-decoration: none;
     background-color: transparent; }
+    body a:hover {
+      color: initial;
+      text-decoration: none; }
   body header {
     background-color: #333333;
     border-bottom: 2px solid gray;
diff --git a/exampleSite/resources/_gen/assets/scss/sass/shortcodes/notice.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/exampleSite/resources/_gen/assets/scss/sass/shortcodes/notice.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
index e8ecd85..85c8783 100644
--- a/exampleSite/resources/_gen/assets/scss/sass/shortcodes/notice.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
+++ b/exampleSite/resources/_gen/assets/scss/sass/shortcodes/notice.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
@@ -1,114 +1,89 @@
 div.notices {
   margin-top: 1rem;
   margin-bottom: 1rem; }
-
-div.notices > * {
-  background: white;
-  margin-top: 0px !important;
-  margin-bottom: 0px !important;
-  box-sizing: border-box;
-  box-shadow: inset 4px 0 0 black;
-  background-color: #e6e6e6;
-  font-size: smaller; }
-
-div.notices > *:not(ul) {
-  /*box-shadow: inset 4px 0 0 black;*/
-  /*border-radius: .2rem;*/
-  padding: .5rem 1rem .5rem 1rem; }
-
-div.notices label {
-  font-size: 0.5em;
-  position: absolute;
-  margin-left: 0em;
-  margin-top: -1.8em;
-  font-weight: bold;
-  font-variant: small-caps;
-  letter-spacing: 0.6em; }
-
-div.notices.note p {
-  box-shadow: inset 4px 0 0 #007bff;
-  background: rgba(0, 123, 255, 0.05);
-  color: #004a99 !important; }
-
-div.notices.note label {
-  color: #007bff; }
-
-div.notices.primary p {
-  box-shadow: inset 4px 0 0 #007bff;
-  background: rgba(0, 123, 255, 0.05);
-  color: #004a99 !important; }
-
-div.notices.primary label {
-  color: #007bff; }
-
-div.notices.secondary p {
-  box-shadow: inset 4px 0 0 #6c757d;
-  background: rgba(108, 117, 125, 0.05);
-  color: #3d4246 !important; }
-
-div.notices.secondary label {
-  color: #6c757d; }
-
-div.notices.success p, div.notices.tip p {
-  box-shadow: inset 4px 0 0 #28a745;
-  background: rgba(40, 167, 69, 0.05);
-  color: #145523 !important; }
-
-div.notices.success label, div.notices.tip label {
-  color: #28a745; }
-
-div.notices.danger p {
-  box-shadow: inset 4px 0 0 #dc3545;
-  background: rgba(220, 53, 69, 0.05);
-  color: #921925 !important; }
-
-div.notices.danger label {
-  color: #dc3545; }
-
-div.notices.warning > * {
-  box-shadow: inset 4px 0 0 #ffc107;
-  background: rgba(255, 193, 7, 0.05);
-  color: #a07800 !important; }
-
-div.notices.warning label {
-  color: #ffc107; }
-
-div.notices.info p {
-  box-shadow: inset 4px 0 0 #17a2b8;
-  background: rgba(23, 162, 184, 0.05);
-  color: #0c525d !important; }
-
-div.notices.info label {
-  color: #17a2b8; }
-
-div.notices.light p {
-  box-shadow: inset 4px 0 0 #f8f9fa;
-  background: rgba(248, 249, 250, 0.05);
-  color: #bdc6d0 !important; }
-
-div.notices.light label {
-  color: #f8f9fa; }
-
-div.notices.dark p {
-  box-shadow: inset 4px 0 0 #343a40;
-  background: rgba(52, 58, 64, 0.05);
-  color: #060708 !important; }
-
-div.notices.dark label {
-  color: #343a40; }
-
-div.notices.white p {
-  box-shadow: inset 4px 0 0 #fff;
-  background: rgba(255, 255, 255, 0.05);
-  color: whiteen(#fff, 20%) !important; }
-
-div.notices.white label {
-  color: #fff; }
-
-div.notices.transparent p {
-  box-shadow: inset 4px 0 0 transparent;
-  background: rgba(0, 0, 0, 0);
-  color: transparenten(transparent, 20%) !important; }
-
-div.notices.transparent label {
-  color: transparent; }
+  div.notices > :not(label) {
+    background: white;
+    margin-top: 0px !important;
+    margin-bottom: 0px !important;
+    box-sizing: border-box;
+    box-shadow: inset 4px 0 0 black;
+    background-color: #e6e6e6;
+    font-size: smaller; }
+    div.notices > :not(label):not(ul) {
+      /*box-shadow: inset 4px 0 0 black;*/
+      /*border-radius: .2rem;*/
+      padding: .5rem 1rem .5rem 1rem; }
+  div.notices label {
+    font-size: 0.5em;
+    position: absolute;
+    margin-left: 0em;
+    margin-top: -1.8em;
+    font-weight: bold;
+    font-variant: small-caps;
+    letter-spacing: 0.6em; }
+  div.notices.note p {
+    box-shadow: inset 4px 0 0 #007bff;
+    background: rgba(0, 123, 255, 0.05);
+    color: #004a99 !important; }
+  div.notices.note label {
+    color: #007bff; }
+  div.notices.primary p {
+    box-shadow: inset 4px 0 0 #007bff;
+    background: rgba(0, 123, 255, 0.05);
+    color: #004a99 !important; }
+  div.notices.primary label {
+    color: #007bff; }
+  div.notices.secondary p {
+    box-shadow: inset 4px 0 0 #6c757d;
+    background: rgba(108, 117, 125, 0.05);
+    color: #3d4246 !important; }
+  div.notices.secondary label {
+    color: #6c757d; }
+  div.notices.success p, div.notices.tip p {
+    box-shadow: inset 4px 0 0 #28a745;
+    background: rgba(40, 167, 69, 0.05);
+    color: #145523 !important; }
+  div.notices.success label, div.notices.tip label {
+    color: #28a745; }
+  div.notices.danger p {
+    box-shadow: inset 4px 0 0 #dc3545;
+    background: rgba(220, 53, 69, 0.05);
+    color: #921925 !important; }
+  div.notices.danger label {
+    color: #dc3545; }
+  div.notices.warning > * {
+    box-shadow: inset 4px 0 0 #ffc107;
+    background: rgba(255, 193, 7, 0.05);
+    color: #a07800 !important; }
+  div.notices.warning label {
+    color: #ffc107; }
+  div.notices.info p {
+    box-shadow: inset 4px 0 0 #17a2b8;
+    background: rgba(23, 162, 184, 0.05);
+    color: #0c525d !important; }
+  div.notices.info label {
+    color: #17a2b8; }
+  div.notices.light p {
+    box-shadow: inset 4px 0 0 #f8f9fa;
+    background: rgba(248, 249, 250, 0.05);
+    color: #bdc6d0 !important; }
+  div.notices.light label {
+    color: #f8f9fa; }
+  div.notices.dark p {
+    box-shadow: inset 4px 0 0 #343a40;
+    background: rgba(52, 58, 64, 0.05);
+    color: #060708 !important; }
+  div.notices.dark label {
+    color: #343a40; }
+  div.notices.white p {
+    box-shadow: inset 4px 0 0 #fff;
+    background: rgba(255, 255, 255, 0.05);
+    color: whiteen(#fff, 20%) !important; }
+  div.notices.white label {
+    color: #fff; }
+  div.notices.transparent p {
+    box-shadow: inset 4px 0 0 transparent;
+    background: rgba(0, 0, 0, 0);
+    color: transparenten(transparent, 20%) !important; }
+  div.notices.transparent label {
+    color: transparent; }
diff --git a/layouts/partials/html-head.html b/layouts/partials/html-head.html
index 436ed4c..4ee9852 100644
--- a/layouts/partials/html-head.html
+++ b/layouts/partials/html-head.html
@@ -11,6 +11,9 @@
 
 <link rel="shortcut icon" href='{{"images/favicon.png" | relURL}}' type="image/x-icon" />
 
+
+<link href='{{"vendor/bootstrap/bootstrap-4.5.2-dist/css/bootstrap.min.css" | relURL}}' rel="stylesheet"> 
+
 <!--load all styles -->
 <link rel="preload" as="style" href='{{"/fonts/Montserrat/Montserrat.css" | relURL}}'>
 <link rel="stylesheet" href='{{ (resources.Get "sass/layout.scss" | toCSS).Permalink }}'>
@@ -18,10 +21,6 @@
 <link rel="stylesheet" href='{{ (resources.Get "sass/menu.scss" | resources.ExecuteAsTemplate "css/style.menu.scss" . | toCSS).Permalink }}'>
 <link href='{{"vendor/FontAwesome/fontawesome-free-5.14.0-web/css/all.min.css" | relURL}}' rel="stylesheet"> 
 
-<link href='{{"vendor/bootstrap/bootstrap-4.5.2-dist/css/bootstrap.min.css" | relURL}}' rel="stylesheet"> 
-
-
-
 <link rel="stylesheet" type="text/css" href='{{ (resources.Get "sass/shortcodes/notice.scss" | toCSS).Permalink }}'>
 <link rel="stylesheet" type="text/css" href='{{ (resources.Get "sass/shortcodes/tabs.scss" | toCSS).Permalink }}'>
 <link rel="stylesheet" type="text/css" href='{{ (resources.Get "sass/shortcodes/panel.scss" | toCSS).Permalink }}'>
@@ -30,10 +29,8 @@
 <link rel="stylesheet" type="text/css" href='{{ (resources.Get "sass/shortcodes/attachments.scss" | toCSS).Permalink }}'>
 <link rel="stylesheet" type="text/css" href='{{ (resources.Get "sass/shortcodes/alert.scss" | toCSS).Permalink }}'>
 
-
 <link rel="stylesheet" href='{{"/css/docport.css" | relURL}}'>
 
-
 <!--load all js -->
 <script src='{{"vendor/jquery/jquery-3.5.1.min.js" | relURL}}'></script>
 <script src='{{"vendor/bootstrap/bootstrap-4.5.2-dist/js/bootstrap.min.js" | relURL}}' crossorigin="anonymous"></script>