diff --git a/package-lock.json b/package-lock.json index 2a3cc32cf979ab46e1e114bb8c6b1ae943f2e4a5..f3441075deb843be404b45d9267b47d5ea6b8902 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2088,7 +2088,7 @@ "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { "nice-try": "^1.0.4", @@ -5758,7 +5758,7 @@ "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, "no-case": { diff --git a/resources/less/metager/general/cards.less b/resources/less/metager/general/cards.less index 9821c419acda6b28611fea43dd70be65a2115e81..248391b5829728d33b7adbbc8b6eeaa41d5800ea 100644 --- a/resources/less/metager/general/cards.less +++ b/resources/less/metager/general/cards.less @@ -1,7 +1,7 @@ .card, .card-medium { border: 1px solid #ccc; - background-color: white; + background-color: @card-background-color; box-shadow: 0px 1px 1.5px 0px rgba(0, 0, 0, 0.12), 1px 0px 1px 0px rgba(0, 0, 0, 0.24); padding: 8px; margin: 4px; diff --git a/resources/less/metager/general/specific.less b/resources/less/metager/general/specific.less index 1a00e3594a48b7fd2fc23264953a56f57f223180..028c845406144e4477c8459e2c156c52b69a9e5e 100644 --- a/resources/less/metager/general/specific.less +++ b/resources/less/metager/general/specific.less @@ -4,7 +4,7 @@ .form-group { font-family: sans-serif; font-size: 1em; - color: @color-black; + color: @text-color; background-color: transparent; text-align: center; } diff --git a/resources/less/metager/pages/help_faq.less b/resources/less/metager/pages/help_faq.less index 4e4f0d96382e16569ad5995a789bb18d7c10189c..40d590a0d6f905bedce139da52b6f6f4efeed44c 100644 --- a/resources/less/metager/pages/help_faq.less +++ b/resources/less/metager/pages/help_faq.less @@ -14,7 +14,7 @@ } .search-example { border: 1px solid #aaa; - background-color: #eee; + background-color: @background-color; border-radius: 5px; padding: 10px; } diff --git a/resources/less/metager/variables-dark.less b/resources/less/metager/variables-dark.less index ab866b1095316121a4c054021236329ba11f4e4b..cda46be1583b18d36a062eda88ca1284cdf2595c 100644 --- a/resources/less/metager/variables-dark.less +++ b/resources/less/metager/variables-dark.less @@ -2,6 +2,7 @@ @import "./variables.less"; // Default Background Color +@card-background-color: @color-strong-grey; @background-color: @color-almost-black; @background-color-mobile: @color-almost-black; @sidebar-list-hover-color: @color-strong-grey; diff --git a/resources/less/metager/variables.less b/resources/less/metager/variables.less index 85294b684822bad4209e49965082e80255809ea3..ade38008848f64ceed99a0892e87e16d346055d9 100644 --- a/resources/less/metager/variables.less +++ b/resources/less/metager/variables.less @@ -10,6 +10,7 @@ @color-black: black; // Default Background Color @background-color: white; +@card-background-color: @background-color; @background-color-mobile: #FAFAFA; @sidebar-list-hover-color: @color-almost-white; // Default Font diff --git a/resources/views/widget/widget.blade.php b/resources/views/widget/widget.blade.php index 64fbb43fa6982753c0a3d0e669ad9fb2425fc1f8..059d80cb09ca6d33127009df1447d2d8d20dc6b0 100644 --- a/resources/views/widget/widget.blade.php +++ b/resources/views/widget/widget.blade.php @@ -6,7 +6,7 @@ <h1 class="page-title">{{ trans('widget.head') }}</h1> <div class="card-medium"> <p>{{ trans('widget.body.1') }}</p> - <p id="widgetLinks" class="btn-group"><a class="btn btn-default mutelink" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default mutelink" href="sitesearch/">{{ trans('widget.body.3') }}</a></p> + <p id="widgetLinks" class="btn-group"><a class="btn btn-default" href="websearch/">{{ trans('widget.body.2') }}</a><a class="btn btn-default" href="sitesearch/">{{ trans('widget.body.3') }}</a></p> <p>{{ trans('widget.body.4') }}</p> </div> @endsection