Fixed issues

tienhuynh5312 · Nov 26, 2021 · e82715b · e82715b
1 parent e03bab1
commit e82715b
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 27 deletions.
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css b/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css
@@ -1842,10 +1842,14 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
  color: rgba(255, 255, 255, 0.7);
  border-radius: 9999px;
  border: none;
- box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
+ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.25);
  icon-size: 64px;
 }
 
+.modal-dialog .user-icon {
+ box-shadow: none;
+}
+
 .user-icon:hover {
  color: white;
 }

diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light.css b/src/main/gnome-shell/shell-3-28/gnome-shell-light.css
@@ -1842,10 +1842,14 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
  color: rgba(255, 255, 255, 0.7);
  border-radius: 9999px;
  border: none;
- box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
+ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.25);
  icon-size: 64px;
 }
 
+.modal-dialog .user-icon {
+ box-shadow: none;
+}
+
 .user-icon:hover {
  color: white;
 }

diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell.css b/src/main/gnome-shell/shell-3-28/gnome-shell.css
@@ -1842,10 +1842,14 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
  color: rgba(255, 255, 255, 0.7);
  border-radius: 9999px;
  border: none;
- box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
+ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.25);
  icon-size: 64px;
 }
 
+.modal-dialog .user-icon {
+ box-shadow: none;
+}
+
 .user-icon:hover {
  color: white;
 }

diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css b/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css
@@ -1842,10 +1842,14 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
  color: rgba(255, 255, 255, 0.7);
  border-radius: 9999px;
  border: none;
- box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
+ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.25);
  icon-size: 64px;
 }
 
+.modal-dialog .user-icon {
+ box-shadow: none;
+}
+
 .user-icon:hover {
  color: white;
 }

diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light.css b/src/main/gnome-shell/shell-40-0/gnome-shell-light.css
@@ -1842,10 +1842,14 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
  color: rgba(255, 255, 255, 0.7);
  border-radius: 9999px;
  border: none;
- box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
+ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.25);
  icon-size: 64px;
 }
 
+.modal-dialog .user-icon {
+ box-shadow: none;
+}
+
 .user-icon:hover {
  color: white;
 }

diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell.css b/src/main/gnome-shell/shell-40-0/gnome-shell.css
@@ -1842,10 +1842,14 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
  color: rgba(255, 255, 255, 0.7);
  border-radius: 9999px;
  border: none;
- box-shadow: 0 3px 8px rgba(0, 0, 0, 0.25);
+ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.25);
  icon-size: 64px;
 }
 
+.modal-dialog .user-icon {
+ box-shadow: none;
+}
+
 .user-icon:hover {
  color: white;
 }

diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
@@ -3123,9 +3123,8 @@ menu > arrow,
 menu > arrow.top,
 .menu > arrow.top,
 .context-menu > arrow.top {
- margin-top: -4px;
- border-bottom: 1px solid rgba(255, 255, 255, 0.12);
- border-radius: 6px 6px 0 0;
+ margin-top: 0;
+ border-radius: 6px;
  -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -3134,8 +3133,7 @@ menu > arrow.bottom,
 .context-menu > arrow.bottom {
  margin-top: 8px;
  margin-bottom: -12px;
- border-top: 1px solid rgba(255, 255, 255, 0.12);
- border-radius: 0 0 6px 6px;
+ border-radius: 6px;
  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -5187,6 +5185,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
  border-radius: 12px;
+ border-radius: 14px;
  border: 2px solid #E0E0E0;
  background-clip: border-box;
 }

diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
@@ -3123,9 +3123,8 @@ menu > arrow,
 menu > arrow.top,
 .menu > arrow.top,
 .context-menu > arrow.top {
- margin-top: -4px;
- border-bottom: 1px solid rgba(0, 0, 0, 0.12);
- border-radius: 6px 6px 0 0;
+ margin-top: 0;
+ border-radius: 6px;
  -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -3134,8 +3133,7 @@ menu > arrow.bottom,
 .context-menu > arrow.bottom {
  margin-top: 8px;
  margin-bottom: -12px;
- border-top: 1px solid rgba(0, 0, 0, 0.12);
- border-radius: 0 0 6px 6px;
+ border-radius: 6px;
  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -5187,6 +5185,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
  border-radius: 12px;
+ border-radius: 14px;
  border: 2px solid #333333;
  background-clip: border-box;
 }

diff --git a/src/main/gtk-3.0/gtk.css b/src/main/gtk-3.0/gtk.css
@@ -3123,9 +3123,8 @@ menu > arrow,
 menu > arrow.top,
 .menu > arrow.top,
 .context-menu > arrow.top {
- margin-top: -4px;
- border-bottom: 1px solid rgba(0, 0, 0, 0.12);
- border-radius: 6px 6px 0 0;
+ margin-top: 0;
+ border-radius: 6px;
  -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
 }
 
@@ -3134,8 +3133,7 @@ menu > arrow.bottom,
 .context-menu > arrow.bottom {
  margin-top: 8px;
  margin-bottom: -12px;
- border-top: 1px solid rgba(0, 0, 0, 0.12);
- border-radius: 0 0 6px 6px;
+ border-radius: 6px;
  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
@@ -5187,6 +5185,7 @@ decoration:backdrop {
 
 .csd.popup decoration {
  border-radius: 12px;
+ border-radius: 14px;
  border: 2px solid #333333;
  background-clip: border-box;
 }

diff --git a/src/sass/gnome-shell/common/_misc.scss b/src/sass/gnome-shell/common/_misc.scss
@@ -11,8 +11,13 @@
  color: on(black, secondary);
  border-radius: $circular_radius;
  border: none;
- box-shadow: 0 3px 8px rgba(black, 0.25);
+ box-shadow: 0 2px 3px rgba(black, 0.25);
  icon-size: $base_icon_size * 4; // 64px
+ // margin: 6px;
+
+ .modal-dialog & {
+ box-shadow: none;
+ }
 
  &:hover {
  color: on(black);

diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
@@ -1712,17 +1712,17 @@ menu,
  color: $text-secondary;
 
  &.top {
- margin-top: -4px;
- border-bottom: 1px solid $divider;
- border-radius: $corner-radius $corner-radius 0 0;
+ margin-top: 0;
+ // border-bottom: 1px solid $divider;
+ border-radius: $corner-radius;
  -gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
  }
 
  &.bottom {
  margin-top: 4px * 2;
  margin-bottom: -4px * 3;
- border-top: 1px solid $divider;
- border-radius: 0 0 $corner-radius $corner-radius;
+ // border-top: 1px solid $divider;
+ border-radius: $corner-radius;
  -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
  }
 
@@ -3662,6 +3662,7 @@ decoration {
  @if $rimless == 'true' {
  box-shadow: $shadow-z4;
  } @else {
+ border-radius: $menu-radius + 2px;
  border: 2px solid $primary;
  background-clip: border-box;
  }