Commit 4146c79c authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'css' into 'master'

Css

See merge request Librem5/phosh!199
parents e69f0f32 a8738d69
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24.000001"
version="1.1"
id="svg19258">
<defs
id="defs19252" />
<metadata
id="metadata19255">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
transform="translate(-200.9988,-718.51668)">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 213.0007,724.40348 -10.3711,7.3945 v 0 a 1.5,1.5 0 0 0 -0.6308,1.2187 v 1.5 h 1.5 a 1.5,1.5 0 0 0 0.8711,-0.2793 l 8.6289,-6.1523 8.6289,6.1523 a 1.5,1.5 0 0 0 0.8711,0.2793 h 1.5 v -1.5 a 1.5,1.5 0 0 0 -0.6309,-1.2187 v 0 z"
id="path6868" />
</g>
</svg>
......@@ -79,7 +79,7 @@ keypad_update_labels (PhoshLockscreen *self)
for (int i = 0; i < len; i++)
pos = g_stpcpy (pos, "●");
gtk_label_set_text (GTK_LABEL (priv->lbl_keypad), dots);
gtk_label_set_label (GTK_LABEL (priv->lbl_unlock_status), _("Enter PIN to unlock"));
gtk_label_set_label (GTK_LABEL (priv->lbl_unlock_status), _("Enter Passcode"));
}
......@@ -171,7 +171,7 @@ keypad_number_notified_cb (PhoshLockscreen *self)
keypad_update_labels (self);
if (strlen (number) == phosh_auth_get_pin_length()) {
gtk_label_set_label (GTK_LABEL (priv->lbl_unlock_status), _("Checking PIN"));
gtk_label_set_label (GTK_LABEL (priv->lbl_unlock_status), _("Checking..."));
gtk_widget_set_sensitive (priv->dialer_keypad, FALSE);
if (priv->auth == NULL)
......
......@@ -13,5 +13,6 @@
<gresource prefix="/sm/puri/phosh/icons/scalable/status/">
<file alias="auth-sim-missing-symbolic.svg">../data/auth-sim-missing-symbolic.svg</file>
<file alias="auth-sim-locked-symbolic.svg">../data/auth-sim-locked-symbolic.svg</file>
<file alias="swipe-arrow-symbolic.svg">../data/swipe-arrow-symbolic.svg</file>
</gresource>
</gresources>
......@@ -12,6 +12,15 @@
font-weight: bold;
}
/* Home bar */
.phosh-osk-button {
border-radius: 50%;
min-width: 0;
min-height: 0;
padding: 6px;
}
/* Settings menu */
.phosh-settings-menu {
background-color: black;
......@@ -55,4 +64,13 @@ phosh-home, .phosh-panel {
color: white;
}
/* Lock screen */
.phosh-lockscreen {
background-color: black;
}
.phosh-lockscreen-clock {
font-size: 72;
font-weight: 100;
}
......@@ -11,18 +11,6 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="PhoshOskButton" id="btn_osk">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child type="center">
<object class="GtkButton" id="btn_home">
<property name="visible">True</property>
......@@ -37,9 +25,23 @@
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="PhoshOskButton" id="btn_osk">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin_right">6</property>
<property name="receives_default">True</property>
<style>
<class name="phosh-osk-button"/>
</style>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
</object>
......@@ -48,6 +50,7 @@
<object class="GtkImage" id="img_home">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">go-up-symbolic</property>
<property name="icon_name">swipe-arrow-symbolic</property>
<property name="pixel_size">24</property>
</object>
</interface>
......@@ -26,8 +26,8 @@
<object class="GtkLabel" id="lbl_keypad">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<attributes>
<attribute name="font-desc" value="Cantarell Bold 16"/>
</attributes>
......@@ -57,9 +57,9 @@
<object class="GtkLabel" id="lbl_unlock_status">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="label" translatable="yes">Enter PIN to unlock</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="label" translatable="yes">Enter Passcode</property>
<attributes>
<attribute name="font-desc" value="Cantarell 16"/>
</attributes>
......@@ -95,9 +95,10 @@
<property name="label">00:00</property>
<property name="single_line_mode">True</property>
<property name="track_visited_links">False</property>
<attributes>
<attribute name="font-desc" value="Cantarell 64"/>
</attributes>
<property name="margin_bottom">18</property>
<style>
<class name="phosh-lockscreen-clock"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -119,7 +120,8 @@
<property name="hexpand">False</property>
<property name="pixel_size">24</property>
<property name="use_fallback">True</property>
<property name="margin-right">4</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -136,7 +138,8 @@
<property name="hexpand">False</property>
<property name="pixel_size">24</property>
<property name="use_fallback">True</property>
<property name="margin-right">4</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
<property name="no_show_all">True</property>
</object>
<packing>
......@@ -154,7 +157,8 @@
<property name="hexpand">False</property>
<property name="pixel_size">24</property>
<property name="use_fallback">True</property>
<property name="margin-left">4</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -182,7 +186,7 @@
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">end</property>
<property name="count">3</property>
<property name="count">2</property>
<property name="duration">1500</property>
</object>
<packing>
......@@ -196,8 +200,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">end</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="margin_top">24</property>
<property name="margin_bottom">32</property>
<property name="label" translatable="yes">Slide up to unlock</property>
</object>
<packing>
......@@ -221,6 +225,9 @@
<property name="position">1</property>
</packing>
</child>
<style>
<class name="phosh-lockscreen"/>
</style>
</object>
</child>
</template>
......
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