GNOME.org
 

[gnome-builder: 5/139] themes: move themes into library subdirectory

commit ac963a6da7f38b9ff4e83db0f68f7229cec46a92
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 9 14:57:35 2019 -0800

    themes: move themes into library subdirectory
    
    A new static-archive containing theme data will be added, and this moves
    the CSS files into place to account for that.

 data/themes/shared/shared-greeter.css              | 15 ------
 data/themes/shared/shared-omnibar.css              | 50 --------------------
 .../libide/themes}/themes/Adwaita-dark.css         | 10 ++--
 .../libide/themes}/themes/Adwaita-shared.css       | 44 ++++++++++++------
 {data => src/libide/themes}/themes/Adwaita.css     |  0
 {data => src/libide/themes}/themes/Arc-Dark.css    |  0
 {data => src/libide/themes}/themes/Arc-Darker.css  |  2 +-
 {data => src/libide/themes}/themes/Arc-shared.css  | 26 +++++------
 {data => src/libide/themes}/themes/Arc.css         |  0
 {data => src/libide/themes}/themes/elementary.css  |  0
 {data => src/libide/themes}/themes/shared.css      | 54 +++++++++++-----------
 .../themes}/themes/shared/shared-buildui.css       |  0
 .../themes}/themes/shared/shared-completion.css    |  0
 .../themes}/themes/shared/shared-debugger.css      |  0
 .../libide/themes}/themes/shared/shared-editor.css |  9 ----
 src/libide/themes/themes/shared/shared-greeter.css | 32 +++++++++++++
 .../themes}/themes/shared/shared-hoverer.css       |  0
 .../libide/themes}/themes/shared/shared-layout.css | 32 ++++++-------
 src/libide/themes/themes/shared/shared-omnibar.css | 46 ++++++++++++++++++
 .../libide/themes}/themes/shared/shared-search.css |  0
 .../themes}/themes/shared/shared-treeview.css      |  0
 21 files changed, 170 insertions(+), 150 deletions(-)
---
diff --git a/data/themes/Adwaita-dark.css b/src/libide/themes/themes/Adwaita-dark.css
similarity index 66%
rename from data/themes/Adwaita-dark.css
rename to src/libide/themes/themes/Adwaita-dark.css
index aab5c28e6..eb67aa394 100644
--- a/data/themes/Adwaita-dark.css
+++ b/src/libide/themes/themes/Adwaita-dark.css
@@ -1,17 +1,17 @@
 @import url("resource:///org/gnome/builder/themes/Adwaita-shared.css");
 
 
