Merge branch 'style' into 'master'

style: Avoid conflict with GTK widget names

Closes #119

See merge request Librem5/squeekboard!184
This commit is contained in:
David Boddie
2019-09-29 15:01:32 +00:00
2 changed files with 5 additions and 5 deletions

View File

@ -1,10 +1,10 @@
layout {
sq_view {
background-color: rgba(0, 0, 0, 255);
color: #ffffff;
font-family: cantarell, sans-serif;
}
button {
sq_button {
color: #deddda;
background: #464448;
border-style: solid;
@ -13,7 +13,7 @@ button {
border-radius: 3px;
}
button:active {
sq_button:active {
background: #545256;
border-color: #716e78;
}

View File

@ -585,7 +585,7 @@ static GType new_type(char *name) {
static GType layout_type() {
static GType type = 0;
if (!type) {
type = new_type("layout");
type = new_type("sq_view");
}
return type;
}
@ -593,7 +593,7 @@ static GType layout_type() {
static GType button_type() {
static GType type = 0;
if (!type) {
type = new_type("button");
type = new_type("sq_button");
}
return type;
}