aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/gtk-3.0/3.20/gtk-dark.css34
-rw-r--r--common/gtk-3.0/3.20/gtk-darker.css34
-rw-r--r--common/gtk-3.0/3.20/gtk-solid-dark.css34
-rw-r--r--common/gtk-3.0/3.20/gtk-solid-darker.css34
-rw-r--r--common/gtk-3.0/3.20/gtk-solid.css34
-rw-r--r--common/gtk-3.0/3.20/gtk.css34
-rw-r--r--common/gtk-3.0/3.20/sass/_applications.scss14
7 files changed, 104 insertions, 114 deletions
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 3104566..cb1682b 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -2476,32 +2476,32 @@ infobar {
background-color: #5294E2;
color: #ffffff; }
-row:selected button, infobar button {
+row:selected button, infobar button, .floating-bar button {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.5); }
- row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button {
+ row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button, .floating-bar button.flat, .floating-bar button.sidebar-button {
border-color: transparent;
background-color: transparent;
background-image: none;
color: #ffffff;
background-color: rgba(255, 255, 255, 0); }
- row:selected button:hover, infobar button:hover {
+ row:selected button:hover, infobar button:hover, .floating-bar button:hover {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.8); }
- row:selected button:active, infobar button:active, row:selected button:active:hover, infobar button:active:hover, row:selected button:checked, infobar button:checked {
+ row:selected button:active, infobar button:active, .floating-bar button:active, row:selected button:active:hover, infobar button:active:hover, .floating-bar button:active:hover, row:selected button:checked, infobar button:checked, .floating-bar button:checked {
color: #5294E2;
outline-color: rgba(82, 148, 226, 0.3);
background-color: #ffffff;
border-color: #ffffff; }
- row:selected button:disabled, infobar button:disabled {
+ row:selected button:disabled, infobar button:disabled, .floating-bar button:disabled {
color: rgba(255, 255, 255, 0.4);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.2); }
- row:selected button:disabled:active, infobar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked {
+ row:selected button:disabled:active, infobar button:disabled:active, .floating-bar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked, .floating-bar button:disabled:checked {
color: rgba(82, 148, 226, 0.4);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.2); }
@@ -2956,20 +2956,18 @@ button.documents-favorite:active:hover {
background-color: rgba(27, 29, 35, 0.95); }
.floating-bar {
+ padding: 1px;
background-color: #5294E2;
- color: #ffffff; }
- .floating-bar.top {
- border-radius: 0 0 2px 2px; }
- .floating-bar.right {
- border-radius: 2px 0 0 2px; }
- .floating-bar.bottom {
- border-radius: 2px 2px 0 0; }
- .floating-bar.left {
- border-radius: 0 2px 2px 0; }
+ color: #ffffff;
+ border-radius: 2px 2px 0 0; }
+ .floating-bar.bottom.left {
+ border-top-left-radius: 0; }
+ .floating-bar.bottom.right {
+ border-top-right-radius: 0; }
.floating-bar button {
- background-color: transparent;
- box-shadow: none;
- border: none; }
+ border: none;
+ border-radius: 0;
+ min-height: 0; }
.marlin-pathbar.pathbar {
border-radius: 3px;
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index b8159d4..8264c71 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -2475,32 +2475,32 @@ infobar {
background-color: #5294E2;
color: #ffffff; }
-row:selected button, infobar button {
+row:selected button, infobar button, .floating-bar button {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.5); }
- row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button {
+ row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button, .floating-bar button.flat, .floating-bar button.sidebar-button {
border-color: transparent;
background-color: transparent;
background-image: none;
color: #ffffff;
background-color: rgba(255, 255, 255, 0); }
- row:selected button:hover, infobar button:hover {
+ row:selected button:hover, infobar button:hover, .floating-bar button:hover {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.8); }
- row:selected button:active, infobar button:active, row:selected button:active:hover, infobar button:active:hover, row:selected button:checked, infobar button:checked {
+ row:selected button:active, infobar button:active, .floating-bar button:active, row:selected button:active:hover, infobar button:active:hover, .floating-bar button:active:hover, row:selected button:checked, infobar button:checked, .floating-bar button:checked {
color: #5294E2;
outline-color: rgba(82, 148, 226, 0.3);
background-color: #ffffff;
border-color: #ffffff; }
- row:selected button:disabled, infobar button:disabled {
+ row:selected button:disabled, infobar button:disabled, .floating-bar button:disabled {
color: rgba(255, 255, 255, 0.4);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.2); }
- row:selected button:disabled:active, infobar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked {
+ row:selected button:disabled:active, infobar button:disabled:active, .floating-bar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked, .floating-bar button:disabled:checked {
color: rgba(82, 148, 226, 0.4);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.2); }
@@ -2955,20 +2955,18 @@ button.documents-favorite:active:hover {
background-color: rgba(27, 29, 35, 0.95); }
.floating-bar {
+ padding: 1px;
background-color: #5294E2;
- color: #ffffff; }
- .floating-bar.top {
- border-radius: 0 0 2px 2px; }
- .floating-bar.right {
- border-radius: 2px 0 0 2px; }
- .floating-bar.bottom {
- border-radius: 2px 2px 0 0; }
- .floating-bar.left {
- border-radius: 0 2px 2px 0; }
+ color: #ffffff;
+ border-radius: 2px 2px 0 0; }
+ .floating-bar.bottom.left {
+ border-top-left-radius: 0; }
+ .floating-bar.bottom.right {
+ border-top-right-radius: 0; }
.floating-bar button {
- background-color: transparent;
- box-shadow: none;
- border: none; }
+ border: none;
+ border-radius: 0;
+ min-height: 0; }
.marlin-pathbar.pathbar {
border-radius: 3px;
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 2068d8a..d20952e 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -2476,32 +2476,32 @@ infobar {
background-color: #5294E2;
color: #ffffff; }
-row:selected button, infobar button {
+row:selected button, infobar button, .floating-bar button {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.5); }
- row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button {
+ row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button, .floating-bar button.flat, .floating-bar button.sidebar-button {
border-color: transparent;
background-color: transparent;
background-image: none;
color: #ffffff;
background-color: rgba(255, 255, 255, 0); }
- row:selected button:hover, infobar button:hover {
+ row:selected button:hover, infobar button:hover, .floating-bar button:hover {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.8); }
- row:selected button:active, infobar button:active, row:selected button:active:hover, infobar button:active:hover, row:selected button:checked, infobar button:checked {
+ row:selected button:active, infobar button:active, .floating-bar button:active, row:selected button:active:hover, infobar button:active:hover, .floating-bar button:active:hover, row:selected button:checked, infobar button:checked, .floating-bar button:checked {
color: #5294E2;
outline-color: rgba(82, 148, 226, 0.3);
background-color: #ffffff;
border-color: #ffffff; }
- row:selected button:disabled, infobar button:disabled {
+ row:selected button:disabled, infobar button:disabled, .floating-bar button:disabled {
color: rgba(255, 255, 255, 0.4);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.2); }
- row:selected button:disabled:active, infobar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked {
+ row:selected button:disabled:active, infobar button:disabled:active, .floating-bar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked, .floating-bar button:disabled:checked {
color: rgba(82, 148, 226, 0.4);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.2); }
@@ -2956,20 +2956,18 @@ button.documents-favorite:active:hover {
background-color: #1b1d23; }
.floating-bar {
+ padding: 1px;
background-color: #5294E2;
- color: #ffffff; }
- .floating-bar.top {
- border-radius: 0 0 2px 2px; }
- .floating-bar.right {
- border-radius: 2px 0 0 2px; }
- .floating-bar.bottom {
- border-radius: 2px 2px 0 0; }
- .floating-bar.left {
- border-radius: 0 2px 2px 0; }
+ color: #ffffff;
+ border-radius: 2px 2px 0 0; }
+ .floating-bar.bottom.left {
+ border-top-left-radius: 0; }
+ .floating-bar.bottom.right {
+ border-top-right-radius: 0; }
.floating-bar button {
- background-color: transparent;
- box-shadow: none;
- border: none; }
+ border: none;
+ border-radius: 0;
+ min-height: 0; }
.marlin-pathbar.pathbar {
border-radius: 3px;
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index b6c60df..feeb515 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -2475,32 +2475,32 @@ infobar {
background-color: #5294E2;
color: #ffffff; }
-row:selected button, infobar button {
+row:selected button, infobar button, .floating-bar button {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.5); }
- row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button {
+ row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button, .floating-bar button.flat, .floating-bar button.sidebar-button {
border-color: transparent;
background-color: transparent;
background-image: none;
color: #ffffff;
background-color: rgba(255, 255, 255, 0); }
- row:selected button:hover, infobar button:hover {
+ row:selected button:hover, infobar button:hover, .floating-bar button:hover {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.8); }
- row:selected button:active, infobar button:active, row:selected button:active:hover, infobar button:active:hover, row:selected button:checked, infobar button:checked {
+ row:selected button:active, infobar button:active, .floating-bar button:active, row:selected button:active:hover, infobar button:active:hover, .floating-bar button:active:hover, row:selected button:checked, infobar button:checked, .floating-bar button:checked {
color: #5294E2;
outline-color: rgba(82, 148, 226, 0.3);
background-color: #ffffff;
border-color: #ffffff; }
- row:selected button:disabled, infobar button:disabled {
+ row:selected button:disabled, infobar button:disabled, .floating-bar button:disabled {
color: rgba(255, 255, 255, 0.4);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.2); }
- row:selected button:disabled:active, infobar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked {
+ row:selected button:disabled:active, infobar button:disabled:active, .floating-bar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked, .floating-bar button:disabled:checked {
color: rgba(82, 148, 226, 0.4);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.2); }
@@ -2955,20 +2955,18 @@ button.documents-favorite:active:hover {
background-color: #1b1d23; }
.floating-bar {
+ padding: 1px;
background-color: #5294E2;
- color: #ffffff; }
- .floating-bar.top {
- border-radius: 0 0 2px 2px; }
- .floating-bar.right {
- border-radius: 2px 0 0 2px; }
- .floating-bar.bottom {
- border-radius: 2px 2px 0 0; }
- .floating-bar.left {
- border-radius: 0 2px 2px 0; }
+ color: #ffffff;
+ border-radius: 2px 2px 0 0; }
+ .floating-bar.bottom.left {
+ border-top-left-radius: 0; }
+ .floating-bar.bottom.right {
+ border-top-right-radius: 0; }
.floating-bar button {
- background-color: transparent;
- box-shadow: none;
- border: none; }
+ border: none;
+ border-radius: 0;
+ min-height: 0; }
.marlin-pathbar.pathbar {
border-radius: 3px;
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 0e66725..d0eeb07 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -2479,32 +2479,32 @@ infobar {
background-color: #5294E2;
color: #ffffff; }
-row:selected button, infobar button {
+row:selected button, infobar button, .floating-bar button {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.5); }
- row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button {
+ row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button, .floating-bar button.flat, .floating-bar button.sidebar-button {
border-color: transparent;
background-color: transparent;
background-image: none;
color: #ffffff;
background-color: rgba(255, 255, 255, 0); }
- row:selected button:hover, infobar button:hover {
+ row:selected button:hover, infobar button:hover, .floating-bar button:hover {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.8); }
- row:selected button:active, infobar button:active, row:selected button:active:hover, infobar button:active:hover, row:selected button:checked, infobar button:checked {
+ row:selected button:active, infobar button:active, .floating-bar button:active, row:selected button:active:hover, infobar button:active:hover, .floating-bar button:active:hover, row:selected button:checked, infobar button:checked, .floating-bar button:checked {
color: #5294E2;
outline-color: rgba(82, 148, 226, 0.3);
background-color: #ffffff;
border-color: #ffffff; }
- row:selected button:disabled, infobar button:disabled {
+ row:selected button:disabled, infobar button:disabled, .floating-bar button:disabled {
color: rgba(255, 255, 255, 0.4);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.2); }
- row:selected button:disabled:active, infobar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked {
+ row:selected button:disabled:active, infobar button:disabled:active, .floating-bar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked, .floating-bar button:disabled:checked {
color: rgba(82, 148, 226, 0.4);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.2); }
@@ -2959,20 +2959,18 @@ button.documents-favorite:active:hover {
background-color: #1b1d23; }
.floating-bar {
+ padding: 1px;
background-color: #5294E2;
- color: #ffffff; }
- .floating-bar.top {
- border-radius: 0 0 2px 2px; }
- .floating-bar.right {
- border-radius: 2px 0 0 2px; }
- .floating-bar.bottom {
- border-radius: 2px 2px 0 0; }
- .floating-bar.left {
- border-radius: 0 2px 2px 0; }
+ color: #ffffff;
+ border-radius: 2px 2px 0 0; }
+ .floating-bar.bottom.left {
+ border-top-left-radius: 0; }
+ .floating-bar.bottom.right {
+ border-top-right-radius: 0; }
.floating-bar button {
- background-color: transparent;
- box-shadow: none;
- border: none; }
+ border: none;
+ border-radius: 0;
+ min-height: 0; }
.marlin-pathbar.pathbar {
border-radius: 3px;
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 223ff4d..59d6bc0 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -2479,32 +2479,32 @@ infobar {
background-color: #5294E2;
color: #ffffff; }
-row:selected button, infobar button {
+row:selected button, infobar button, .floating-bar button {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.5); }
- row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button {
+ row:selected button.flat, row:selected button.sidebar-button, infobar button.flat, infobar button.sidebar-button, .floating-bar button.flat, .floating-bar button.sidebar-button {
border-color: transparent;
background-color: transparent;
background-image: none;
color: #ffffff;
background-color: rgba(255, 255, 255, 0); }
- row:selected button:hover, infobar button:hover {
+ row:selected button:hover, infobar button:hover, .floating-bar button:hover {
color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.8); }
- row:selected button:active, infobar button:active, row:selected button:active:hover, infobar button:active:hover, row:selected button:checked, infobar button:checked {
+ row:selected button:active, infobar button:active, .floating-bar button:active, row:selected button:active:hover, infobar button:active:hover, .floating-bar button:active:hover, row:selected button:checked, infobar button:checked, .floating-bar button:checked {
color: #5294E2;
outline-color: rgba(82, 148, 226, 0.3);
background-color: #ffffff;
border-color: #ffffff; }
- row:selected button:disabled, infobar button:disabled {
+ row:selected button:disabled, infobar button:disabled, .floating-bar button:disabled {
color: rgba(255, 255, 255, 0.4);
background-color: rgba(255, 255, 255, 0);
border-color: rgba(255, 255, 255, 0.2); }
- row:selected button:disabled:active, infobar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked {
+ row:selected button:disabled:active, infobar button:disabled:active, .floating-bar button:disabled:active, row:selected button:disabled:checked, infobar button:disabled:checked, .floating-bar button:disabled:checked {
color: rgba(82, 148, 226, 0.4);
background-color: rgba(255, 255, 255, 0.2);
border-color: rgba(255, 255, 255, 0.2); }
@@ -2959,20 +2959,18 @@ button.documents-favorite:active:hover {
background-color: rgba(27, 29, 35, 0.95); }
.floating-bar {
+ padding: 1px;
background-color: #5294E2;
- color: #ffffff; }
- .floating-bar.top {
- border-radius: 0 0 2px 2px; }
- .floating-bar.right {
- border-radius: 2px 0 0 2px; }
- .floating-bar.bottom {
- border-radius: 2px 2px 0 0; }
- .floating-bar.left {
- border-radius: 0 2px 2px 0; }
+ color: #ffffff;
+ border-radius: 2px 2px 0 0; }
+ .floating-bar.bottom.left {
+ border-top-left-radius: 0; }
+ .floating-bar.bottom.right {
+ border-top-right-radius: 0; }
.floating-bar button {
- background-color: transparent;
- box-shadow: none;
- border: none; }
+ border: none;
+ border-radius: 0;
+ min-height: 0; }
.marlin-pathbar.pathbar {
border-radius: 3px;
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 90c29e0..09efc45 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -426,18 +426,20 @@ button.documents-favorite:active:hover {
// Floating Bar
//
.floating-bar {
+ padding: 1px;
background-color: $selected_bg_color;
color: $selected_fg_color;
+ border-radius: 2px 2px 0 0;
- &.top { border-radius: 0 0 2px 2px; }
- &.right { border-radius: 2px 0 0 2px; }
- &.bottom { border-radius: 2px 2px 0 0; }
- &.left { border-radius: 0 2px 2px 0; }
+ &.bottom.left { border-top-left-radius: 0; }
+ &.bottom.right { border-top-right-radius: 0; }
button {
- background-color: transparent;
- box-shadow: none;
border: none;
+ border-radius: 0;
+ min-height: 0;
+
+ @extend %selected-button;
}
}