Yuki Takei пре 8 година
родитељ
комит
d3db1551c4

+ 2 - 2
lib/views/admin/index.html

@@ -29,7 +29,7 @@
       {{ t("admin_top.assign_administrator") }}
       </p>
 
-      <h3>{{ t('admin_top.System Information') }}</h3>
+      <h3><i class="icon-fw icon-info"></i>{{ t('admin_top.System Information') }}</h3>
       <table class="table table-bordered">
         <tr>
           <th class="col-sm-4">crowi-plus</th>
@@ -49,7 +49,7 @@
         </tr>
       </table>
 
-      <h3>{{ t('admin_top.List of installed plugins') }}</h3>
+      <h3><i class="icon-fw icon-bulb"></i>{{ t('admin_top.List of installed plugins') }}</h3>
       <table class="table table-bordered">
         <th class="text-center">
           {{ t('admin_top.Package name') }}

+ 3 - 3
lib/views/installer.html

@@ -46,19 +46,19 @@
 
       <label>名前</label>
       <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-user"></i></span>
+        <span class="input-group-addon"><i class="icon-user"></i></span>
         <input type="text" class="form-control" placeholder="記入例: 山田 太郎" name="registerForm[name]" value="{{ req.body.registerForm.name }}" required>
       </div>
 
       <label >メールアドレス</label>
       <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
+        <span class="input-group-addon"><i class="icon-envelope"></i></span>
         <input type="email" class="form-control" placeholder="E-mail" name="registerForm[email]" value="{{ googleEmail|default(req.body.registerForm.email) }}" required>
       </div>
 
       <label>パスワード</label>
       <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-key"></i></span>
+        <span class="input-group-addon"><i class="icon-key"></i></span>
         <input type="password" class="form-control" placeholder="Password" name="registerForm[password]" required>
       </div>
       <p class="help-block">

+ 1 - 1
lib/views/layout/layout.html

@@ -198,7 +198,7 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
           <!-- /.dropdown-messages -->
         </li>
         {% else %}
-        <li id="login-user"><a href="/login"><i class="fa fa-user"></i> Login</a></li>
+        <li id="login-user"><a href="/login">Login</a></li>
         {% endif %}
         {% if config.crowi['app:confidential'] && config.crowi['app:confidential'] != '' %}
         <li class="confidential"><a href="#">{{ config.crowi['app:confidential'] }}</a></li>

+ 7 - 7
lib/views/login.html

@@ -81,7 +81,7 @@
     </div>
     <form role="form" action="/login" method="post">
       <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-fw fa-user"></i></span>
+        <span class="input-group-addon"><i class="icon-fw icon-user"></i></span>
         <input type="text" class="form-control" placeholder="Username or E-mail" name="loginForm[username]">
         {% if isLdapSetup() %}
         <span class="input-group-addon">
@@ -93,7 +93,7 @@
       </div>
 
       <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-fw fa-key"></i></span>
+        <span class="input-group-addon"><i class="icon-fw icon-lock"></i></span>
         <input type="password" class="form-control" placeholder="Password" name="loginForm[password]">
       </div>
 
@@ -116,7 +116,7 @@
     </div>
 
     {% if config.crowi['security:registrationMode'] != 'Closed' %}
-    <p class="bottom-text"><a href="#register" id="register"><i class="fa fa-pencil"></i> {{ t('Sign up is here') }}</a></p>
+    <p class="bottom-text"><a href="#register" id="register"><i class="ti-check-box"></i> {{ t('Sign up is here') }}</a></p>
     {% endif %}
   </div>
 
@@ -170,7 +170,7 @@
 
       <label>{{ t('User ID') }}</label>
       <div class="input-group" id="input-group-username">
-        <span class="input-group-addon"><strong>@</strong></span>
+        <span class="input-group-addon"><i class="icon-user"></i></span>
         <input type="text" class="form-control" placeholder="{{ t('Example') }}: taroyama" name="registerForm[username]" value="{{ req.body.registerForm.username }}" required>
       </div>
       <p class="help-block">
@@ -180,13 +180,13 @@
 
       <label>{{ t('Name') }}</label>
       <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-user"></i></span>
+        <span class="input-group-addon"><i class="icon-tag"></i></span>
         <input type="text" class="form-control" placeholder="{{ t('Example') }}: {{ t('Taro Yamada') }}" name="registerForm[name]" value="{{ googleName|default(req.body.registerForm.name) }}" required>
       </div>
 
       <label>{{ t('Email') }}</label>
       <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
+        <span class="input-group-addon"><i class="icon-envelope"></i></span>
         <input type="email" class="form-control" placeholder="E-mail" name="registerForm[email]" value="{{ googleEmail|default(req.body.registerForm.email) }}" required>
       </div>
       {% if config.crowi['security:registrationWhiteList'] && config.crowi['security:registrationWhiteList'].length %}
@@ -202,7 +202,7 @@
 
       <label>{{ t('Password') }}</label>
       <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-key"></i></span>
+        <span class="input-group-addon"><i class="icon-lock"></i></span>
         <input type="password" class="form-control" placeholder="Password" name="registerForm[password]" required>
       </div>
       <p class="help-block">

+ 1 - 1
resource/styles/scss/crowi.scss

@@ -174,7 +174,7 @@ input.searching {
 
 // transplant from FontAwesome
 .icon-fw {
-  width: 20px;
+  width: 1.4em;
   display: inline-block;
   text-align: left;
 }