[fractal/fractal-next] greeter: Fix devnotice
- From: Julian Sparber <jsparber src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal/fractal-next] greeter: Fix devnotice
- Date: Tue, 1 Feb 2022 13:39:12 +0000 (UTC)
commit ae66b8045a2abbe42e4f9005d869259ea54b8a31
Author: Kévin Commaille <zecakeh tedomum fr>
Date: Sun Jan 30 18:13:44 2022 +0100
greeter: Fix devnotice
data/resources/resources.gresource.xml | 1 -
data/resources/style-dark.css | 4 -
data/resources/style.css | 7 --
data/resources/ui/greeter.ui | 172 +++++++++++++++++----------------
4 files changed, 88 insertions(+), 96 deletions(-)
---
diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml
index eee344ebd..fb7d7b4e4 100644
--- a/data/resources/resources.gresource.xml
+++ b/data/resources/resources.gresource.xml
@@ -9,7 +9,6 @@
<file preprocess="xml-stripblanks">icons/scalable/status/empty-page.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/status/explore-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/status/verified-symbolic.svg</file>
- <file compressed="true">style-dark.css</file>
<file compressed="true">style.css</file>
<file compressed="true" preprocess="xml-stripblanks"
alias="account-settings-device-row.ui">ui/account-settings-device-row.ui</file>
<file compressed="true" preprocess="xml-stripblanks"
alias="account-settings-devices-page.ui">ui/account-settings-devices-page.ui</file>
diff --git a/data/resources/style.css b/data/resources/style.css
index de9943fac..331a8eabe 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -85,13 +85,6 @@ headerbar .suggested-action {
min-width: 250px;
}
-.devnotice {
- background: @warning_bg_color;
- color: @warning_fg_color;
- padding: 12px 24px;
-}
-
-
/* Session */
.session-loading-spinner {
diff --git a/data/resources/ui/greeter.ui b/data/resources/ui/greeter.ui
index 6e9fb65f5..d9df2e7a0 100644
--- a/data/resources/ui/greeter.ui
+++ b/data/resources/ui/greeter.ui
@@ -26,104 +26,108 @@
<property name="propagate-natural-height">True</property>
<property name="vexpand">true</property>
<property name="child">
- <object class="AdwClamp">
- <property name="maximum-size">440</property>
- <property name="tightening-threshold">500</property>
- <property name="margin-top">0</property>
- <property name="margin-bottom">24</property>
- <property name="margin-start">24</property>
- <property name="margin-end">24</property>
- <property name="child">
- <object class="GtkBox">
- <property name="orientation">vertical</property>
- <property name="valign">center</property>
- <property name="spacing">24</property>
+ <object class="GtkBox">
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkInfoBar">
+ <property name="message-type">warning</property>
<child>
<object class="AdwClamp">
- <property name="maximum-size">360</property>
- <property name="child">
- <object class="GtkBox">
- <property name="orientation">vertical</property>
- <property name="valign">center</property>
- <property name="spacing">24</property>
- <child>
- <object class="GtkPicture">
- <property
name="file">resource:///org/gnome/FractalNext/assets/welcome.svg</property>
- <property name="height-request">120</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="wrap">True</property>
- <property name="wrap-mode">word-char</property>
- <property name="justify">center</property>
- <property name="label" translatable="yes" comments="Fractal is the
application name and shouldn't be translated">Welcome to Fractal</property>
- <style>
- <class name="title-1"/>
- </style>
- </object>
- </child>
- </object>
- </property>
- </object>
- </child>
- <child>
- <object class="GtkBox">
- <style>
- <class name="card"/>
- <class name="devnotice"/>
- </style>
- <property name="spacing">12</property>
- <child>
- <object class="GtkImage">
- <property name="icon-name">dialog-warning-symbolic</property>
- <property name="icon-size">large</property>
- </object>
- </child>
+ <property name="maximum-size">440</property>
+ <property name="tightening-threshold">440</property>
+ <property name="hexpand">true</property>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">You are running an early stage
development version. Be aware it is a work in progress and far from complete yet.</property>
+ <property name="justify">center</property>
<property name="wrap">True</property>
+ <property name="label" translatable="yes">You are running an early stage
development version. Be aware it is a work in progress and far from complete yet.</property>
</object>
</child>
</object>
</child>
- <child>
- <object class="AdwClamp">
- <property name="maximum-size">260</property>
- <property name="margin-top">10</property>
- <property name="child">
- <object class="GtkBox">
- <property name="orientation">vertical</property>
- <property name="valign">center</property>
- <property name="spacing">16</property>
- <child>
- <object class="GtkButton" id="login_button">
- <style>
- <class name="pill"/>
- <class name="suggested-action"/>
- </style>
- <property name="label" translatable="true">_Log in</property>
- <property name="use-underline">true</property>
- <property name="action-name">app.show-login</property>
+ </object>
+ </child>
+ <child>
+ <object class="AdwClamp">
+ <property name="maximum-size">440</property>
+ <property name="tightening-threshold">500</property>
+ <property name="margin-top">0</property>
+ <property name="margin-bottom">24</property>
+ <property name="margin-start">24</property>
+ <property name="margin-end">24</property>
+ <property name="vexpand">true</property>
+ <property name="child">
+ <object class="GtkBox">
+ <property name="orientation">vertical</property>
+ <property name="valign">center</property>
+ <property name="spacing">24</property>
+ <child>
+ <object class="AdwClamp">
+ <property name="maximum-size">360</property>
+ <property name="child">
+ <object class="GtkBox">
+ <property name="orientation">vertical</property>
+ <property name="valign">center</property>
+ <property name="spacing">24</property>
+ <child>
+ <object class="GtkPicture">
+ <property
name="file">resource:///org/gnome/FractalNext/assets/welcome.svg</property>
+ <property name="height-request">120</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="wrap">True</property>
+ <property name="wrap-mode">word-char</property>
+ <property name="justify">center</property>
+ <property name="label" translatable="yes" comments="Fractal is the
application name and shouldn't be translated">Welcome to Fractal</property>
+ <style>
+ <class name="title-1"/>
+ </style>
+ </object>
+ </child>
</object>
- </child>
- <child>
- <object class="GtkButton">
- <style>
- <class name="pill"/>
- </style>
- <property name="label" translatable="true">_Create Account</property>
- <property name="use-underline">true</property>
- <property name="action-name">app.create-account</property>
+ </property>
+ </object>
+ </child>
+ <child>
+ <object class="AdwClamp">
+ <property name="maximum-size">260</property>
+ <property name="margin-top">10</property>
+ <property name="child">
+ <object class="GtkBox">
+ <property name="orientation">vertical</property>
+ <property name="valign">center</property>
+ <property name="spacing">16</property>
+ <child>
+ <object class="GtkButton" id="login_button">
+ <style>
+ <class name="pill"/>
+ <class name="suggested-action"/>
+ </style>
+ <property name="label" translatable="true">_Log in</property>
+ <property name="use-underline">true</property>
+ <property name="action-name">app.show-login</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton">
+ <style>
+ <class name="pill"/>
+ </style>
+ <property name="label" translatable="true">_Create Account</property>
+ <property name="use-underline">true</property>
+ <property name="action-name">app.create-account</property>
+ </object>
+ </child>
</object>
- </child>
+ </property>
</object>
- </property>
+ </child>
</object>
- </child>
+ </property>
</object>
- </property>
+ </child>
</object>
</property>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
