Merge branch 'master' of github.com:vinceliuice/Orchis-theme

3 years ago · 164ed9096b
parent 54e86f343f 6e29cbb231
commit 164ed9096b
12 changed files with 57 additions and 57 deletions
--- a/src/gnome-shell/sass/widgets/_popovers-42.scss
+++ b/src/gnome-shell/sass/widgets/_popovers-42.scss
@ -6,8 +6,8 @@
  -arrow-background-color: transparent;
  -arrow-border-width: 0;
  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
+  -arrow-base: 8px;
+  -arrow-rise: 4px;
  -arrow-box-shadow: none; //dreaming. bug #689995
 }

@ -16,6 +16,9 @@
  min-width: 15em;
  color: $fg_color;
  border: none;
+  padding: 0;
+  margin: 0;
+  border-radius: $popup_radius;

  //.popup-status-menu-item { font-weight: normal;  color: pink; } //dunno what that is
  &.panel-menu {
@ -26,11 +29,11 @@

 .popup-menu-content {
  padding: $container_padding;
-  margin: $container_padding 10px 13px 10px;
+  margin: 0 $container_padding / 2 $container_padding / 2;
  background-color: $menu_bg_color;
  border-radius: $popup_radius;
-  box-shadow: 0 3px 8px rgba(black, 0.2);
  border: none;
+  box-shadow: 0 3px 8px rgba(black, 0.2);
 }

 $submenu_item_radius: $popup_radius - $container_padding;
--- a/src/gnome-shell/sass/widgets/_popovers.scss
+++ b/src/gnome-shell/sass/widgets/_popovers.scss
@ -6,8 +6,8 @@
  -arrow-background-color: transparent;
  -arrow-border-width: 0;
  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
+  -arrow-base: $container_padding * 2;
+  -arrow-rise: $container_padding;
  -arrow-box-shadow: none; //dreaming. bug #689995
 }

--- a/src/gnome-shell/sass/widgets/_quick-settings.scss
+++ b/src/gnome-shell/sass/widgets/_quick-settings.scss
@ -1,14 +1,11 @@
 .quick-settings {
  padding: $container_padding * 3 !important;
  border-radius: 20px + $container_padding * 3 !important;
+  margin-top: $container_padding / 2;

  .icon-button, .button {
    padding: 12px;
  }
-
-  .popup-menu-content {
-    padding: $container_padding * 2 !important;
-  }
 }

 .quick-settings-grid {
@ -99,7 +96,7 @@
  color: rgba(black, 0.65) !important;
  border-radius: $container_padding * 5 !important;
  padding: $container_padding * 2;
-  margin: $container_padding * 2 $container_padding * 4.5 0;
+  margin: $container_padding * 2 $container_padding * 3.5 0;

  .popup-menu-item {
    border-radius: $circular_radius !important;
--- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
@ -440,8 +440,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  -arrow-background-color: transparent;
  -arrow-border-width: 0;
  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
+  -arrow-base: 8px;
+  -arrow-rise: 4px;
  -arrow-box-shadow: none;
 }

--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
@ -440,8 +440,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  -arrow-background-color: transparent;
  -arrow-border-width: 0;
  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
+  -arrow-base: 8px;
+  -arrow-rise: 4px;
  -arrow-box-shadow: none;
 }

--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
@ -440,8 +440,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  -arrow-background-color: transparent;
  -arrow-border-width: 0;
  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
+  -arrow-base: 12px;
+  -arrow-rise: 6px;
  -arrow-box-shadow: none;
 }

--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@ -440,8 +440,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  -arrow-background-color: transparent;
  -arrow-border-width: 0;
  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
+  -arrow-base: 12px;
+  -arrow-rise: 6px;
  -arrow-box-shadow: none;
 }

--- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
@ -494,8 +494,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  -arrow-background-color: transparent;
  -arrow-border-width: 0;
  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
+  -arrow-base: 8px;
+  -arrow-rise: 4px;
  -arrow-box-shadow: none;
 }

@ -503,6 +503,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  min-width: 15em;
  color: rgba(0, 0, 0, 0.87);
  border: none;
