Commit 2da156f7 authored by Florian Blasius's avatar Florian Blasius 🤘
Browse files

[design update]

parent 37f72cde
......@@ -62,6 +62,15 @@ impl Widget for MainView {
)),
),
)
.with_child(
Container::create().with_child(
Button::create()
.with_property(
Selector::from("button").with_class("primary"),
)
.with_property(Label::from("Primary")),
),
)
.with_child(Container::create().with_child(
ToggleButton::create().with_property(Label::from("ToggleButton")),
))
......
......@@ -61,6 +61,15 @@ impl Widget for MainView {
)),
),
)
.with_child(
Container::create().with_child(
Button::create()
.with_property(
Selector::from("button").with_class("primary"),
)
.with_property(Label::from("Primary")),
),
)
.with_child(Container::create().with_child(
ToggleButton::create().with_property(Label::from("ToggleButton")),
))
......
......@@ -2,11 +2,11 @@
* {
/* background: #F5F6F7; */
background: #3b434a;
color: white;
color: #dfebf5;
font-size: 16;
font-family: "Roboto Regular";
icon-size: 16;
icon-color: white;
icon-color: #dfebf5;
icon-margin: 2;
icon-font-family: "Material Icons Regular";
}
......@@ -67,15 +67,21 @@ switchtoggle:selected {
button, togglebutton {
min-width: 80;
height: 32;
background: #6C7A90;
background: #647b91;
border-radius: 2;
padding: 6;
}
button:active, togglebutton:active, togglebutton:selected {
color: #637F92;
icon-color: #637F92;
background: #F8DE4C;
button.primary {
background: #efd035;
color: #3b434a;
icon-color: #3b434a;
}
button:active, button.primary:active, button.square:active, togglebutton:active, togglebutton:selected {
background: #516475;
color: #dfebf5;
icon-color: #dfebf5;
}
button:disabled, togglebutton:disabled {
......@@ -83,16 +89,10 @@ button:disabled, togglebutton:disabled {
}
button.square {
background: #6C7A90;
border-radius: 2;
border-radius: 1;
min-width: 0;
width: 40;
height: 40;
}
button.square:active {
color: #637F92;
background: #f8de4c;
width: 48;
height: 48;
}
container {
......
......@@ -2,18 +2,26 @@
* {
/* background: #F5F6F7; */
background: #fafafa;
color: black;
icon-color: black;
color: #3b434a;
icon-color: #3b434a;
}
button, togglebutton {
/* min-width: 60; */
/* height: 40; */
background: #e5e5e5;
background: #dadada;
}
button:active, togglebutton:active, togglebutton:selected {
background: #d6d6d6;
button.primary {
background: #efd035;
color: #3b434a;
icon-color: #3b434a;
}
button:active, button.primary:active, togglebutton:active, togglebutton:selected {
background: #a8a8a8;
color: #3b434a;
icon-color: #3b434a;
}
checkbox {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment