diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 030781f49a..086556707f 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -2,6 +2,8 @@ @return unquote("alpha(#{$c},#{$a})"); } +$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94); + * { padding: 0; -GtkToolButton-icon-spacing: 4; @@ -244,7 +246,7 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers } border-radius: 3px; - transition: all 200ms ease-out; + transition: all 200ms $ease-out-quad; @include entry(normal); &.flat, &.flat:focus { @@ -429,7 +431,7 @@ $_dot_color: if($variant=='light', $selected_bg_color, .button { - $_button_transition: all 200ms ease-out; + $_button_transition: all 200ms $ease-out-quad; border: 1px solid; border-radius: 3px; @@ -1548,7 +1550,7 @@ column-header.button.dnd { // for treeview-like derive widgets -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; - transition: all 200ms ease-out; + transition: all 200ms $ease-out-quad; &:backdrop { background-color: $backdrop_base_color; } @@ -2487,7 +2489,7 @@ GtkScrolledWindow { // transition .list-row, list-row.button { - transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + transition: all 300ms $ease-out-quad; &:hover { transition: none; } } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 7f103833ec..e86a4a2d26 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -168,7 +168,7 @@ GtkTextView { border: 1px solid; padding: 5px 8px 6px; border-radius: 3px; - transition: all 200ms ease-out; + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); background-color: transparent; background-image: linear-gradient(to bottom, #212121, #292929 90%); border-color: #1c1f1f; @@ -391,7 +391,7 @@ GtkCalendar.header .button.titlebutton { border: 1px solid; border-radius: 3px; padding: 5px 8px 6px; - transition: all 200ms ease-out; + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1c1f1f; @@ -412,12 +412,12 @@ GtkCalendar.header .button.titlebutton { .button.flat:hover, .header-bar .titlebutton.button:hover, .titlebar .titlebutton.button:hover, GtkCalendar.header .titlebutton.button:hover { - transition: all 200ms ease-out; + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; } .button.flat:hover:active, .header-bar .titlebutton.button:hover:active, .titlebar .titlebutton.button:hover:active, GtkCalendar.header .titlebutton.button:hover:active { - transition: all 200ms ease-out; } + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } .button:hover, .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover, GtkCalendar.header .button.titlebutton:hover { @@ -2194,7 +2194,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; - transition: all 200ms ease-out; } + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } .notebook:backdrop { background-color: #2c2c2c; } .notebook.frame { diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index edb473e40d..fe037ba5e4 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -168,7 +168,7 @@ GtkTextView { border: 1px solid; padding: 5px 8px 6px; border-radius: 3px; - transition: all 200ms ease-out; + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); background-color: transparent; background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); border-color: #a1a1a1; @@ -383,7 +383,7 @@ GtkCalendar.header .button.titlebutton { border: 1px solid; border-radius: 3px; padding: 5px 8px 6px; - transition: all 200ms ease-out; + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #a1a1a1; @@ -404,12 +404,12 @@ GtkCalendar.header .button.titlebutton { .button.flat:hover, .header-bar .titlebutton.button:hover, .titlebar .titlebutton.button:hover, GtkCalendar.header .titlebutton.button:hover { - transition: all 200ms ease-out; + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; } .button.flat:hover:active, .header-bar .titlebutton.button:hover:active, .titlebar .titlebutton.button:hover:active, GtkCalendar.header .titlebutton.button:hover:active { - transition: all 200ms ease-out; } + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } .button:hover, .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover, GtkCalendar.header .button.titlebutton:hover { @@ -2191,7 +2191,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove -GtkNotebook-has-tab-gap: false; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; - transition: all 200ms ease-out; } + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } .notebook:backdrop { background-color: #fcfcfc; } .notebook.frame {