From a5bfcb88cfcf8add663f76a84aea5a0dbdbef614 Mon Sep 17 00:00:00 2001 From: codecalm Date: Sun, 15 Dec 2019 22:54:04 +0100 Subject: [PATCH] navbar search fixes --- pages/_includes/cards/invoice.html | 193 +++++++++--------- pages/_includes/layout/navbar-search.html | 6 +- .../_includes/layout/page-title-actions.html | 2 +- pages/_includes/ui/form/input-icon.html | 2 +- scss/layout/_core.scss | 4 + scss/layout/_layout.scss | 8 + scss/ui/_cards.scss | 9 + scss/ui/_tables.scss | 4 + 8 files changed, 131 insertions(+), 97 deletions(-) diff --git a/pages/_includes/cards/invoice.html b/pages/_includes/cards/invoice.html index fe94a965..8b6074bc 100644 --- a/pages/_includes/cards/invoice.html +++ b/pages/_includes/cards/invoice.html @@ -1,94 +1,103 @@
-
-

#INV0015

-
- -
-
-
-
-
-

Company

-
- Street Address
- State, City
- Region, Postal Code
- ltd@example.com -
-
-
-

Client

-
- Street Address
- State, City
- Region, Postal Code
- ctr@example.com -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ProductQntUnitAmount
1 -

Logo Creation

-
Logo and business cards design
- 		- 1 - $1.800,00$1.800,00
2 -

Online Store Design & Development

-
Design/Development for all popular modern browsers
- 		- 1 - $20.000,00$20.000,00
3 -

App Design

-
Promotional mobile application
- 		- 1 - $3.200,00$3.200,00
Subtotal$25.000,00
Vat Rate20%
Vat Due$5.000,00
Total Due$30.000,00
-
-

Thank you very much for doing business with us. We look forward to working with you again!

-
+
+

Invoice

+
+ +
+
+
+
+
+

Company

+
+ Street Address
+ State, City
+ Region, Postal Code
+ ltd@example.com +
+
+
+

Client

+
+ Street Address
+ State, City
+ Region, Postal Code
+ ctr@example.com +
+
+ +
+

Invoice INV/001/15

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProductQntUnitAmount
1 +

Logo Creation

+
Logo and business cards design
+ 		+ 1 + $1.800,00$1.800,00
2 +

Online Store Design & Development

+
Design/Development for all popular modern browsers
+ 		+ 1 + $20.000,00$20.000,00
3 +

App Design

+
Promotional mobile application
+ 		+ 1 + $3.200,00$3.200,00
Subtotal$25.000,00
Vat Rate20%
Vat Due$5.000,00
Total Due$30.000,00
+
+

Thank you very much for doing business with us. We look forward to working with + you again!

+
diff --git a/pages/_includes/layout/navbar-search.html b/pages/_includes/layout/navbar-search.html index 712380ce..9bc2fa42 100644 --- a/pages/_includes/layout/navbar-search.html +++ b/pages/_includes/layout/navbar-search.html @@ -1,5 +1,5 @@
-
- -
+
+ {% include ui/form/input-icon.html prepend=true light=true %} +
diff --git a/pages/_includes/layout/page-title-actions.html b/pages/_includes/layout/page-title-actions.html index 20b09839..1d56d772 100644 --- a/pages/_includes/layout/page-title-actions.html +++ b/pages/_includes/layout/page-title-actions.html @@ -1,7 +1,7 @@ {% assign actions = include.actions %} -
+
{% if actions == 'users' %}
diff --git a/pages/_includes/ui/form/input-icon.html b/pages/_includes/ui/form/input-icon.html index fb01826f..9b3af86c 100644 --- a/pages/_includes/ui/form/input-icon.html +++ b/pages/_includes/ui/form/input-icon.html @@ -10,7 +10,7 @@ {{ addon }} {% endif %} - + {% unless include.prepend %} {{ addon }} diff --git a/scss/layout/_core.scss b/scss/layout/_core.scss index 92523771..3507defe 100644 --- a/scss/layout/_core.scss +++ b/scss/layout/_core.scss @@ -15,6 +15,10 @@ body { * { @include scrollbar; } + + @media print { + background: transparent; + } } /** diff --git a/scss/layout/_layout.scss b/scss/layout/_layout.scss index d4aa70d1..7973a6af 100644 --- a/scss/layout/_layout.scss +++ b/scss/layout/_layout.scss @@ -119,6 +119,10 @@ Topnav background-color: $navbar-bg; border-color: $navbar-border-color; + @media print { + display: none; + } + .navbar { margin: 0; padding: 0; @@ -218,6 +222,10 @@ Content } .content-page { + @media print { + padding-top: 0 !important; + } + .topbar + & { padding-top: add($navbar-height, 1px); } diff --git a/scss/ui/_cards.scss b/scss/ui/_cards.scss index 07b9f640..e9a161f1 100644 --- a/scss/ui/_cards.scss +++ b/scss/ui/_cards.scss @@ -2,6 +2,11 @@ margin-bottom: $card-group-margin; box-shadow: $card-shadow; + @media print { + border: none; + box-shadow: none; + } + @at-root a#{&} { color: inherit; transition: .3s box-shadow; @@ -173,6 +178,10 @@ } .card-body { + @media print { + padding: 0; + } + > :last-child { margin-bottom: 0; } diff --git a/scss/ui/_tables.scss b/scss/ui/_tables.scss index f5026c62..3eb8d9dc 100644 --- a/scss/ui/_tables.scss +++ b/scss/ui/_tables.scss @@ -6,6 +6,10 @@ background: $min-black; border-width: $table-border-width; @include subheader; + + @media print { + background: transparent; + } } } -- GitLab