-perspectiveswitcher {
+surfaceswitcher {
   background-color: #272c2e;
 }
-perspectiveswitcher button {
+surfaceswitcher button {
   color: #696c6b;
 }
-perspectiveswitcher button:checked,
-perspectiveswitcher button:checked:hover {
+surfaceswitcher button:checked,
+surfaceswitcher button:checked:hover {
   color: #eeeeec;
 }
-perspectiveswitcher button:hover {
+surfaceswitcher button:hover {
   color: #b2b4b2;
 }
 
diff --git a/data/themes/Adwaita-shared.css b/src/libide/themes/themes/Adwaita-shared.css
similarity index 66%
rename from data/themes/Adwaita-shared.css
rename to src/libide/themes/themes/Adwaita-shared.css
index f4704a0a3..579aa6fe3 100644
--- a/data/themes/Adwaita-shared.css
+++ b/src/libide/themes/themes/Adwaita-shared.css
@@ -1,14 +1,6 @@
 @import url("resource:///org/gnome/builder/themes/shared.css");
 
-/* soften the headerbar a bit which looks too chunky give the widget density
- * near the bottom border.
- */
-window.workbench headerbar {
-  border-bottom: 1px solid @borders;
-  background-image: none;
-}
-
-idelayoutstackheader > button:last-child {
+ideframeheader > button:last-child {
   margin-right: 3px;
 }
 
@@ -48,17 +40,43 @@ ideeditorproperties entry:last-child {
   border-left: none;
 }
 
-
-popover.messagepopover {
+/* Omnibar */
+popover.omnibar {
   padding: 0;
 }
-popover.messagepopover list {
+popover.omnibar list {
   border-top: 1px solid @borders;
   border-radius: 0 0 5px 5px;
 }
-popover.messagepopover list row:not(:last-child) {
+popover.omnibar list row:not(:last-child) {
+  border-bottom: 1px solid alpha(@borders, 0.3);
+}
+popover.omnibar row.notification .title {
+  font-weight: bold;
+}
+popover.omnibar row.notification .body {
+  opacity: 0.8;
+  font-size: 0.95em;
+}
+
+/* Notifications button (transfers, etc) */
+popover.notificationsbutton {
+  padding: 0;
+}
+popover.notificationsbutton list {
+  background: transparent;
+  border-radius: 5px;
+}
+popover.notificationsbutton list row:not(:last-child) {
   border-bottom: 1px solid alpha(@borders, 0.3);
 }
+popover.notificationsbutton row.notification .title {
+  font-weight: bold;
+}
+popover.notificationsbutton row.notification .body {
+  opacity: 0.8;
+  font-size: 0.95em;
+}
 
 /* development styles */
 window.development-version  headerbar:last-child {
diff --git a/data/themes/Adwaita.css b/src/libide/themes/themes/Adwaita.css
similarity index 100%
rename from data/themes/Adwaita.css
rename to src/libide/themes/themes/Adwaita.css
diff --git a/data/themes/Arc-Dark.css b/src/libide/themes/themes/Arc-Dark.css
similarity index 100%
rename from data/themes/Arc-Dark.css
rename to src/libide/themes/themes/Arc-Dark.css
diff --git a/data/themes/Arc-Darker.css b/src/libide/themes/themes/Arc-Darker.css
similarity index 87%
rename from data/themes/Arc-Darker.css
rename to src/libide/themes/themes/Arc-Darker.css
index 5657d23fa..6acaa6b2a 100644
--- a/data/themes/Arc-Darker.css
+++ b/src/libide/themes/themes/Arc-Darker.css
@@ -1,7 +1,7 @@
 @import url("resource:///org/gnome/builder/themes/Arc-shared.css");
 
 /* Darker border */
-perspectiveswitcher {
+surfaceswitcher {
   border-top: 1px solid #2b2e39;
   border-right: 1px solid #2b2e39;
 }
diff --git a/data/themes/Arc-shared.css b/src/libide/themes/themes/Arc-shared.css
similarity index 72%
rename from data/themes/Arc-shared.css
rename to src/libide/themes/themes/Arc-shared.css
index 371ef7cfd..a104cb1f8 100644
--- a/data/themes/Arc-shared.css
+++ b/src/libide/themes/themes/Arc-shared.css
@@ -8,13 +8,13 @@
 @define-color theme_button_hover_bg_color #454C5C;
 @define-color theme_button_hover_border_color #262932;
 
-perspectiveswitcher {
+surfaceswitcher {
   background-color: @theme_accent_bg_color;
   border-top: 1px solid @borders;
   border-right: 1px solid @borders;
 }
 
-perspectiveswitcher button {
+surfaceswitcher button {
   color: @theme_accent_color;
   background-color: @theme_accent_bg_color;
   border-radius: 3px;
@@ -23,55 +23,55 @@ perspectiveswitcher button {
   margin: 1px;
 }
 
-perspectiveswitcher button:hover {
+surfaceswitcher button:hover {
   border-color: @theme_button_hover_border_color;
   background-color: @theme_button_hover_bg_color;
 }
 
-perspectiveswitcher button:checked {
+surfaceswitcher button:checked {
   color: white;
   background-color: @wm_button_active_bg;
 }
 
-perspectiveswitcher button:checked:backdrop {
+surfaceswitcher button:checked:backdrop {
   color: #c2c4c7;
 }
 
 
-layoutpane stackswitcher button {
+panel stackswitcher button {
   color: @theme_fg_color;
   background-color: transparent;
   border: none;
 }
-layoutpane stackswitcher button:checked {
+panel stackswitcher button:checked {
   color: @theme_selected_bg_color;
 }
 /* All boxes */
-layoutpane > box > box.horizontal > stackswitcher > button:hover {
+panel > box > box.horizontal > stackswitcher > button:hover {
   border: 1px solid @borders;
 }
 /* Box above file switcher */
-layoutpane > box.vertical:first-child > box.horizontal {
+panel > box.vertical:first-child > box.horizontal {
   border: 1px solid @borders;
 }
 
 
 /* Builder pane */
-window.workbench buildperspective list {
+window.workspace buildsurface list {
   border-right: 1px solid @borders;
   background-color: @theme_base_color;
 }
-window.workbench buildperspective list row {
+window.workspace buildsurface list row {
   padding: 10px;
   border-bottom: 1px solid alpha(@borders, 0.50);
 }
-window.workbench buildperspective list row:last-child {
+window.workspace buildsurface list row:last-child {
   border-bottom: none;
 }
 
 
 /* omnibar popover, remove popover padding */
-popover.messagepopover > * > * {
+popover.omnibar > * > * {
   margin: 0;
   padding: 0;
 }
diff --git a/data/themes/Arc.css b/src/libide/themes/themes/Arc.css
similarity index 100%
rename from data/themes/Arc.css
rename to src/libide/themes/themes/Arc.css
diff --git a/data/themes/elementary.css b/src/libide/themes/themes/elementary.css
similarity index 100%
rename from data/themes/elementary.css
rename to src/libide/themes/themes/elementary.css
diff --git a/data/themes/shared.css b/src/libide/themes/themes/shared.css
similarity index 77%
rename from data/themes/shared.css
rename to src/libide/themes/themes/shared.css
index a6367725d..03f05f41f 100644
--- a/data/themes/shared.css
+++ b/src/libide/themes/themes/shared.css
@@ -19,44 +19,32 @@ filechooser actionbar button.combo {
     color: @warning_color;
 }
 
-
-/*
- * Styling in the genesis (create project) perspective.
- */
-genesisperspective stack > box:first-child list row {
-  padding: 10px;
-  border-bottom: 1px solid alpha(@borders, 0.2);
-}
-genesisperspective stack > box:first-child list row:last-child {
-  border-bottom: none;
+/* headerbar shadow in fullscreen, for depth above children */
+window.fullscreen headerbar {
+  margin-bottom: 5px;
+  box-shadow: 0 0 3px 3px alpha(@wm_shadow,.3);
 }
 
-/*
- * Greeter tweaks
- *
- * The following tweaks the greeter perspective by adding
- * separator lines to the list box.
- */
-greeter list row {
+
+/* Styling in the create-project surface. */
+createprojectsurface stack > box:first-child list row {
+  padding: 10px;
   border-bottom: 1px solid alpha(@borders, 0.2);
 }
-greeter list row:last-child {
+createprojectsurface stack > box:first-child list row:last-child {
   border-bottom: none;
 }
-greeter frame border {
-  border-color: alpha(@borders, 0.6);
-}
 
 /*
  * Perspectives switcher
  *
  * The following tweaks the left-most sidebar containing
- * the list of perspectives.
+ * the list of surfaces.
  */
-perspectiveswitcher {
+surfaceswitcher {
   border-right: 1px solid alpha(@borders, 0.5);
 }
-perspectiveswitcher button {
+surfaceswitcher button {
   background: transparent;
   border-radius: 0;
   border: none;
@@ -80,18 +68,18 @@ button.run-arrow-button {
 }
 
 
-buildperspective list.sidebar row:selected button:hover {
+buildsurface list.sidebar row:selected button:hover {
   border-color: transparent;
   box-shadow: none;
   background: transparent;
   color: @theme_selected_fg_color;
   opacity: 1;
 }
-buildperspective list.sidebar row:selected button,
-buildperspective list.sidebar row:selected button:active {
+buildsurface list.sidebar row:selected button,
+buildsurface list.sidebar row:selected button:active {
   opacity: 0.8;
 }
-buildperspective list.sidebar {
+buildsurface list.sidebar {
   border-right: 1px solid alpha(@borders, 0.55);
 }
 
@@ -144,3 +132,13 @@ popover.transfers list row > box {
 button.run-arrow-button {
   padding: 0px;
 }
+
+
+/* Stack list history tweaks */
+dzlstacklist row {
+  padding: 0;
+  margin: 0;
+}
+dzlstacklist .stack-header {
+  opacity: 0.55;
+}
diff --git a/data/themes/shared/shared-buildui.css b/src/libide/themes/themes/shared/shared-buildui.css
similarity index 100%
rename from data/themes/shared/shared-buildui.css
rename to src/libide/themes/themes/shared/shared-buildui.css
diff --git a/data/themes/shared/shared-completion.css b/src/libide/themes/themes/shared/shared-completion.css
similarity index 100%
rename from data/themes/shared/shared-completion.css
rename to src/libide/themes/themes/shared/shared-completion.css
diff --git a/data/themes/shared/shared-debugger.css b/src/libide/themes/themes/shared/shared-debugger.css
similarity index 100%
rename from data/themes/shared/shared-debugger.css
rename to src/libide/themes/themes/shared/shared-debugger.css
diff --git a/data/themes/shared/shared-editor.css b/src/libide/themes/themes/shared/shared-editor.css
similarity index 84%
rename from data/themes/shared/shared-editor.css
rename to src/libide/themes/themes/shared/shared-editor.css
index c8d220af4..e1fdc4432 100644
--- a/data/themes/shared/shared-editor.css
+++ b/src/libide/themes/themes/shared/shared-editor.css
@@ -9,30 +9,24 @@ ideeditorsidebar label.title {
   font-weight: bold;
   font-size: 0.8em;
 }
-ideeditorsidebar dzlstacklist list row,
 ideeditorsidebar list.open-pages row {
   padding: 1px 0;
   color: @theme_fg_color;
 }
-ideeditorsidebar dzlstacklist list row:selected,
 ideeditorsidebar list.open-pages row:selected {
   color: @theme_selected_fg_color;
 }
-ideeditorsidebar dzlstacklist list row:backdrop,
 ideeditorsidebar list.open-pages row:backdrop {
   color: @theme_unfocused_fg_color;
 }
-ideeditorsidebar dzlstacklist list:not(.stack-header) row box > image:first-child,
 ideeditorsidebar list.open-pages row box > image:first-child {
   opacity: 0.55;
 }
-ideeditorsidebar dzlstacklist row box > image:first-child,
 ideeditorsidebar list.open-pages row box > image:first-child {
   margin: 6px 8px;
   min-height: 16px;
   min-width: 16px;
 }
-ideeditorsidebar dzlstacklist row box > button:last-child,
 ideeditorsidebar list.open-pages row box > button:last-child {
   background: none;
   box-shadow: none;
@@ -43,16 +37,13 @@ ideeditorsidebar list.open-pages row box > button:last-child {
   color: @theme_fg_color;
   opacity: 0.55;
 }
-ideeditorsidebar dzlstacklist row box > button:last-child:hover,
 ideeditorsidebar list.open-pages row box > button:last-child:hover {
   opacity: 1;
 }
-ideeditorsidebar dzlstacklist row box > button:last-child image,
 ideeditorsidebar list.open-pages row box > button:last-child image {
   min-height: 16px;
   min-width: 16px;
 }
-ideeditorsidebar dzlstacklist row box > button:last-child:backdrop,
 ideeditorsidebar list.open-pages row box > button:last-child:backdrop {
   color: @theme_unfocused_fg_color;
 }
diff --git a/src/libide/themes/themes/shared/shared-greeter.css 
b/src/libide/themes/themes/shared/shared-greeter.css
new file mode 100644
index 000000000..8e8c93444
--- /dev/null
+++ b/src/libide/themes/themes/shared/shared-greeter.css
@@ -0,0 +1,32 @@
+.greeter flowboxchild {
+  border-radius: 11px;
+  outline-offset: -3px;
+  -gtk-outline-radius: 9px;
+  min-width: 164px;
+  min-height: 164px;
+}
+
+.greeter flowboxchild:selected label {
+  color: @theme_selected_fg_color;
+}
+
+.greeter flowboxchild dzlpillbox {
+ background: alpha(shade(@theme_bg_color, 0.9), 0.8);
+}
+
+/*
+ * Greeter tweaks
+ *
+ * The following tweaks the greeter surface by adding
+ * separator lines to the list box.
+ */
+.greeter list row {
+  border-bottom: 1px solid alpha(@borders, 0.2);
+}
+.greeter list row:last-child {
+  border-bottom: none;
+}
+.greeter frame border {
+  border-color: alpha(@borders, 0.6);
+}
+
diff --git a/data/themes/shared/shared-hoverer.css b/src/libide/themes/themes/shared/shared-hoverer.css
similarity index 100%
rename from data/themes/shared/shared-hoverer.css
rename to src/libide/themes/themes/shared/shared-hoverer.css
diff --git a/data/themes/shared/shared-layout.css b/src/libide/themes/themes/shared/shared-layout.css
similarity index 66%
rename from data/themes/shared/shared-layout.css
rename to src/libide/themes/themes/shared/shared-layout.css
index 4b574132b..9681788ca 100644
--- a/data/themes/shared/shared-layout.css
+++ b/src/libide/themes/themes/shared/shared-layout.css
@@ -1,7 +1,7 @@
-idelayoutstackheader {
+ideframeheader {
   min-height: 26px;
 }
-idelayoutstackheader button {
+ideframeheader button {
   border: none;
   border-radius: 0;
   background: transparent;
@@ -9,39 +9,39 @@ idelayoutstackheader button {
   padding: 0;
   margin: 0;
 }
-idelayoutstackheader button:disabled {
+ideframeheader button:disabled {
   color: alpha(currentColor, 0.25);
 }
-idelayoutstackheader button:not(:disabled) image {
+ideframeheader button:not(:disabled) image {
   opacity: 0.55;
 }
-idelayoutstackheader button:checked image,
-idelayoutstackheader button:not(:disabled):hover image {
+ideframeheader button:checked image,
+ideframeheader button:not(:disabled):hover image {
   opacity: 1;
 }
-idelayoutstackheader button:checked,
-idelayoutstackheader button:hover {
+ideframeheader button:checked,
+ideframeheader button:hover {
   background: shade(@theme_bg_color, 0.9);
 }
-idelayoutstackheader button:active {
+ideframeheader button:active {
   background: shade(@theme_bg_color, 0.85);
 }
-idelayoutstackheader > button {
+ideframeheader > button {
   padding-left: 12px;
   padding-right: 12px;
 }
-idelayoutstackheader * button:first-child > image,
-idelayoutstackheader * button:last-child:dir(rtl) > image {
+ideframeheader * button:first-child > image,
+ideframeheader * button:last-child:dir(rtl) > image {
   padding-left: 12px;
   padding-right: 10px;
 }
-idelayoutstackheader * button:first-child:dir(rtl) > image,
-idelayoutstackheader * button:last-child > image {
+ideframeheader * button:first-child:dir(rtl) > image,
+ideframeheader * button:last-child > image {
   padding-right: 12px;
   padding-left: 9px;
 }
-idelayoutgridcolumn.handle,
-idelayoutgrid.handle {
+idegridcolumn.handle,
+idegrid.handle {
   border: 1px solid @borders;
 }
 popover.title-popover list row {
diff --git a/src/libide/themes/themes/shared/shared-omnibar.css 
b/src/libide/themes/themes/shared/shared-omnibar.css
new file mode 100644
index 000000000..b59edf131
--- /dev/null
+++ b/src/libide/themes/themes/shared/shared-omnibar.css
@@ -0,0 +1,46 @@
+omnibar .pan button {
+  border: none;
+  padding: 0;
+  margin: 0;
+  min-height: 12px;
+  min-width: 14px;
+  background: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  text-decoration: none;
+  outline-offset: -1px;
+}
+
+omnibar .pan button:disabled {
+  opacity: 0.45;
+}
+
+omnibar notification button {
+  border: none;
+  padding: 0;
+  margin: 0;
+  min-height: 24px;
+  min-width: 24px;
+  background: transparent;
+  box-shadow: none;
+  text-shadow: none;
+  text-decoration: none;
+}
+
+omnibar entry {
+  background-color: @theme_bg_color;
+  color: alpha(@theme_fg_color, 0.8);
+}
+
+omnibar:hover entry,
+omnibar:active entry {
+  background-color: mix(@theme_bg_color, @content_view_bg, 0.9);
+  color: @theme_fg_color;
+}
+
+/* Remove animation from linked buttons because it messes up the
+ * joined state transition.
+ */
+omnibar > box.linked > button {
+  transition-duration: 0;
+}
diff --git a/data/themes/shared/shared-search.css b/src/libide/themes/themes/shared/shared-search.css
similarity index 100%
rename from data/themes/shared/shared-search.css
rename to src/libide/themes/themes/shared/shared-search.css
diff --git a/data/themes/shared/shared-treeview.css b/src/libide/themes/themes/shared/shared-treeview.css
similarity index 100%
rename from data/themes/shared/shared-treeview.css
rename to src/libide/themes/themes/shared/shared-treeview.css
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]