Skip to content

Commit

Permalink
[modify] ユーザーメニューの遅延読み込み (#5167)
Browse files Browse the repository at this point in the history
* [modify] ユーザーメニューの遅延読み込み

* [modify] refactor SS_Dropdown

- remove unused methods
- safely call SS_Dropdown.render twice or more

* [modify] refactor SS_Font

* [modify] refactor SS_TextZoom

* [modify] refactor gws bookmark

* [J090-342] ユーザーナビゲーションの遅延読み込み

* [fix] spec failures

* [fixup] spec failures

* [modify] refactor w/ RuboCop

* [modify] refactor contrast

* [fixup^2] spec failures

* [fixup] refactor contrast

* [fixup] ユーザーメニューの遅延読み込み

* [modify] remove unnecessary assets

* [fix] spec failures
  • Loading branch information
sunny4381 committed Feb 8, 2024
1 parent bbf87b6 commit bd074d6
Show file tree
Hide file tree
Showing 80 changed files with 907 additions and 1,109 deletions.
129 changes: 0 additions & 129 deletions app/assets/javascripts/gws/lib/contrast.js

This file was deleted.

1 change: 0 additions & 1 deletion app/assets/javascripts/gws/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
//= require gws/lib/reminder
//= require gws/lib/bookmark
//= require gws/lib/readable_setting
//= require gws/lib/contrast
//= require gws/lib/workload
//= require gws/lib/search_form
//= require gws/schedule/lib/plan
Expand Down
50 changes: 50 additions & 0 deletions app/assets/stylesheets/gws/bookmark/_gws.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
.gws-bookmark-head {
display: inline-block;
padding: 10px;
&:hover {
background-color: #424242;
}
.bookmark-icon {
color: $white;
}
.dropdown-menu {
right: 0;
padding: 5px;
border: $border-gray4;
background-color: $white;
@include mb { left: 0; }
.bookmark-notice {
padding-bottom: 6px;
border-bottom: 1px solid #bebebe;
}
.name {
display: flex;
margin-top: 6px;
margin-bottom: 6px;
span {
width: 80px;
margin-top: 12px;
}
input[type=text] {
display: inline-block;
width: 240px;
}
}
.folder {
display: flex;
margin-bottom: 6px;
span {
width: 80px;
margin-top: 12px;
}
select {
display: inline-block;
width: 240px;
}
}
.btn {
margin-top: 5px;
margin-right: 5px;
}
}
}
55 changes: 55 additions & 0 deletions app/assets/stylesheets/gws/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/
@import "ss/init";
@import "board/gws";
@import "bookmark/gws";
@import "facility/gws";
@import "schedule/gws";
@import "circular/gws";
Expand Down Expand Up @@ -191,3 +192,57 @@ a.gws-category-label:hover {
padding-top: 20px;
border-top: 1px solid #eee;
}

// Locale switch
.gws-locale-switch {
color: $white;
a {
color: $white;
&:hover {
color: $white;
}
}
}

.user-navigation {
// Group Switch
.gws-group-switch-item {
display: flex;
align-items: center;
gap: 5px;
padding: 8px 10px;

&:hover {
background-color: #eee;
cursor: pointer;
}
}

// グループ名は最大2行
.gws-group-switch-name {
display: -webkit-box;
overflow: hidden;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}

// Contrast
.gws-contrast-item {
display: flex;
align-items: center;
gap: 5px;
padding: 8px 10px;

&:hover {
background-color: #eee;
cursor: pointer;
}
}

.gws-contrast-name {
display: -webkit-box;
overflow: hidden;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
}

0 comments on commit bd074d6

Please sign in to comment.