+  padding: 0;
+  margin: 0;
+  border-radius: 18px;
 }

 .popup-menu.panel-menu {
@ -512,11 +515,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

 .popup-menu-content {
  padding: 4px;
-  margin: 4px 10px 13px 10px;
+  margin: 0 2px 2px;
  background-color: rgba(255, 255, 255, 0.97);
  border-radius: 18px;
-  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
  border: none;
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
 }

 .popup-menu-item {
@ -1370,16 +1373,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .quick-settings {
  padding: 12px !important;
  border-radius: 32px !important;
+  margin-top: 2px;
 }

 .quick-settings .icon-button, .quick-settings .button {
  padding: 12px;
 }

-.quick-settings .popup-menu-content {
-  padding: 8px !important;
-}
-
 .quick-settings-grid {
  spacing-rows: 8px;
  spacing-columns: 8px;
@ -1507,7 +1507,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  color: rgba(0, 0, 0, 0.65) !important;
  border-radius: 20px !important;
  padding: 8px;
-  margin: 8px 18px 0;
+  margin: 8px 14px 0;
 }

 .quick-toggle-menu .popup-menu-item {
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
@ -494,8 +494,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  -arrow-background-color: transparent;
  -arrow-border-width: 0;
  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
+  -arrow-base: 8px;
+  -arrow-rise: 4px;
  -arrow-box-shadow: none;
 }

@ -503,6 +503,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  min-width: 15em;
  color: rgba(255, 255, 255, 0.9);
  border: none;
+  padding: 0;
+  margin: 0;
+  border-radius: 18px;
 }

 .popup-menu.panel-menu {
@ -512,11 +515,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

 .popup-menu-content {
  padding: 4px;
-  margin: 4px 10px 13px 10px;
+  margin: 0 2px 2px;
  background-color: rgba(32, 32, 32, 0.97);
  border-radius: 18px;
-  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
  border: none;
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
 }

 .popup-menu-item {
@ -1370,16 +1373,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .quick-settings {
  padding: 12px !important;
  border-radius: 32px !important;
+  margin-top: 2px;
 }

 .quick-settings .icon-button, .quick-settings .button {
  padding: 12px;
 }

-.quick-settings .popup-menu-content {
-  padding: 8px !important;
-}
-
 .quick-settings-grid {
  spacing-rows: 8px;
  spacing-columns: 8px;
@ -1507,7 +1507,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  color: rgba(0, 0, 0, 0.65) !important;
  border-radius: 20px !important;
  padding: 8px;
-  margin: 8px 18px 0;
+  margin: 8px 14px 0;
 }

 .quick-toggle-menu .popup-menu-item {
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
@ -494,8 +494,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  -arrow-background-color: transparent;
  -arrow-border-width: 0;
  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
+  -arrow-base: 8px;
+  -arrow-rise: 4px;
  -arrow-box-shadow: none;
 }

@ -503,6 +503,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  min-width: 15em;
  color: rgba(255, 255, 255, 0.9);
  border: none;
+  padding: 0;
+  margin: 0;
+  border-radius: 20px;
 }

 .popup-menu.panel-menu {
@ -512,11 +515,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

 .popup-menu-content {
  padding: 6px;
-  margin: 6px 10px 13px 10px;
+  margin: 0 3px 3px;
  background-color: rgba(32, 32, 32, 0.97);
  border-radius: 20px;
-  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
  border: none;
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
 }

 .popup-menu-item {
@ -1370,16 +1373,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .quick-settings {
  padding: 18px !important;
  border-radius: 38px !important;
+  margin-top: 3px;
 }

 .quick-settings .icon-button, .quick-settings .button {
  padding: 12px;
 }

-.quick-settings .popup-menu-content {
-  padding: 12px !important;
-}
-
 .quick-settings-grid {
  spacing-rows: 12px;
  spacing-columns: 12px;
@ -1507,7 +1507,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  color: rgba(0, 0, 0, 0.65) !important;
  border-radius: 30px !important;
  padding: 12px;
-  margin: 12px 27px 0;
+  margin: 12px 21px 0;
 }

 .quick-toggle-menu .popup-menu-item {
--- a/src/gnome-shell/shell-42-0/gnome-shell.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell.css
@ -494,8 +494,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  -arrow-background-color: transparent;
  -arrow-border-width: 0;
  -arrow-border-color: transparent;
-  -arrow-base: 64px;
-  -arrow-rise: 0;
+  -arrow-base: 8px;
+  -arrow-rise: 4px;
  -arrow-box-shadow: none;
 }

@ -503,6 +503,9 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  min-width: 15em;
  color: rgba(0, 0, 0, 0.87);
  border: none;
+  padding: 0;
+  margin: 0;
+  border-radius: 20px;
 }

 .popup-menu.panel-menu {
@ -512,11 +515,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

 .popup-menu-content {
  padding: 6px;
-  margin: 6px 10px 13px 10px;
+  margin: 0 3px 3px;
  background-color: rgba(255, 255, 255, 0.97);
  border-radius: 20px;
-  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
  border: none;
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.2);
 }

 .popup-menu-item {
@ -1370,16 +1373,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 .quick-settings {
  padding: 18px !important;
  border-radius: 38px !important;
+  margin-top: 3px;
 }

 .quick-settings .icon-button, .quick-settings .button {
  padding: 12px;
 }

-.quick-settings .popup-menu-content {
-  padding: 12px !important;
-}
-
 .quick-settings-grid {
  spacing-rows: 12px;
  spacing-columns: 12px;
@ -1507,7 +1507,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
  color: rgba(0, 0, 0, 0.65) !important;
  border-radius: 30px !important;
  padding: 12px;
-  margin: 12px 27px 0;
+  margin: 12px 21px 0;
 }

 .quick-toggle-menu .popup-menu-item {
--- a/src/gtk-2.0/common/main.rc
+++ b/src/gtk-2.0/common/main.rc
@ -41,10 +41,10 @@ style "default" {

  GtkButton::default-border         = {0, 0, 0, 0}
  GtkButton::default-outside-border = {0, 0, 0, 0}
-  GtkButton::inner-border           = {4, 4, 4, 4}
+  GtkButton::inner-border           = {0, 0, 0, 0}

  GtkEntry::state-hint   = 1
-  GtkEntry::inner-border = {4, 4, 4, 4}
+  GtkEntry::inner-border = {0, 0, 0, 0}

  GtkPaned::handle-size  = 8
  GtkHPaned::handle-size = 8