[gtk+] Adwaita: border radiusses rationalization
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: border radiusses rationalization
- Date: Thu, 30 Oct 2014 16:51:37 +0000 (UTC)
commit fdbb93d78c354b5ee8dd89a629c00e3bea079627
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Thu Oct 30 13:18:48 2014 +0100
Adwaita: border radiusses rationalization
gtk/resources/theme/Adwaita/_common.scss | 9 ++++-----
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 8 ++++----
gtk/resources/theme/Adwaita/gtk-contained.css | 8 ++++----
3 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index bc4b41f..267b9ce 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -493,7 +493,7 @@ $_dot_color: if($variant=='light', $selected_bg_color,
&.osd {
&.image-button { padding: 13px; }
color: $osd_fg_color;
- border-radius: 6px;
+ border-radius: 5px;
outline-color: transparentize($osd_fg_color, 0.7); //FIXME: define a color var?
@include button(osd);
border: none;
@@ -1123,7 +1123,7 @@ GtkComboBox {
.osd &, &.osd {
padding: 13px;
border: none;
- border-radius: 6px;
+ border-radius: 5px;
background-color: $osd_bg_color;
}
}
@@ -1134,7 +1134,7 @@ GtkComboBox {
@extend %inset-bar;
border-width: 0 1px 1px;
padding: 3px;
- border-radius: 0 0 4px 4px;
+ border-radius: 0 0 5px 5px;
}
.search-bar, .location-bar {
@extend .toolbar;
@@ -1549,7 +1549,6 @@ column-header.button.dnd { // for treeview-like derive widgets
padding: 2px;
border: 1px solid $borders-color;
border-radius: 5px;
- //background-clip: border-box;
background-color: $bg_color;
box-shadow: 0 2px 3px transparentize(black, 0.5);
@@ -3024,7 +3023,7 @@ GtkColorSwatch {
&:hover {
@extend %undecorated_button;
background-color: transparentize($fg_color,0.9);
- border-radius: 4px;
+ border-radius: 5px;
}
&:backdrop,
&:backdrop:hover,
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index d59f2b0..beb4151 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -572,7 +572,7 @@ GtkCalendar.header .button.titlebutton {
.titlebar .osd.button.titlebutton,
GtkCalendar.header .osd.button.titlebutton {
color: #eeeeec;
- border-radius: 6px;
+ border-radius: 5px;
outline-color: rgba(238, 238, 236, 0.3);
color: #eeeeec;
border-color: rgba(0, 0, 0, 0.7);
@@ -1744,13 +1744,13 @@ GtkComboBox {
.osd .toolbar, .osd .inline-toolbar, .osd .search-bar, .osd .location-bar, .toolbar.osd,
.osd.inline-toolbar, .osd.search-bar, .osd.location-bar {
padding: 13px;
border: none;
- border-radius: 6px;
+ border-radius: 5px;
background-color: rgba(46, 52, 54, 0.7); }
.inline-toolbar {
border-width: 0 1px 1px;
padding: 3px;
- border-radius: 0 0 4px 4px; }
+ border-radius: 0 0 5px 5px; }
.search-bar, .location-bar {
border-width: 0 0 1px;
@@ -4486,7 +4486,7 @@ GtkCalendar.header .scale-popup .button.titlebutton {
padding: 6px; }
.scale-popup .button:hover {
background-color: rgba(238, 238, 236, 0.1);
- border-radius: 4px; }
+ border-radius: 5px; }
GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
.titlebar GtkVolumeButton.button.titlebutton,
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 3f9f10c..49f336d 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -564,7 +564,7 @@ GtkCalendar.header .button.titlebutton {
.titlebar .osd.button.titlebutton,
GtkCalendar.header .osd.button.titlebutton {
color: #eeeeec;
- border-radius: 6px;
+ border-radius: 5px;
outline-color: rgba(238, 238, 236, 0.3);
color: #eeeeec;
border-color: rgba(0, 0, 0, 0.7);
@@ -1736,13 +1736,13 @@ GtkComboBox {
.osd .toolbar, .osd .inline-toolbar, .osd .search-bar, .osd .location-bar, .toolbar.osd,
.osd.inline-toolbar, .osd.search-bar, .osd.location-bar {
padding: 13px;
border: none;
- border-radius: 6px;
+ border-radius: 5px;
background-color: rgba(46, 52, 54, 0.7); }
.inline-toolbar {
border-width: 0 1px 1px;
padding: 3px;
- border-radius: 0 0 4px 4px; }
+ border-radius: 0 0 5px 5px; }
.search-bar, .location-bar {
border-width: 0 0 1px;
@@ -4647,7 +4647,7 @@ GtkCalendar.header .scale-popup .button.titlebutton {
padding: 6px; }
.scale-popup .button:hover {
background-color: rgba(46, 52, 54, 0.1);
- border-radius: 4px; }
+ border-radius: 5px; }
GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
.titlebar GtkVolumeButton.button.titlebutton,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]