aboutsummaryrefslogtreecommitdiff
path: root/common/gtk-3.0/3.14/sass
diff options
context:
space:
mode:
authorHorst31802015-08-27 20:55:37 +0200
committerHorst31802015-08-27 21:03:06 +0200
commit8c0e60f997d70cdb63566f46390546691d947749 (patch)
tree817385dcb4158849dad6257e4c85ad2e3aef3e03 /common/gtk-3.0/3.14/sass
parentbd550a46d936226801cb9d8cef9ea6273894b51c (diff)
parentb811483e7f6fb97afa531a873c73a48f48ef8468 (diff)
downloadsolarc-theme-8c0e60f997d70cdb63566f46390546691d947749.tar.gz
solarc-theme-8c0e60f997d70cdb63566f46390546691d947749.tar.xz
solarc-theme-8c0e60f997d70cdb63566f46390546691d947749.zip
Merge branch 'master' into wip/3.18
Diffstat (limited to 'common/gtk-3.0/3.14/sass')
-rw-r--r--common/gtk-3.0/3.14/sass/_applications.scss10
-rw-r--r--common/gtk-3.0/3.14/sass/_common.scss6
-rw-r--r--common/gtk-3.0/3.14/sass/_drawing.scss6
3 files changed, 12 insertions, 10 deletions
diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss
index 4889325..cbf5da2 100644
--- a/common/gtk-3.0/3.14/sass/_applications.scss
+++ b/common/gtk-3.0/3.14/sass/_applications.scss
@@ -243,15 +243,15 @@ GbSearchBox.linked {
> GtkMenuButton.button:last-child:dir(ltr) {
border-left-style: none;
- border-radius: 0 14.5px 14.5px 0;
- outline-radius: 0 12.5px 12.5px 0;
+ border-radius: 0 3px 3px 0;
+ outline-radius: 0 1px 1px 0;
&:hover { box-shadow: -1px 0 $selected_bg_color; }
}
> GtkMenuButton.button:first-child:dir(rtl) {
border-right-style: none;
- border-radius: 14.5px 0 0 14.5px;
- outline-radius: 12.5px 0 0 12.5px;
+ border-radius: 3px 0 0 3px;
+ outline-radius: 1px 0 0 1px;
&:hover { box-shadow: 1px 0 $selected_bg_color; }
}
@@ -537,7 +537,7 @@ MarlinViewWindow *:selected:focus {
}
.marlin-pathbar.pathbar {
- border-radius: 14.5px;
+ border-radius: 3px;
@include entry(header-normal);
&:focus { @include entry(header-focus) }
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index d9e56c9..d7ca6fe 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -213,11 +213,11 @@ GtkFlowBox .grid-child {
border: 1px solid;
padding: 5px 8px 6px;
- border-radius: 15px;
+ border-radius: 3px;
transition: all 200ms $ease-out-quad;
@include entry(normal);
- .header-bar & { padding: 6px 11px; }
+ .header-bar & { padding: 6px; }
//&.image { // icons inside the entry
// &.left { padding-left: 0; }
@@ -357,6 +357,8 @@ GtkFlowBox .grid-child {
}
}
+GtkSearchEntry.entry { border-radius: 20px; }
+
/***********
* Buttons *
***********/
diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss
index c073126..2cb08e1 100644
--- a/common/gtk-3.0/3.14/sass/_drawing.scss
+++ b/common/gtk-3.0/3.14/sass/_drawing.scss
@@ -168,9 +168,9 @@
//
// insensitive pushed button
//
- color: transparentize($selected_fg_color, 0.45);
- border-color: transparentize($selected_bg_color, 0.45);
- background-color: transparentize($selected_bg_color, 0.45);
+ color: transparentize($selected_fg_color, 0.2);
+ border-color: transparentize($selected_bg_color, 0.25);
+ background-color: transparentize($selected_bg_color, 0.25);
opacity: 0.6;