diff --git a/config/config.default.php b/config/config.default.php index 25189ce7..0bbb2861 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -64,7 +64,7 @@ return [ ], // Default theme, 1=style1.css - 'theme' => env('THEME', 13), + 'theme' => env('THEME', 1), // Available themes 'available_themes' => [ diff --git a/resources/assets/themes/theme13.less b/resources/assets/themes/theme13.less index d4f45485..b26c26e6 100644 --- a/resources/assets/themes/theme13.less +++ b/resources/assets/themes/theme13.less @@ -57,7 +57,7 @@ THE SOFTWARE. @text-color: @gray-lighter; //** Global textual link color. -@link-color: @brand-primary; +@link-color: #fff; //** Link hover color set via `darken()` function. @link-hover-color: @link-color; @@ -65,8 +65,27 @@ THE SOFTWARE. //== Typography // //## Font, line-height, and color for body text, headings, and more. +@font-face { + font-family: 'Montserrat'; + src: url('theme13/Montserrat-Regular.woff2') format('woff2'), + url('theme13/Montserrat-Regular.woff') format('woff'); + font-weight: normal; + font-style: normal; + font-display: swap; +} -@font-family-serif: Georgia, "Times New Roman", Times, serif; +@font-face { + font-family: 'Orbitron'; + src: url('theme13/Orbitron-Regular.woff2') format('woff2'), + url('theme13/Orbitron-Regular.woff') format('woff'); + font-weight: normal; + font-style: normal; + font-display: swap; +} + + +@font-family-sans-serif: 'Montserrat', Helvetica Neue, Helvetica, Arial, sans-serif; +@font-family-serif: 'Orbitron', Georgia, "Times New Roman", Times, serif; //** Default monospace fonts for ``, ``, and `
`.
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
 @font-family-base:        @font-family-sans-serif;
@@ -88,7 +107,7 @@ THE SOFTWARE.
 @line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px
 
 //** By default, this inherits from the ``.
-@headings-font-family:    @font-family-base;
+@headings-font-family:    @font-family-serif;
 @headings-font-weight:    500;
 @headings-line-height:    1.1;
 @headings-color:          #fff;
@@ -167,27 +186,27 @@ THE SOFTWARE.
 
 @btn-font-weight:                normal;
 
-@btn-default-color:              @gray-lighter;
+@btn-default-color:              #fff;
 @btn-default-bg:                 lighten(@gray-dark, 10%);
 @btn-default-border:             darken(@btn-default-bg, 10%);
 
-@btn-primary-color:              @black;
+@btn-primary-color:              #fff;
 @btn-primary-bg:                 @brand-primary;
 @btn-primary-border:             darken(@btn-default-bg, 10%);
 
-@btn-success-color:              @black;
+@btn-success-color:              #fff;
 @btn-success-bg:                 @brand-success;
 @btn-success-border:             darken(@btn-default-bg, 10%);
 
-@btn-info-color:                 @black;
+@btn-info-color:                 #fff;
 @btn-info-bg:                    @brand-info;
 @btn-info-border:                darken(@btn-default-bg, 10%);
 
-@btn-warning-color:              @black;
+@btn-warning-color:              #fff;
 @btn-warning-bg:                 @brand-warning;
 @btn-warning-border:             darken(@btn-default-bg, 10%);
 
-@btn-danger-color:               @btn-default-color;
+@btn-danger-color:               #fff;
 @btn-danger-bg:                  @brand-danger;
 @btn-danger-border:              darken(@btn-default-bg, 10%);
 
@@ -501,19 +520,19 @@ THE SOFTWARE.
 //
 //## Define colors for form feedback states and, by default, alerts.
 
-@state-success-text:             @brand-success;
+@state-success-text:             #fff;
 @state-success-bg:               darken(@brand-success, 40%);
 @state-success-border:           @brand-success;
 
-@state-info-text:                @brand-info;
+@state-info-text:                #fff;
 @state-info-bg:                  darken(@brand-info, 40%);
 @state-info-border:              @brand-info;
 
-@state-warning-text:             @brand-warning;
+@state-warning-text:             #fff;
 @state-warning-bg:               darken(@brand-warning, 40%);
 @state-warning-border:           @brand-warning;
 
-@state-danger-text:              @brand-danger;
+@state-danger-text:              #fff;
 @state-danger-bg:                darken(@brand-danger, 40%);
 @state-danger-border:            @brand-danger;
 
@@ -724,19 +743,19 @@ THE SOFTWARE.
 @panel-primary-border:        @brand-primary;
 @panel-primary-heading-bg:    @brand-primary;
 
-@panel-success-text:          @state-success-text;
+@panel-success-text:          #fff;
 @panel-success-border:        @state-success-border;
 @panel-success-heading-bg:    @state-success-bg;
 
-@panel-info-text:             @state-info-text;
+@panel-info-text:             #fff;
 @panel-info-border:           @state-info-border;
 @panel-info-heading-bg:       @state-info-bg;
 
-@panel-warning-text:          @state-warning-text;
+@panel-warning-text:          #fff;
 @panel-warning-border:        @state-warning-border;
 @panel-warning-heading-bg:    @state-warning-bg;
 
-@panel-danger-text:           @state-danger-text;
+@panel-danger-text:           #fff;
 @panel-danger-border:         @state-danger-border;
 @panel-danger-heading-bg:     @state-danger-bg;
 
@@ -1066,8 +1085,6 @@ a.thumbnail.active {
 // Specials ===================================================================
 body {
   background: #000 url('theme13/background.jpg') no-repeat top left;
-  background-attachment: fixed;
-  background-size: 500px 500px;
 }
 
 .navbar.navbar-default {
diff --git a/resources/assets/themes/theme13/Montserrat-Regular.woff b/resources/assets/themes/theme13/Montserrat-Regular.woff
new file mode 100644
index 00000000..f350b738
Binary files /dev/null and b/resources/assets/themes/theme13/Montserrat-Regular.woff differ
diff --git a/resources/assets/themes/theme13/Montserrat-Regular.woff2 b/resources/assets/themes/theme13/Montserrat-Regular.woff2
new file mode 100644
index 00000000..33906e85
Binary files /dev/null and b/resources/assets/themes/theme13/Montserrat-Regular.woff2 differ
diff --git a/resources/assets/themes/theme13/OFL.txt b/resources/assets/themes/theme13/OFL.txt
new file mode 100644
index 00000000..7881887b
--- /dev/null
+++ b/resources/assets/themes/theme13/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/resources/assets/themes/theme13/Orbitron-Regular.woff b/resources/assets/themes/theme13/Orbitron-Regular.woff
new file mode 100644
index 00000000..274333c4
Binary files /dev/null and b/resources/assets/themes/theme13/Orbitron-Regular.woff differ
diff --git a/resources/assets/themes/theme13/Orbitron-Regular.woff2 b/resources/assets/themes/theme13/Orbitron-Regular.woff2
new file mode 100644
index 00000000..1fb03806
Binary files /dev/null and b/resources/assets/themes/theme13/Orbitron-Regular.woff2 differ
diff --git a/webpack.config.js b/webpack.config.js
index 4b25a468..88430393 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -24,7 +24,7 @@ const plugins = [
 
 
 const themeEntries = {};
-for (let i = 13; i < 14; i++) {
+for (let i = 0; i < 14; i++) {
   themeEntries[`theme${i}`] = `./resources/assets/themes/theme${i}.less`;
 }