aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2012-05-24 00:16:38 +0800
committerCosimo Cecchi <cosimoc@gnome.org>2012-05-24 00:58:29 +0800
commit02e9b253ea8d127c766172f029379073cddb8f91 (patch)
tree1156c15bb69b7ec55131a434a4c28d498c93396d
parentb6b0b34a2b74c55738cf1c8c62485eb3bf48512a (diff)
downloadgsoc2013-epiphany-02e9b253ea8d127c766172f029379073cddb8f91.tar
gsoc2013-epiphany-02e9b253ea8d127c766172f029379073cddb8f91.tar.gz
gsoc2013-epiphany-02e9b253ea8d127c766172f029379073cddb8f91.tar.bz2
gsoc2013-epiphany-02e9b253ea8d127c766172f029379073cddb8f91.tar.lz
gsoc2013-epiphany-02e9b253ea8d127c766172f029379073cddb8f91.tar.xz
gsoc2013-epiphany-02e9b253ea8d127c766172f029379073cddb8f91.tar.zst
gsoc2013-epiphany-02e9b253ea8d127c766172f029379073cddb8f91.zip
embed: remove custom CSS styling for the overlay progressbar
Now that the overlay progressbar is styled by the theme, we can just set the OSD style class on the overlay to get the same effect. https://bugzilla.gnome.org/show_bug.cgi?id=676660
-rw-r--r--embed/ephy-embed.c4
-rw-r--r--src/resources/epiphany.css29
2 files changed, 2 insertions, 31 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index f3ac543a4..d35477233 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -619,10 +619,11 @@ ephy_embed_constructed (GObject *object)
web_view = WEBKIT_WEB_VIEW (ephy_web_view_new ());
scrolled_window = GTK_WIDGET (priv->scrolled_window);
overlay = gtk_overlay_new ();
+ gtk_style_context_add_class (gtk_widget_get_style_context (overlay),
+ GTK_STYLE_CLASS_OSD);
gtk_widget_add_events (overlay,
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK);
- gtk_widget_set_name (overlay, "ephy-overlay");
gtk_container_add (GTK_CONTAINER (overlay), scrolled_window);
/* statusbar is hidden by default */
@@ -634,7 +635,6 @@ ephy_embed_constructed (GObject *object)
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), priv->floating_bar);
priv->progress = gtk_progress_bar_new ();
- gtk_widget_set_name (priv->progress, "ephy-progress-bar");
gtk_widget_set_halign (priv->progress, GTK_ALIGN_FILL);
gtk_widget_set_valign (priv->progress, GTK_ALIGN_START);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), priv->progress);
diff --git a/src/resources/epiphany.css b/src/resources/epiphany.css
index b3b9757e3..546eeb99b 100644
--- a/src/resources/epiphany.css
+++ b/src/resources/epiphany.css
@@ -18,32 +18,3 @@
padding-left: 0;
padding-right: 0;
}
-
-#ephy-progress-bar {
- -GtkProgressBar-xspacing: 0;
- -GtkProgressBar-yspacing: 3px;
- -GtkProgressBar-min-horizontal-bar-height: 3px;
- padding: 0;
-}
-
-.progressbar#ephy-progress-bar {
- border-style: none;
- background-color: @theme_selected_bg_color;
- background-image: none;
- border-radius: 0;
- -adwaita-progressbar-pattern: none;
-}
-
-GtkProgressBar#ephy-progress-bar.trough {
- padding: 0;
- border-image: none;
- border-style: none;
- border-width: 0;
- background-image: none;
- background-color: transparent;
- border-radius: 0;
-}
-
-#ephy-overlay {
- background-color: rgba(0,0,0,0);
-}