1
0
mirror of https://github.com/horst3180/arc-theme.git synced 2024-10-27 19:04:02 +00:00

merge 3.16

This commit is contained in:
Horst3180 2015-08-21 19:01:03 +02:00
parent 9638b6ce7f
commit bd550a46d9
7 changed files with 286 additions and 323 deletions

View File

@ -191,6 +191,17 @@ GtkTextView {
background-image: none;
background-color: transparent;
box-shadow: none; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.entry.error {
color: white;
border-color: #FC4138;
@ -217,21 +228,7 @@ GtkTextView {
color: #D3DAE3; }
.entry.image:active {
color: #5294E2; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.linked.vertical > .entry {
.linked.vertical > .entry {
border-bottom-color: #353841;
box-shadow: none; }
.linked.vertical > .entry:focus {
@ -253,16 +250,16 @@ GtkTextView {
box-shadow: 0 -1px 0 0 #5294E2; }
.linked.vertical > .entry:last-child:insensitive {
border-bottom-color: rgba(0, 0, 0, 0.14); }
.osd .linked.vertical > .entry {
.osd .entry {
color: #BAC3CF;
border-color: rgba(0, 0, 0, 0.4);
background-color: transparent;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:focus {
.osd .entry:focus {
color: #BAC3CF;
border-color: #5294E2;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:insensitive {
.osd .entry:insensitive {
color: #555a62;
border-color: rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@ -526,8 +523,7 @@ GtkTextView {
.stack-switcher > .button.needs-attention > .label:dir(rtl),
.stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
background-position: left 3px, left 2px; }
.inline-toolbar .button, .inline-toolbar .button:backdrop {
.inline-toolbar .button, .inline-toolbar .button:backdrop {
border-radius: 2px;
border-width: 1px; }
@ -801,7 +797,6 @@ GtkTextView {
/* menu buttons */
.menuitem.button.flat, .menuitem.sidebar-button.button {
transition: none;
color: #D3DAE3;
outline-offset: -1px;
border-radius: 2px; }
.menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {

View File

@ -191,6 +191,17 @@ GtkTextView {
background-image: none;
background-color: transparent;
box-shadow: none; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.entry.error {
color: white;
border-color: #FC4138;
@ -217,21 +228,7 @@ GtkTextView {
color: #5c616c; }
.entry.image:active {
color: #5294E2; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.linked.vertical > .entry {
.linked.vertical > .entry {
border-bottom-color: #f4f5f6;
box-shadow: none; }
.linked.vertical > .entry:focus {
@ -253,16 +250,16 @@ GtkTextView {
box-shadow: 0 -1px 0 0 #5294E2; }
.linked.vertical > .entry:last-child:insensitive {
border-bottom-color: rgba(0, 0, 0, 0.14); }
.osd .linked.vertical > .entry {
.osd .entry {
color: #BAC3CF;
border-color: rgba(0, 0, 0, 0.4);
background-color: transparent;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:focus {
.osd .entry:focus {
color: #BAC3CF;
border-color: #5294E2;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:insensitive {
.osd .entry:insensitive {
color: #555a62;
border-color: rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@ -526,8 +523,7 @@ GtkTextView {
.stack-switcher > .button.needs-attention > .label:dir(rtl),
.stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
background-position: left 3px, left 4px; }
.inline-toolbar .button, .inline-toolbar .button:backdrop {
.inline-toolbar .button, .inline-toolbar .button:backdrop {
border-radius: 2px;
border-width: 1px; }
@ -801,7 +797,6 @@ GtkTextView {
/* menu buttons */
.menuitem.button.flat, .menuitem.sidebar-button.button {
transition: none;
color: #5c616c;
outline-offset: -1px;
border-radius: 2px; }
.menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {

View File

@ -191,6 +191,17 @@ GtkTextView {
background-image: none;
background-color: transparent;
box-shadow: none; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.entry.error {
color: white;
border-color: #FC4138;
@ -217,21 +228,7 @@ GtkTextView {
color: #D3DAE3; }
.entry.image:active {
color: #5294E2; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.linked.vertical > .entry {
.linked.vertical > .entry {
border-bottom-color: #353841;
box-shadow: none; }
.linked.vertical > .entry:focus {
@ -253,16 +250,16 @@ GtkTextView {
box-shadow: 0 -1px 0 0 #5294E2; }
.linked.vertical > .entry:last-child:insensitive {
border-bottom-color: rgba(0, 0, 0, 0.14); }
.osd .linked.vertical > .entry {
.osd .entry {
color: #BAC3CF;
border-color: rgba(0, 0, 0, 0.4);
background-color: transparent;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:focus {
.osd .entry:focus {
color: #BAC3CF;
border-color: #5294E2;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:insensitive {
.osd .entry:insensitive {
color: #555a62;
border-color: rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@ -526,8 +523,7 @@ GtkTextView {
.stack-switcher > .button.needs-attention > .label:dir(rtl),
.stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
background-position: left 3px, left 2px; }
.inline-toolbar .button, .inline-toolbar .button:backdrop {
.inline-toolbar .button, .inline-toolbar .button:backdrop {
border-radius: 2px;
border-width: 1px; }
@ -801,7 +797,6 @@ GtkTextView {
/* menu buttons */
.menuitem.button.flat, .menuitem.sidebar-button.button {
transition: none;
color: #D3DAE3;
outline-offset: -1px;
border-radius: 2px; }
.menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {

View File

@ -191,6 +191,17 @@ GtkTextView {
background-image: none;
background-color: transparent;
box-shadow: none; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.entry.error {
color: white;
border-color: #FC4138;
@ -217,21 +228,7 @@ GtkTextView {
color: #5c616c; }
.entry.image:active {
color: #5294E2; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.linked.vertical > .entry {
.linked.vertical > .entry {
border-bottom-color: #f4f5f6;
box-shadow: none; }
.linked.vertical > .entry:focus {
@ -253,16 +250,16 @@ GtkTextView {
box-shadow: 0 -1px 0 0 #5294E2; }
.linked.vertical > .entry:last-child:insensitive {
border-bottom-color: rgba(0, 0, 0, 0.14); }
.osd .linked.vertical > .entry {
.osd .entry {
color: #BAC3CF;
border-color: rgba(0, 0, 0, 0.4);
background-color: transparent;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:focus {
.osd .entry:focus {
color: #BAC3CF;
border-color: #5294E2;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:insensitive {
.osd .entry:insensitive {
color: #555a62;
border-color: rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@ -526,8 +523,7 @@ GtkTextView {
.stack-switcher > .button.needs-attention > .label:dir(rtl),
.stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
background-position: left 3px, left 4px; }
.inline-toolbar .button, .inline-toolbar .button:backdrop {
.inline-toolbar .button, .inline-toolbar .button:backdrop {
border-radius: 2px;
border-width: 1px; }
@ -801,7 +797,6 @@ GtkTextView {
/* menu buttons */
.menuitem.button.flat, .menuitem.sidebar-button.button {
transition: none;
color: #5c616c;
outline-offset: -1px;
border-radius: 2px; }
.menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {

View File

@ -191,6 +191,17 @@ GtkTextView {
background-image: none;
background-color: transparent;
box-shadow: none; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.entry.error {
color: white;
border-color: #FC4138;
@ -217,21 +228,7 @@ GtkTextView {
color: #5c616c; }
.entry.image:active {
color: #5294E2; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.linked.vertical > .entry {
.linked.vertical > .entry {
border-bottom-color: #f4f5f6;
box-shadow: none; }
.linked.vertical > .entry:focus {
@ -253,16 +250,16 @@ GtkTextView {
box-shadow: 0 -1px 0 0 #5294E2; }
.linked.vertical > .entry:last-child:insensitive {
border-bottom-color: rgba(0, 0, 0, 0.14); }
.osd .linked.vertical > .entry {
.osd .entry {
color: #BAC3CF;
border-color: rgba(0, 0, 0, 0.4);
background-color: transparent;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:focus {
.osd .entry:focus {
color: #BAC3CF;
border-color: #5294E2;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:insensitive {
.osd .entry:insensitive {
color: #555a62;
border-color: rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@ -526,8 +523,7 @@ GtkTextView {
.stack-switcher > .button.needs-attention > .label:dir(rtl),
.stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
background-position: left 3px, left 4px; }
.inline-toolbar .button, .inline-toolbar .button:backdrop {
.inline-toolbar .button, .inline-toolbar .button:backdrop {
border-radius: 2px;
border-width: 1px; }
@ -801,7 +797,6 @@ GtkTextView {
/* menu buttons */
.menuitem.button.flat, .menuitem.sidebar-button.button {
transition: none;
color: #5c616c;
outline-offset: -1px;
border-radius: 2px; }
.menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {

View File

@ -191,6 +191,17 @@ GtkTextView {
background-image: none;
background-color: transparent;
box-shadow: none; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.entry.error {
color: white;
border-color: #FC4138;
@ -217,21 +228,7 @@ GtkTextView {
color: #5c616c; }
.entry.image:active {
color: #5294E2; }
.linked > .entry:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.linked > .entry:first-child:dir(rtl) {
border-right-style: none; }
.linked > .entry:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
.linked > .entry:last-child:dir(rtl) {
border-left-style: solid; }
.linked.vertical > .entry {
.linked.vertical > .entry {
border-bottom-color: #f4f5f6;
box-shadow: none; }
.linked.vertical > .entry:focus {
@ -253,16 +250,16 @@ GtkTextView {
box-shadow: 0 -1px 0 0 #5294E2; }
.linked.vertical > .entry:last-child:insensitive {
border-bottom-color: rgba(0, 0, 0, 0.14); }
.osd .linked.vertical > .entry {
.osd .entry {
color: #BAC3CF;
border-color: rgba(0, 0, 0, 0.4);
background-color: transparent;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:focus {
.osd .entry:focus {
color: #BAC3CF;
border-color: #5294E2;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
.osd .linked.vertical > .entry:insensitive {
.osd .entry:insensitive {
color: #555a62;
border-color: rgba(0, 0, 0, 0.4);
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@ -526,8 +523,7 @@ GtkTextView {
.stack-switcher > .button.needs-attention > .label:dir(rtl),
.stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
background-position: left 3px, left 4px; }
.inline-toolbar .button, .inline-toolbar .button:backdrop {
.inline-toolbar .button, .inline-toolbar .button:backdrop {
border-radius: 2px;
border-width: 1px; }
@ -801,7 +797,6 @@ GtkTextView {
/* menu buttons */
.menuitem.button.flat, .menuitem.sidebar-button.button {
transition: none;
color: #5c616c;
outline-offset: -1px;
border-radius: 2px; }
.menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {

View File

@ -256,6 +256,20 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
box-shadow: none;
}
.linked > & { //FIXME: use same buttons linking logic and template
&:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
&:dir(rtl) { border-right-style: none;}
}
&:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none;
&:dir(rtl) { border-left-style: solid; }
}
}
&.error {
color: white;
border-color: $error_color;
@ -290,28 +304,7 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
&:active { color: $selected_bg_color; }
}
// .osd & {
// @include entry(osd);
// &:focus { @include entry(osd-focus); }
// &:insensitive { @include entry(osd-insensitive); }
// }
}
.linked > .entry { //FIXME: use same buttons linking logic and template
&:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
&:dir(rtl) { border-right-style: none;}
}
&:last-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none;
&:dir(rtl) { border-left-style: solid; }
}
}
.linked.vertical > .entry { //FIXME comment stuff and make the whole thing smarter.
.linked.vertical > & { //FIXME comment stuff and make the whole thing smarter.
border-bottom-color: mix($borders_color, $base_color, 30%);
box-shadow: none;
@extend %linked_vertical;
@ -355,6 +348,8 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
}
}
}
.osd & {
@include entry(osd);
&:focus { @include entry(osd-focus); }
@ -612,25 +607,25 @@ $_dot_color: $selected_bg_color;
@else { background-position: left 3px, left 2px; }
}
}
}
//inline-toolbar buttons
.inline-toolbar .button, .inline-toolbar .button:backdrop {
//inline-toolbar buttons
.inline-toolbar &, .inline-toolbar &:backdrop {
border-radius: 2px;
border-width: 1px;
@extend %linked;
}
.linked > &,
.linked > &:hover,
.linked > &:active,
.linked > &:checked { @extend %linked; }
.linked.vertical > &,
.linked.vertical > &:hover,
.linked.vertical > &:active,
.linked.vertical > &:checked { @extend %linked_vertical; }
}
.linked > .button,
.linked > .button:hover,
.linked > .button:active,
.linked > .button:checked { @extend %linked; }
.linked.vertical > .button,
.linked.vertical > .button:hover,
.linked.vertical > .button:active,
.linked.vertical > .button:checked { @extend %linked_vertical; }
// all the following is for the +|- buttons on inline toolbars, that way
// should really be deprecated...
.inline-toolbar GtkToolButton > .button { // redefining the button look is
@ -735,10 +730,8 @@ $_dot_color: $selected_bg_color;
/* menu buttons */
.menuitem.button.flat {
@extend %undecorated_button;
transition: none;
color: $fg_color;
@extend %undecorated_button;
outline-offset: -1px;
border-radius: 2px;