Yuki Takei 7 лет назад
Родитель
Сommit
96b7a6f206

+ 0 - 1
src/client/styles/scss/_admin.scss

@@ -1,5 +1,4 @@
 .admin-page {
-    //security XSS prevent
 
   .admin-user-menu {
     .dropdown-menu {

+ 177 - 151
src/client/styles/scss/_layout.scss

@@ -1,151 +1,177 @@
-.main-container { // {{{
-  h1, h2, h3, h4, h5, h6 {
-    font-weight: 500;
-  }
-
-  .navbar-top-links { // {{{
-    .confidential {
-      a {
-        // border: solid 2px #f00;
-        // background: #fff;
-        // color: #f00;
-        // font-weight: bold;
-        // height: 42px;
-        // margin-top: 5px;
-        // padding: 10px;
-        // margin-right: 5px;
-      }
-    }
-
-    .nav-item-admin, .nav-item-create-page {
-      span {
-        margin-left: 0.5em;
-        @media (max-width: $screen-xs-min) {
-          display: none;
-        }
-      }
-    }
-  } // }}}
-
-  .main {
-    .header-wrap {
-      padding: 15px 15px 0 15px;
-      min-height: 70px;
-    }
-  }
-
-  .layout-control { // {{{
-    transition: .3s ease;
-    position: fixed;
-    display: block;
-    text-align: center;
-    right: 25%;
-    bottom: 25px;
-    padding: 5px 8px;
-    border: solid 1px #ccc;
-    border-right: none;
-    border-radius: 5px 0 0 5px;
-    z-index: 1039;
-    font-size: .8em;
-
-    &:hover {
-      text-decoration: none;
-      cursor: pointer;
-    }
-  } // }}}
-
-  .revision-toc {
-    font-size: .9em;
-    max-width: 250px;
-    overflow: hidden;
-
-    .revision-toc-content {
-      padding: 10px;
-
-      > ul {
-        padding-left: 0;
-        ul {
-          padding-left: 1em;
-        }
-      }
-
-      > ul > li { // first level of li
-        margin: 4px 4px 4px 15px;
-        padding: 5px;
-      }
-    }
-  }
-} // }}}
-
-
-// fix tab width to 95 pixels
-// see also '_on-edit.scss'
-$nav-main-left-tab-width: 95px;
-.nav.nav-tabs {
-  .nav-main-left-tab {
-    width: $nav-main-left-tab-width;
-    text-align: center;
-    a {
-      padding-left: 0;
-      padding-right: 0;
-    }
-  }
-}
-
-
-@media print { // {{{ printable style
-  .main-container { // {{{
-    padding: 30px;
-
-    a:after {
-      display: none !important;
-    }
-    .main {
-      header {
-        border-bottom: solid 1px #666;
-        h1 {
-          font-size: 2em;
-          color: #000;
-        }
-      }
-
-      .revision-toc {
-        float: none;
-        font-size: .9em;
-        border: solid 1px #aaa;
-        border-radius: 5px;
-        max-width: 100%;
-        margin-bottom: 20px;
-
-        .revision-toc-head {
-          display: inline-block;
-          float: none;
-        }
-
-        .revision-toc-content.collapse {
-          display: block;
-          height: auto;
-        }
-      }
-
-      .meta {
-        border-top: solid 1px #ccc;
-        margin-top: 32px;
-        color: #666;
-      }
-
-
-    }
-  }
-} // }}}
-
-.system-version {
-  position: fixed;
-  right: 0.5em;
-  bottom: 0;
-  opacity: .6;
-
-  > span {
-    margin-left: .5em;
-  }
-}
+.main-container { // {{{
+  h1, h2, h3, h4, h5, h6 {
+    font-weight: 500;
+  }
+
+  .navbar-top-links { // {{{
+    .confidential {
+      a {
+        // border: solid 2px #f00;
+        // background: #fff;
+        // color: #f00;
+        // font-weight: bold;
+        // height: 42px;
+        // margin-top: 5px;
+        // padding: 10px;
+        // margin-right: 5px;
+      }
+    }
+
+    .nav-item-admin, .nav-item-create-page {
+      span {
+        margin-left: 0.5em;
+        @media (max-width: $screen-xs-min) {
+          display: none;
+        }
+      }
+    }
+  } // }}}
+
+  /*
+   * header
+   */
+  header {
+    line-height: 1em;
+
+    h1 {
+      @include variable-font-size(28px);
+      line-height: 1.1em;
+    }
+
+    // affix
+    &.affix {
+      width: 100%;
+      top: 0;
+      left: 0;
+      padding: 2px 20px;
+      z-index: 15; // over the .sidebar
+      box-shadow: 0 0px 2px #999;
+
+      h1 {
+        @include variable-font-size(20px);
+      }
+    }
+  }
+
+  .main {
+    .header-wrap {
+      padding: 15px 15px 0 15px;
+      min-height: 70px;
+    }
+  }
+
+  .layout-control { // {{{
+    transition: .3s ease;
+    position: fixed;
+    display: block;
+    text-align: center;
+    right: 25%;
+    bottom: 25px;
+    padding: 5px 8px;
+    border: solid 1px #ccc;
+    border-right: none;
+    border-radius: 5px 0 0 5px;
+    z-index: 1039;
+    font-size: .8em;
+
+    &:hover {
+      text-decoration: none;
+      cursor: pointer;
+    }
+  } // }}}
+
+  .revision-toc {
+    font-size: .9em;
+    max-width: 250px;
+    overflow: hidden;
+
+    .revision-toc-content {
+      padding: 10px;
+
+      > ul {
+        padding-left: 0;
+        ul {
+          padding-left: 1em;
+        }
+      }
+
+      > ul > li { // first level of li
+        margin: 4px 4px 4px 15px;
+        padding: 5px;
+      }
+    }
+  }
+} // }}}
+
+
+// fix tab width to 95 pixels
+// see also '_on-edit.scss'
+$nav-main-left-tab-width: 95px;
+.nav.nav-tabs {
+  .nav-main-left-tab {
+    width: $nav-main-left-tab-width;
+    text-align: center;
+    a {
+      padding-left: 0;
+      padding-right: 0;
+    }
+  }
+}
+
+
+@media print { // {{{ printable style
+  .main-container { // {{{
+    padding: 30px;
+
+    a:after {
+      display: none !important;
+    }
+    .main {
+      header {
+        border-bottom: solid 1px #666;
+        h1 {
+          font-size: 2em;
+          color: #000;
+        }
+      }
+
+      .revision-toc {
+        float: none;
+        font-size: .9em;
+        border: solid 1px #aaa;
+        border-radius: 5px;
+        max-width: 100%;
+        margin-bottom: 20px;
+
+        .revision-toc-head {
+          display: inline-block;
+          float: none;
+        }
+
+        .revision-toc-content.collapse {
+          display: block;
+          height: auto;
+        }
+      }
+
+      .meta {
+        border-top: solid 1px #ccc;
+        margin-top: 32px;
+        color: #666;
+      }
+
+
+    }
+  }
+} // }}}
+
+.system-version {
+  position: fixed;
+  right: 0.5em;
+  bottom: 0;
+  opacity: .6;
+
+  > span {
+    margin-left: .5em;
+  }
+}

+ 0 - 22
src/client/styles/scss/_page.scss

@@ -8,14 +8,9 @@
    * header
    */
   header {
-    line-height: 1em;
-
     // the container of h1
     div.title-container {
       margin-right: auto;
-      h1 {
-        line-height: 1.1em;
-      }
     }
 
     .btn-copy, .btn-copy-link, .btn-edit {
@@ -58,8 +53,6 @@
     }
 
     h1#revision-path {
-      @include variable-font-size(28px);
-
       margin-top: 0;
       margin-bottom: 0;
       .d-flex {
@@ -76,21 +69,6 @@
       }
 
     }
-
-    // affix
-    &.affix {
-      width: 100%;
-      top: 0;
-      left: 0;
-      padding: 2px 20px;
-      z-index: 15; // over the .sidebar
-      box-shadow: 0 0px 2px #999;
-
-      h1#revision-path {
-        @include variable-font-size(20px);
-      }
-    }
-
   }
 
   // alert component settings

+ 1 - 1
src/server/views/admin/app.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('App settings') }}</h1>
+    <h1 id="admin-title" class="title">{{ t('App settings') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/customize.html

@@ -26,7 +26,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('Customize') }} </h1>
+    <h1 id="admin-title" class="title">{{ t('Customize') }} </h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/external-accounts.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('User management') }}/{{ t('External Account management') }}</h1>
+    <h1 id="admin-title" class="title">{{ t('User management') }}/{{ t('External Account management') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/global-notification-detail.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('Notification settings') }}</h1>
+    <h1 id="admin-title" class="title">{{ t('Notification settings') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/importer.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('Import Data') }}</h1>
+    <h1 id="admin-title" class="title">{{ t('Import Data') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/index.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id=""> {{ t('admin_top.Management Wiki') }}</h1>
+    <h1 id="admin-title" class="title"> {{ t('admin_top.Management Wiki') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/markdown.html

@@ -6,7 +6,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('Markdown settings') }}</h1>
+    <h1 id="admin-title" class="title">{{ t('Markdown settings') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/notification.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('Notification settings') }}</h1>
+    <h1 id="admin-title" class="title">{{ t('Notification settings') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/search.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('Full Text Search management') }}</h1>
+    <h1 id="admin-title" class="title">{{ t('Full Text Search management') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/security.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('Security settings') }}</h1>
+    <h1 id="admin-title" class="title">{{ t('Security settings') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/user-group-detail.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('UserGroup management') + '/' + userGroup.name | preventXss }}</h1>
+    <h1 id="admin-title" class="title">{{ t('UserGroup management') + '/' + userGroup.name | preventXss }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/user-groups.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('UserGroup management') }}</h1>
+    <h1 id="admin-title" class="title">{{ t('UserGroup management') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/admin/users.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('user_management.User management') }}</h1>
+    <h1 id="admin-title" class="title">{{ t('user_management.User management') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/layout/admin.html

@@ -1,7 +1,7 @@
 {% extends '../layout-growi/base/layout.html' %}
 
 
-{% block main_css_class %}admin-page{% endblock %}
+{% block html_base_css %}admin-page{% endblock %}
 
 
 {% block html_additional_headers %}

+ 1 - 1
src/server/views/me/api_token.html

@@ -7,7 +7,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-  <h1 class="title" id="">{{ t('API Settings') }}</h1>
+  <h1 id="admin-title" class="title">{{ t('API Settings') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/me/external-accounts.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('user_management.external_account') }}</h1>
+    <h1 id="mypage-title" class="title">{{ t('user_management.external_account') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/me/index.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('User Settings') }}</h1>
+    <h1 id="mypage-title" class="title">{{ t('User Settings') }}</h1>
   </header>
 </div>
 {% endblock %}

+ 1 - 1
src/server/views/me/password.html

@@ -5,7 +5,7 @@
 {% block content_header %}
 <div class="header-wrap">
   <header id="page-header">
-    <h1 class="title" id="">{{ t('Password Settings') }}</h1>
+    <h1 id="mypage-title" class="title">{{ t('Password Settings') }}</h1>
   </header>
 </div>
 {% endblock %}