Page MenuHomePhorge
Files F2528639

No OneTemporary
Actions

Size
8 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/resources/themes/default/_variables.scss b/src/resources/themes/default/_variables.scss
deleted file mode 100644
index fd9258d3..00000000
--- a/src/resources/themes/default/_variables.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-// Body
-$body-bg: #fff;
-
-// Typography
-$font-family-sans-serif: 'Nunito', sans-serif;
-$font-size-base: 0.9rem;
-$line-height-base: 1.5;
-
-// Colors
-$orange: #f1a539;
-$light: #f6f5f3;
-
-// App colors
-$menu-bg-color: $light;
-$menu-gray: #575656;
-$main-color: $orange;
-$warning: $orange;
-
-$table-hover-bg: $menu-bg-color;
-$table-head-bg: $menu-bg-color;
\ No newline at end of file
diff --git a/src/resources/themes/default/app.scss b/src/resources/themes/default/app.scss
index ed37caff..f4920d25 100644
--- a/src/resources/themes/default/app.scss
+++ b/src/resources/themes/default/app.scss
@@ -1,9 +1,8 @@
-@import 'variables';
-
+@import '../variables';
@import '../bootstrap';
@import '../menu';
@import '../meet';
@import '../toast';
@import '../forms';
@import '../charts';
@import '../app';
diff --git a/src/resources/themes/default/document.scss b/src/resources/themes/default/document.scss
index 2c9155ba..9c48dd3c 100644
--- a/src/resources/themes/default/document.scss
+++ b/src/resources/themes/default/document.scss
@@ -1,3 +1,3 @@
// Variables
-@import 'variables';
+@import '../variables';
@import '../document';
diff --git a/src/resources/themes/default/lang/de/support.php b/src/resources/themes/default/lang/de/support.php
deleted file mode 100644
index cc9e8f87..00000000
--- a/src/resources/themes/default/lang/de/support.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-return [
-
- 'btn' => "Kontaktieren Sie Support",
-
-];
\ No newline at end of file
diff --git a/src/resources/themes/default/lang/en/support.php b/src/resources/themes/default/lang/en/support.php
index e847afc2..13ad1d98 100644
--- a/src/resources/themes/default/lang/en/support.php
+++ b/src/resources/themes/default/lang/en/support.php
@@ -1,7 +1,11 @@
<?php
return [
- 'btn' => "Contact Support",
+ 'title' => "Contact Support",
+ 'text1' => "Our technical support team is here to provide help, should you run into issues."
+ . " You won’t have to talk to computers or navigate voice menus, but have actual human beings answering you personally.",
+ 'text2' => "This support is already included in your subscription fee, so there are no further costs for you."
+ . " If you have issues with your :site account, or questions about our product before you sign up, please contact us.",
-];
\ No newline at end of file
+];
diff --git a/src/resources/themes/default/pages/support.blade.php b/src/resources/themes/default/pages/support.blade.php
index e5150ebf..f66c8068 100644
--- a/src/resources/themes/default/pages/support.blade.php
+++ b/src/resources/themes/default/pages/support.blade.php
@@ -1,21 +1,14 @@
<div id="support" class="card">
<div class="card-body">
- <h3 class="card-title text-center">Contact Support</h3>
+ <h3 class="card-title text-center">@lang('theme::support.title')</h3>
<p class="card-text text-justify">
- Our technical support team is here to provide help, should you run
- into issues. You won’t have to talk to computers or navigate voice
- menus, but have actual human beings answering you personally.
+ @lang('theme::support.text1')
<br />
<br />
- This support is already included in your subscription fee, so
- there are no further costs for you. If you have issues with your
- Kolab Now account, or questions about our product before you sign
- up, please contact us.
+ @lang('theme::support.text2', ['site' => config('app.name')])
</p>
- </div>
- <div class="card-footer text-center">
- <a href="/support/contact" class="btn btn-info">@lang('theme::support.btn')</a>
- </div>
- </div>
+ </div>
+ <div class="card-footer text-center">
+ <a href="/support/contact" class="btn btn-primary">@lang('theme::support.title')</a>
</div>
</div>
diff --git a/src/resources/themes/menu.scss b/src/resources/themes/menu.scss
index cec9f793..5c1ae104 100644
--- a/src/resources/themes/menu.scss
+++ b/src/resources/themes/menu.scss
@@ -1,186 +1,186 @@
#header-menu {
background-color: $menu-bg-color;
padding: 0;
line-height: 85px;
.navbar {
padding-right: 0;
}
.navbar-brand {
padding: 0;
outline: 0;
> img {
display: inline;
vertical-align: middle;
}
}
.nav-link {
color: #202020;
line-height: 85px;
padding: 0 0 0 25px;
background: transparent;
&:focus {
text-decoration: underline;
outline: 0;
}
&:hover {
color: $main-color;
text-decoration: underline;
}
&.active:not(.menulogin) {
font-weight: bold;
}
}
}
#footer-menu {
- background-color: $main-color;
+ color: $menu-footer-color;
+ background-color: $menu-footer-bg-color;
height: 100px;
overflow: hidden;
padding: 0;
.navbar {
padding-right: 0;
}
.navbar-brand {
margin: 0;
img {
width: 170px;
}
}
.footer {
text-align: right;
- color: #fff;
font-size: 0.75rem;
padding: 0 0.5rem;
}
}
#language-selector {
margin: 2em 0;
.dropdown-toggle {
padding-left: 20px;
line-height: 30px;
font-weight: lighter;
}
.dropdown-item {
line-height: initial;
}
}
@include media-breakpoint-up(lg) {
#header-menu {
a.menulogin {
text-transform: uppercase;
border: 2px solid $main-color;
border-radius: 21px;
line-height: 21px;
letter-spacing: 1px;
padding: 6px 34px;
margin: 25px 0 25px 25px;
&:focus,
&:hover {
text-decoration: none;
background-color: $main-color;
color: #fff;
font-weight: normal;
}
}
}
.navbar {
.navbar {
justify-content: flex-end;
}
}
#footer-menu {
.navbar {
flex-direction: column;
align-items: flex-end;
}
}
}
@include media-breakpoint-down(md) {
#header-menu {
.navbar-nav {
padding-bottom: 1em;
}
.nav-link {
line-height: 45px;
padding: 0;
}
}
#footer-menu {
height: 80px;
.navbar {
padding-left: 0;
}
.navbar-nav {
display: none;
}
.container {
flex-wrap: nowrap;
}
}
#language-selector {
margin: 0;
.dropdown-toggle:after {
display: none;
}
}
}
@include media-breakpoint-down(sm) {
#header-menu {
padding: 0 1em;
.navbar-nav {
display: block;
width: 100%;
padding: 0;
li {
border-top: 1px solid #eee;
}
}
}
#footer-menu {
.container {
flex-direction: column;
}
#footer-company {
display: none;
}
}
}
@media (max-width: 340px) {
#header-menu {
.navbar-brand img {
width: 160px;
}
}
}
diff --git a/src/resources/themes/variables.scss b/src/resources/themes/variables.scss
new file mode 100644
index 00000000..1468b9e6
--- /dev/null
+++ b/src/resources/themes/variables.scss
@@ -0,0 +1,15 @@
+// Body
+$body-bg: #fff;
+
+// Typography
+$font-family-sans-serif: 'Nunito', sans-serif;
+$font-size-base: 0.9rem;
+$line-height-base: 1.5;
+
+$main-color: #007bff;
+
+// App colors
+$menu-bg-color: #f8f9fa;
+$menu-footer-color: #fff;
+$menu-footer-bg-color: #aaa;
+$menu-gray: #575656;

File Metadata

Mime Type
text/x-diff
Expires
Sun, Feb 1, 4:37 PM (1 d, 21 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
426680
Default Alt Text
(8 KB)

Event Timeline