Просмотр исходного кода

WIP: adjust default-dark theme

* slack mark
Yuki Takei 8 лет назад
Родитель
Сommit
8800d490fb

+ 2 - 1
lib/views/_form.html

@@ -30,7 +30,8 @@
       {% if slackConfigured() %}
       {% if slackConfigured() %}
       <span class="input-group input-group-sm input-group-slack extended-setting m-r-5">
       <span class="input-group input-group-sm input-group-slack extended-setting m-r-5">
         <div class="input-group-addon">
         <div class="input-group-addon">
-          <img src="/images/slack/monochrome_black.svg" width="18" height="18">
+          <img id="slack-mark-white" src="/images/slack/mark-monochrome_white.svg" width="18" height="18">
+          <img id="slack-mark-black" src="/images/slack/mark-monochrome_black.svg" width="18" height="18">
           <input class="" type="checkbox" name="pageForm[notify][slack][on]" value="1">
           <input class="" type="checkbox" name="pageForm[notify][slack][on]" value="1">
         </div>
         </div>
         <input class="form-control" type="text" name="pageForm[notify][slack][channel]" value="{{ page.extended.slack|default('') }}" placeholder="slack-channel-name"
         <input class="form-control" type="text" name="pageForm[notify][slack][channel]" value="{{ page.extended.slack|default('') }}" placeholder="slack-channel-name"

+ 18 - 0
resource/styles/agile-admin/inverse/colors/_apply-colors-dark.scss

@@ -23,6 +23,15 @@ input.form-control, textarea.form-control {
   color: lighten($bodytext, 10%);
   color: lighten($bodytext, 10%);
   background-color: lighten($bodycolor, 5%);
   background-color: lighten($bodycolor, 5%);
 }
 }
+/*
+ * Form
+ */
+.input-group .input-group-addon {
+  color: $dark;
+  background-color: rgba($topbar, 0.4);
+  border: 1px solid darken($border, 30%);
+  border-right: none;
+}
 
 
 /*
 /*
  * Dropdown
  * Dropdown
@@ -116,3 +125,12 @@ input.form-control, textarea.form-control {
     }
     }
   }
   }
 }
 }
+
+/*
+ * GROWI on-edit
+ */
+.page-editor-footer {
+  #slack-mark-black {
+    display: none;
+  }
+}

+ 9 - 0
resource/styles/agile-admin/inverse/colors/_apply-colors-light.scss

@@ -38,3 +38,12 @@
     }
     }
   }
   }
 }
 }
+
+/*
+ * GROWI on-edit
+ */
+ .page-editor-footer {
+  #slack-mark-white {
+    display: none;
+  }
+}

+ 10 - 0
resource/styles/scss/theme/_override-agileadmin.scss

@@ -50,6 +50,16 @@
   }
   }
 }
 }
 
 
+/*
+ * Form
+ */
+.input-sm,
+.input-group-sm > .form-control,
+.input-group-addon.input-sm,
+.input-group-sm > .input-group-addon {
+  border-radius: $radius;
+}
+
 /*
 /*
  * Button
  * Button
  */
  */