Преглед изворни кода

Merge pull request #365 from weseek/imprv/add-theme-nature

Imprv/add theme nature
Yuki Takei пре 8 година
родитељ
комит
d88aa3c971

+ 5 - 5
lib/views/admin/customize.html

@@ -65,13 +65,13 @@
                 data-theme="{{ webpack_asset('style-theme-default-dark').css }}">
               {% include 'widget/theme-colorbox.html' %}
             </a>
-            {# Hide temporary for release v3.0.8 -- 2018.04.24 Yuki Takei
-            <a id="theme-option-nature"
-             class="nature"
-             data-theme="{{ webpack_asset('style-theme-nature').css }}">
+            <a id="theme-option-nature" href="#"
+                class="nature {% if 'nature' === settingForm['customize:theme'] %}active{% endif %}"
+                onclick="selectTheme('nature')"
+                data-theme="{{ webpack_asset('style-theme-nature').css }}">
               {% include 'widget/theme-colorbox.html' %}
             </a>
-            #}
+
           </div>
 
           <div class="form-group">

+ 9 - 8
resource/styles/agile-admin/inverse/colors/nature.scss

@@ -1,19 +1,20 @@
 @import '../variables';
 
-$themecolor:#112744;
+$themecolor:#00363d;
 
-$topbar:#334455;
+$topbar:#118050;;
 $sidebar:#fff;
-$bodycolor:#fff;
-$headingtext: #2b2b2b;
+$bodycolor:#fefffd;
+
+$headingtext: #46694e;
 $bodytext: #333333;
-$linktext: lighten($themecolor, 20%);
-$linktext-hover: lighten($linktext, 20%);
-$sidebar-text:#38495a;
+$linktext: lighten($themecolor,5%);
+$linktext-hover: lighten($linktext, 12%);
+$sidebar-text:#5c7253;
 
 $primary: $themecolor;
 
-$logo-mark-fill: lighten(desaturate($topbar, 10%), 15%);
+$logo-mark-fill: lighten(desaturate($topbar, 30%), 20%);
 $wikilinktext: lighten($themecolor, 20%);
 $wikilinktext-hover: lighten($wikilinktext, 20%);
 

+ 3 - 3
resource/styles/scss/_admin.scss

@@ -118,13 +118,13 @@
     }
     .nature {
       .color1 {
-        fill: #dfffd1;
+        fill: #f9fff3;
       }
       .color2 {
-        fill: #1f9b33;
+        fill: #118050;
       }
       .color3 {
-        fill: #56f736;
+        fill: #00363d;
       }
     }
   }