Yuki Takei 6 лет назад
Родитель
Сommit
bca5a04a08

+ 2 - 7
src/client/styles/scss/_admin.scss

@@ -1,11 +1,6 @@
 .admin-page {
-  .admin-title {
-    padding: 0.5rem 15px;
-
-    line-height: 1em;
-
-    @include variable-font-size(28px);
-    line-height: 1.1em;
+  .grw-header.sticky-top {
+    height: unset;
   }
 
   .admin-user-menu {

+ 0 - 4
src/client/styles/scss/_layout.scss

@@ -47,10 +47,6 @@
 .grw-sidebar-content-container {
 }
 
-/*
- * header
- */
-
 .grw-modal-head {
   font-size: 1em;
   border-bottom: 1px solid $grw-line-gray;

+ 5 - 0
src/client/styles/scss/_me.scss

@@ -0,0 +1,5 @@
+.user-settings-page {
+  .grw-header.sticky-top {
+    height: unset;
+  }
+}

+ 13 - 1
src/client/styles/scss/_subnav.scss

@@ -45,8 +45,20 @@ $easeInOutCubic: cubic-bezier(0.65, 0, 0.35, 1);
 }
 
 /*
- * styles
+ * Styles
  */
+
+.grw-header {
+  .title {
+    padding: 0.5rem 15px;
+
+    line-height: 1em;
+
+    @include variable-font-size(28px);
+    line-height: 1.1em;
+  }
+}
+
 .grw-subnavbar {
   &:hover {
     .btn-copy,

+ 1 - 0
src/client/styles/scss/style-app.scss

@@ -41,6 +41,7 @@
 @import 'layout_kibela';
 @import 'layout_variable';
 @import 'login';
+@import 'me';
 @import 'navbar';
 @import 'navbar_kibela';
 @import 'notification';

+ 2 - 1
src/client/styles/scss/theme/_apply-colors-light.scss

@@ -26,7 +26,8 @@
 /*
  * GROWI subnavigation
  */
-.admin-page {
+.admin-page,
+.user-settings-page {
   .grw-header {
     background-color: rgba(darken($bgcolor-global, 6%), 0.9);
   }

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('User_Management')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('User_Management') }}</h1>
+<h1 class="title">{{ t('User_Management') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('App settings') }}</h1>
+<h1 class="title">{{ t('App settings') }}</h1>
 {% endblock %}
 
 

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

@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('Customize') }}</h1>
+<h1 class="title">{{ t('Customize') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('Export Archive Data')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('Export Archive Data') }}</h1>
+<h1 class="title">{{ t('Export Archive Data') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('external_account_management')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('User_Management') }} / {{ t('external_account_management') }}</h1>
+<h1 class="title">{{ t('User_Management') }} / {{ t('external_account_management') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('Notification settings')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('Notification settings') }}</h1>
+<h1 class="title">{{ t('Notification settings') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('Import Data')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('Import Data') }}</h1>
+<h1 class="title">{{ t('Import Data') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('Management Wiki Home')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title"> {{ t('Management Wiki Home') }}</h1>
+<h1 class="title"> {{ t('Management Wiki Home') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -4,7 +4,7 @@
  · {{ path }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('Markdown Settings') }}</h1>
+<h1 class="title">{{ t('Markdown Settings') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('Notification settings')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('Notification settings') }}</h1>
+<h1 class="title">{{ t('Notification settings') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('Full Text Search management')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('Full Text Search management') }}</h1>
+<h1 class="title">{{ t('Full Text Search management') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('security_settings')) }} · {% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('security_settings') }}</h1>
+<h1 class="title">{{ t('security_settings') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('UserGroup Management') + '/' + userGroup.name) | preventXss }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('UserGroup Management') + '/' + userGroup.name | preventXss }}</h1>
+<h1 class="title">{{ t('UserGroup Management') + '/' + userGroup.name | preventXss }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('UserGroup Management')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('UserGroup Management') }}</h1>
+<h1 class="title">{{ t('UserGroup Management') }}</h1>
 {% endblock %}
 
 {% block content_main %}

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

@@ -3,7 +3,7 @@
 {% block html_title %}{{ customizeService.generateCustomTitle(t('User_Management')) }}{% endblock %}
 
 {% block content_header %}
-<h1 class="admin-title">{{ t('User_Management') }}</h1>
+<h1 class="title">{{ t('User_Management') }}</h1>
 {% endblock %}
 
 {% block content_main %}

+ 2 - 0
src/server/views/me/index.html

@@ -2,6 +2,8 @@
 
 {% block html_title %}{{ customizeService.generateCustomTitle(t('User Settings')) }}{% endblock %}
 
+{% block html_base_css %}user-settings-page{% endblock %}
+
 {% block content_header %}
 <h1 class="title">{{ t('User Settings') }}</h1>
 {% endblock %}

+ 1 - 1
src/server/views/tags.html

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